feat(diary): Trying to fix redirect after API call

2024-03-27 18:12:55 +03:00
parent 9923d06e82
commit 20a0df7525
16 changed files with 249 additions and 68 deletions
--- a/.metadata
+++ b/.metadata
@@ -0,0 +1,45 @@
+# This file tracks properties of this Flutter project.
+# Used by Flutter tool to assess capabilities and perform upgrades etc.
+#
+# This file should be version controlled and should not be manually edited.
+
+version:
+  revision: "ba393198430278b6595976de84fe170f553cc728"
+  channel: "stable"
+
+project_type: app
+
+# Tracks metadata for the flutter migrate command
+migration:
+  platforms:
+    - platform: root
+      create_revision: ba393198430278b6595976de84fe170f553cc728
+      base_revision: ba393198430278b6595976de84fe170f553cc728
+    - platform: android
+      create_revision: ba393198430278b6595976de84fe170f553cc728
+      base_revision: ba393198430278b6595976de84fe170f553cc728
+    - platform: ios
+      create_revision: ba393198430278b6595976de84fe170f553cc728
+      base_revision: ba393198430278b6595976de84fe170f553cc728
+    - platform: linux
+      create_revision: ba393198430278b6595976de84fe170f553cc728
+      base_revision: ba393198430278b6595976de84fe170f553cc728
+    - platform: macos
+      create_revision: ba393198430278b6595976de84fe170f553cc728
+      base_revision: ba393198430278b6595976de84fe170f553cc728
+    - platform: web
+      create_revision: ba393198430278b6595976de84fe170f553cc728
+      base_revision: ba393198430278b6595976de84fe170f553cc728
+    - platform: windows
+      create_revision: ba393198430278b6595976de84fe170f553cc728
+      base_revision: ba393198430278b6595976de84fe170f553cc728
+
+  # User provided section
+
+  # List of Local paths (relative to this file) that should be
+  # ignored by the migrate tool.
+  #
+  # Files that are not part of the templates will be ignored by default.
+  unmanaged_files:
+    - 'lib/main.dart'
+    - 'ios/Runner.xcodeproj/project.pbxproj'
--- a/android/app/src/main/kotlin/com/eatvioapp/eatvio_app/MainActivity.kt
+++ b/android/app/src/main/kotlin/com/eatvioapp/eatvio_app/MainActivity.kt
@@ -0,0 +1,5 @@
+package com.eatvioapp.eatvio_app
+
+import io.flutter.embedding.android.FlutterActivity
+
+class MainActivity: FlutterActivity()
--- a/android/app/src/main/res/drawable-v21/launch_background.xml
+++ b/android/app/src/main/res/drawable-v21/launch_background.xml
@@ -0,0 +1,12 @@
+<?xml version="1.0" encoding="utf-8"?>
+<!-- Modify this file to customize your launch splash screen -->
+<layer-list xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="?android:colorBackground" />
+
+    <!-- You can insert your own image assets here -->
+    <!-- <item>
+        <bitmap
+            android:gravity="center"
+            android:src="@mipmap/launch_image" />
+    </item> -->
+</layer-list>
--- a/android/app/src/main/res/values-night/styles.xml
+++ b/android/app/src/main/res/values-night/styles.xml
@@ -0,0 +1,18 @@
+<?xml version="1.0" encoding="utf-8"?>
+<resources>
+    <!-- Theme applied to the Android Window while the process is starting when the OS's Dark Mode setting is on -->
+    <style name="LaunchTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <!-- Show a splash screen on the activity. Automatically removed when
+             the Flutter engine draws its first frame -->
+        <item name="android:windowBackground">@drawable/launch_background</item>
+    </style>
+    <!-- Theme applied to the Android Window as soon as the process has started.
+         This theme determines the color of the Android Window while your
+         Flutter UI initializes, as well as behind your Flutter UI while its
+         running.
+
+         This Theme is only used starting with V2 of Flutter's Android embedding. -->
+    <style name="NormalTheme" parent="@android:style/Theme.Black.NoTitleBar">
+        <item name="android:windowBackground">?android:colorBackground</item>
+    </style>
+</resources>
--- a/android/eatvio_app_android.iml
+++ b/android/eatvio_app_android.iml
@@ -0,0 +1,29 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="FacetManager">
+    <facet type="android" name="Android">
+      <configuration>
+        <option name="ALLOW_USER_CONFIGURATION" value="false" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_APT" value="/gen" />
+        <option name="GEN_FOLDER_RELATIVE_PATH_AIDL" value="/gen" />
+        <option name="MANIFEST_FILE_RELATIVE_PATH" value="/app/src/main/AndroidManifest.xml" />
+        <option name="RES_FOLDER_RELATIVE_PATH" value="/app/src/main/res" />
+        <option name="ASSETS_FOLDER_RELATIVE_PATH" value="/app/src/main/assets" />
+        <option name="LIBS_FOLDER_RELATIVE_PATH" value="/app/src/main/libs" />
+        <option name="PROGUARD_LOGS_FOLDER_RELATIVE_PATH" value="/app/src/main/proguard_logs" />
+      </configuration>
+    </facet>
+  </component>
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/app/src/main/java" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/app/src/main/kotlin" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/gen" isTestSource="false" generated="true" />
+    </content>
+    <orderEntry type="jdk" jdkName="Android API 29 Platform" jdkType="Android SDK" />
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Flutter for Android" level="project" />
+    <orderEntry type="library" name="KotlinJavaRuntime" level="project" />
+  </component>
+</module>
--- a/eatvio_app.iml
+++ b/eatvio_app.iml
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<module type="JAVA_MODULE" version="4">
+  <component name="NewModuleRootManager" inherit-compiler-output="true">
+    <exclude-output />
+    <content url="file://$MODULE_DIR$">
+      <sourceFolder url="file://$MODULE_DIR$/lib" isTestSource="false" />
+      <sourceFolder url="file://$MODULE_DIR$/test" isTestSource="true" />
+      <excludeFolder url="file://$MODULE_DIR$/.dart_tool" />
+      <excludeFolder url="file://$MODULE_DIR$/.idea" />
+      <excludeFolder url="file://$MODULE_DIR$/build" />
+    </content>
+    <orderEntry type="sourceFolder" forTests="false" />
+    <orderEntry type="library" name="Dart SDK" level="project" />
+    <orderEntry type="library" name="Flutter Plugins" level="project" />
+    <orderEntry type="library" name="Dart Packages" level="project" />
+  </component>
+</module>
--- a/ios/RunnerTests/RunnerTests.swift
+++ b/ios/RunnerTests/RunnerTests.swift
@@ -0,0 +1,12 @@
+import Flutter
+import UIKit
+import XCTest
+
+class RunnerTests: XCTestCase {
+
+  func testExample() {
+    // If you add code to the Runner application, consider adding tests here.
+    // See https://developer.apple.com/documentation/xctest for more information about using XCTest.
+  }
+
+}
--- a/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
+++ b/lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
@@ -18,8 +18,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
    on<DiaryEditInitialEvent>(_onInitialize);
    on<ChangeSatiety>(_changeSatiety); // пользователь нажимает на шкалу сытости
    on<ChangeMood>(_changeMood); // пользователь нажимает на шкалу настроения
-    on<ChangeMealTime>(
-        _changeMealTime); // пользователь изменяет время приема пиши
+    on<ChangeMealTime>(_changeMealTime); // пользовательяет времяа пиши
    on<ChangeMeal>(_changeMeal);
    on<WakeupEvent>(_changeWakeup); // пользователь выбирает время пробуждения
    on<RetireEvent>(_changeRetire); // пользователь выбирает время отхода ко сну
@@ -44,7 +43,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
  ) async {
    try {
      final token =
-          "laravel_sanctum_1lPFtd9tpGmHYS243C4K7YF8BrVhxxgXm8cTmjuZda1da694";
+          "9|laravel_sanctum_KFXbccDcWEvTPfJmV99EQv1neAggmpR2TidVGDPN34fa201a";
      final response = await http.get(
        Uri.parse(dotenv.env['SERVER_ROOT']! + '/diary/index'),
        headers: {
@@ -52,14 +51,13 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
          'Authorization': 'Bearer $token',
        },
      );
-
      if (response.statusCode == 200) {
        final data = jsonDecode(response.body);
        if (data is Map<String, dynamic> && data.containsKey('id')) {
          final int diaryId = data['id'];
          try {
            final response = await http.get(
-              Uri.parse(dotenv.env['SERVER_ROOT']! + '/diary/show/$diaryId'),
+              Uri.parse(dotenv.env['SERVER_ROOT']! + '/diary/$diaryId/show/'),
              headers: {
                'Content-Type': 'application/json',
                'Authorization': 'Bearer $token',
@@ -143,7 +141,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
      }
    } catch (e) {
      // Ошибка при получении данных дневника
-      emit(DiaryEditErrorState('Ошибка при получении данных дневника: $e'));
+      emit(DiaryEditErrorState('Ошибка при получении данных о дневнике: $e'));
    }
  }

@@ -151,7 +149,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
    print("Reloading...");
    try {
      final token =
-          "laravel_sanctum_1lPFtd9tpGmHYS243C4K7YF8BrVhxxgXm8cTmjuZda1da694";
+          "9|laravel_sanctum_KFXbccDcWEvTPfJmV99EQv1neAggmpR2TidVGDPN34fa201a";

      final response = await http.get(
        Uri.parse(dotenv.env['SERVER_ROOT']! + '/diary/index'),
@@ -167,7 +165,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
          final int diaryId = data['id'];

          final diaryResponse = await http.get(
-            Uri.parse(dotenv.env['SERVER_ROOT']! + '/diary/show/$diaryId'),
+            Uri.parse(dotenv.env['SERVER_ROOT']! + '/diary/$diaryId/show/'),
            headers: {
              'Content-Type': 'application/json',
              'Authorization': 'Bearer $token',
@@ -176,7 +174,6 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {

          final diary = jsonDecode(diaryResponse.body)['diary'];

-          print(diary);
          if (diary is Map<String, dynamic>) {
            final String diaryDate = diary['date'] ?? DateTime.now().toString();
            // Продолжайте обработку данных дневника
@@ -545,7 +542,6 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
              .map((product) => product['name'])
              .toList(),
        );
-        print(event.input.length);
        if (event.input.length > 3) {
          updatedState = updatedState.copyWith(moderationExpanded: true);
        } else {
@@ -642,7 +638,6 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
      encoding: utf8,
    );

-    print(response.body);
    return response;
  }

@@ -665,11 +660,11 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
      String imagePath, int diaryID, int mealId, String? token) async {
    String url =
        '${dotenv.env['SERVER_ROOT']!}/diary/$diaryID/meal/$mealId/photo/upload';
+    // 'https://eo6yh2uv84lm3p0.m.pipedream.net'; // Remove this line and uncomment the above line for actual server URL

    var request = http.MultipartRequest('POST', Uri.parse(url));
-    request.headers.addAll({
-      'Authorization': 'Bearer $token',
-    });
+    request.headers['Authorization'] = 'Bearer $token';
+    request.headers['Content-Type'] = 'multipart/form-data';

    request.files.add(await http.MultipartFile.fromPath('image', imagePath));

@@ -679,7 +674,7 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
      return imageUrl;
    } else {
      throw Exception(
-          'Failed to upload image. Status code: ${response.statusCode}');
+          'Failed to upload image. Status code: ${response.statusCode}}');
    }
  }

@@ -687,7 +682,6 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
      SendModeration event, Emitter<DiaryEditState> emit) async {
    if (state is DiaryEditLoadedState) {
      var currentState = state as DiaryEditLoadedState;
-      print("sad");
      final response = await _sendModerationData(
        event.name,
        event.energyOn100gr,
@@ -710,6 +704,8 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
      String? token) async {
    String url =
        '${dotenv.env['SERVER_ROOT']!}/diary/product_nutritional_values/sendToModeration';
+    var serverURL = Uri.parse('${dotenv.env['SERVER_ROOT']!}');
+    String host = serverURL.host;
    final Map<String, dynamic> credentials = {
      'name': name,
      'energy_on_100gr': energy_on_100gr,
@@ -717,14 +713,16 @@ class DiaryEditBloc extends Bloc<DiaryEditEvent, DiaryEditState> {
      'fats_on_100gr': fats_on_100gr,
      'carbohydrates_on_100gr': carbohydrates_on_100gr,
    };
+    var bodyBytes = utf8.encode(json.encode(credentials));
    var response = await http.post(
      Uri.parse(url),
      headers: {
        'Content-Type': 'application/json',
+        'Content-Length': '${bodyBytes.length}',
        'Authorization': 'Bearer $token',
+        'Host': host,
      },
-      body: json.encode(credentials),
-      encoding: utf8,
+      body: bodyBytes,
    );
    if (response.statusCode == 200) {
      return response;
--- a/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart
+++ b/lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart
@@ -33,9 +33,8 @@ class DiaryEditScreen extends StatelessWidget {
      builder: (context, state) {
        if (state is DiaryEditInitialState) {
          // Это начальное состояние, данные ещё не загружены.
-          return CircularProgressIndicator(
+          return Container(
            color: Colors.white,
-            backgroundColor: Colors.white,
          );
        } else if (state is DiaryEditLoadedState) {
          // Данные загружены, можно строить экран.
@@ -757,37 +756,6 @@ class DiaryEditScreen extends StatelessWidget {
            ),
          ),
          SizedBox(height: 8.v),
-          Padding(
-            padding: EdgeInsets.only(left: 4.h),
-            child: Row(
-              mainAxisAlignment: MainAxisAlignment.center,
-              children: [
-                Text(
-                  "Калории",
-                  style: theme.textTheme.titleSmall,
-                ),
-                Padding(
-                  padding: EdgeInsets.only(left: 28.h),
-                  child: Text(
-                    "Белки",
-                    style: theme.textTheme.titleSmall,
-                  ),
-                ),
-                Spacer(),
-                Text(
-                  "Жиры",
-                  style: theme.textTheme.titleSmall,
-                ),
-                Padding(
-                  padding: EdgeInsets.only(left: 25.h),
-                  child: Text(
-                    "Углеводы",
-                    style: theme.textTheme.titleSmall,
-                  ),
-                ),
-              ],
-            ),
-          ),
          SizedBox(height: 2.v),
          Padding(
            padding: EdgeInsets.only(
@@ -893,23 +861,6 @@ class DiaryEditScreen extends StatelessWidget {
    );
  }

-  Widget newMethod(double value) {
-    switch (value.toInt()) {
-      case 0:
-        return Text('Calories');
-      case 1:
-        return Text('Fat');
-      case 2:
-        return Text('Protein');
-      case 3:
-        return Text('Carbs');
-      default:
-        return Text('');
-    }
-  }
-
-  buildBars(BuildContext context, DiaryEditLoadedState state) {}
-
  /// Section Widget
  _buildComment(BuildContext context, DiaryEditLoadedState state) {
    return Container(
--- a/web/favicon.png
+++ b/web/favicon.png
--- a/web/icons/Icon-192.png
+++ b/web/icons/Icon-192.png
--- a/web/icons/Icon-512.png
+++ b/web/icons/Icon-512.png
--- a/web/icons/Icon-maskable-192.png
+++ b/web/icons/Icon-maskable-192.png
--- a/web/icons/Icon-maskable-512.png
+++ b/web/icons/Icon-maskable-512.png
--- a/web/index.html
+++ b/web/index.html
@@ -0,0 +1,59 @@
+<!DOCTYPE html>
+<html>
+<head>
+  <!--
+    If you are serving your web app in a path other than the root, change the
+    href value below to reflect the base path you are serving from.
+
+    The path provided below has to start and end with a slash "/" in order for
+    it to work correctly.
+
+    For more details:
+    * https://developer.mozilla.org/en-US/docs/Web/HTML/Element/base
+
+    This is a placeholder for base href that will be replaced by the value of
+    the `--base-href` argument provided to `flutter build`.
+  -->
+  <base href="$FLUTTER_BASE_HREF">
+
+  <meta charset="UTF-8">
+  <meta content="IE=Edge" http-equiv="X-UA-Compatible">
+  <meta name="description" content="A new Flutter project.">
+
+  <!-- iOS meta tags & icons -->
+  <meta name="apple-mobile-web-app-capable" content="yes">
+  <meta name="apple-mobile-web-app-status-bar-style" content="black">
+  <meta name="apple-mobile-web-app-title" content="eatvio_app">
+  <link rel="apple-touch-icon" href="icons/Icon-192.png">
+
+  <!-- Favicon -->
+  <link rel="icon" type="image/png" href="favicon.png"/>
+
+  <title>eatvio_app</title>
+  <link rel="manifest" href="manifest.json">
+
+  <script>
+    // The value below is injected by flutter build, do not touch.
+    const serviceWorkerVersion = null;
+  </script>
+  <!-- This script adds the flutter initialization JS code -->
+  <script src="flutter.js" defer></script>
+</head>
+<body>
+  <script>
+    window.addEventListener('load', function(ev) {
+      // Download main.dart.js
+      _flutter.loader.loadEntrypoint({
+        serviceWorker: {
+          serviceWorkerVersion: serviceWorkerVersion,
+        },
+        onEntrypointLoaded: function(engineInitializer) {
+          engineInitializer.initializeEngine().then(function(appRunner) {
+            appRunner.runApp();
+          });
+        }
+      });
+    });
+  </script>
+</body>
+</html>
--- a/web/manifest.json
+++ b/web/manifest.json
@@ -0,0 +1,35 @@
+{
+    "name": "eatvio_app",
+    "short_name": "eatvio_app",
+    "start_url": ".",
+    "display": "standalone",
+    "background_color": "#0175C2",
+    "theme_color": "#0175C2",
+    "description": "A new Flutter project.",
+    "orientation": "portrait-primary",
+    "prefer_related_applications": false,
+    "icons": [
+        {
+            "src": "icons/Icon-192.png",
+            "sizes": "192x192",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-512.png",
+            "sizes": "512x512",
+            "type": "image/png"
+        },
+        {
+            "src": "icons/Icon-maskable-192.png",
+            "sizes": "192x192",
+            "type": "image/png",
+            "purpose": "maskable"
+        },
+        {
+            "src": "icons/Icon-maskable-512.png",
+            "sizes": "512x512",
+            "type": "image/png",
+            "purpose": "maskable"
+        }
+    ]
+}