Merge remote-tracking branch 'upstream/main'

2025-05-29 00:57:55 +07:00
parent cd4ca7288c ac46cd159b
commit 820b4d0a8b
146 changed files with 1607 additions and 269 deletions
--- a/lib/core/app_router.dart
+++ b/lib/core/app_router.dart
@@ -40,9 +40,11 @@ import 'package:eatvio_app/features/feed/models/plan_pagination_model.dart';
 import 'package:eatvio_app/features/plans/presentation/pages/about_plan_screen.dart';
 import 'package:eatvio_app/features/profile/presentation/pages/profile_screen.dart';
 import 'package:eatvio_app/features/profile/presentation/pages/subs_screen.dart';
-import 'package:eatvio_app/features/recipe/presentation/about_recipe_screen.dart';
+import 'package:eatvio_app/features/recipe/presentation/pages/about_recipe_screen.dart';
 import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
+import 'package:eatvio_app/features/recipe/presentation/pages/my_recipes_screen.dart';
 import 'package:eatvio_app/features/registration/presentation/pages/registration_screen.dart';
+import 'package:eatvio_app/features/registration/presentation/pages/verify_email_screen.dart';
 import 'package:eatvio_app/features/registration/presentation/pages/verify_screen.dart';
 import 'package:eatvio_app/features/settings/entities/settings_entity.dart';
 import 'package:eatvio_app/features/settings/presentation/pages/change_email_screen.dart';
@@ -76,8 +78,11 @@ class AppRouter {
        name: 'authScreen',
        builder: (context, state) => const AuthScreen(),
        routes: [
-          // GoRoute(path: 'webView-registration-screen', name: 'webViewRegistrationScreen', builder: (context, state) => const WebViewRegistrationScreen()),
-          GoRoute(path: 'registration-screen', name: 'registrationScreen', builder: (context, state) => const RegistrationScreen()),
+          GoRoute(
+            path: 'registration-screen',
+            name: 'registrationScreen',
+            builder: (context, state) => const RegistrationScreen(),
+          ),
        ],
      ),
      ShellRoute(
@@ -201,7 +206,11 @@ class AppRouter {
        name: 'aboutRecipesScreen',
        builder: (context, state) {
          final data = state.extra as Map<String, dynamic>;
-          return AboutRecipeScreen(recipe: data['recipe'] as Recipe, index: data['index'] as int?, navigateToComments: data['navigateToComments'] as bool);
+          return AboutRecipeScreen(
+            recipe: data['recipe'] as Recipe,
+            index: data['index'] as int?,
+            navigateToComments: data['navigateToComments'] as bool,
+          );
        },
      ),
      GoRoute(
@@ -355,6 +364,16 @@ class AppRouter {
        name: 'verifyScreen',
        builder: (context, state) => VerifyScreen(passKey: state.extra as String),
      ),
+      GoRoute(
+        path: '/verify-email-screen',
+        name: 'verifyEmailScreen',
+        builder: (context, state) => const VerifyEmailScreen(),
+      ),
+      GoRoute(
+        path: MyRecipesScreen.path,
+        name: MyRecipesScreen.name,
+        builder: (context, state) => const MyRecipesScreen(),
+      ),
    ],
  );
 }
--- a/lib/core/dio/phone_verify_error_interceptor.dart
+++ b/lib/core/dio/phone_verify_error_interceptor.dart
@@ -1,6 +1,7 @@
 import 'package:dio/dio.dart';
 import 'package:eatvio_app/core/app_router.dart';
 import 'package:eatvio_app/core/locator_service.dart';
+import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/features/profile/repositories/profile_repository.dart';
 import 'package:go_router/go_router.dart';

@@ -13,6 +14,8 @@ class PhoneVerifyErrorInterceptor extends Interceptor {
      if (data is Map<String, dynamic> && data['type'] == 'unverificated_phone') {
        final String phone = await sl<ProfileRepository>().getMyPhone();
        final String passKey = await sl<ProfileRepository>().getPassKey(phone);
+        await showErrorDialog(AppRouter.navigatorKey.currentContext!,
+            title: 'Привяжите номер телефона', description: 'Для того, что бы выполнить это действие необходимо привязать номер телефона');
        AppRouter.navigatorKey.currentContext?.pushNamed('verifyScreen', extra: passKey);
        return handler.reject(
          DioException(
--- a/lib/core/locator_service.dart
+++ b/lib/core/locator_service.dart
@@ -82,9 +82,13 @@ import 'package:eatvio_app/features/create_recipe/presentation/bloc/create_recip
 import 'package:eatvio_app/features/create_recipe/reporitories/recipe_repository.dart';
 import 'package:eatvio_app/features/create_recipe/services/recipe_service.dart';
 import 'package:eatvio_app/features/recipe/presentation/cubit/about_recipe_cubit.dart';
+import 'package:eatvio_app/features/recipe/presentation/cubit/my_recipes_cubit/my_recieps_cubit.dart';
 import 'package:eatvio_app/features/recipe/repositories/about_recipe_repository.dart';
+import 'package:eatvio_app/features/recipe/repositories/my_recipes_repository.dart';
 import 'package:eatvio_app/features/recipe/services/about_recipe_service.dart';
+import 'package:eatvio_app/features/recipe/services/my_recipes_service.dart';
 import 'package:eatvio_app/features/registration/presentation/bloc/registration_cubit/registration_cubit.dart';
+import 'package:eatvio_app/features/registration/presentation/bloc/verify_email_cubit/verify_email_cubit.dart';
 import 'package:eatvio_app/features/registration/repositories/registration_repository.dart';
 import 'package:eatvio_app/features/registration/services/registration_service.dart';
 import 'package:eatvio_app/features/settings/presentation/bloc/settings_cubit/settings_cubit.dart';
@@ -118,7 +122,7 @@ Future<void> init() async {
  sl.registerFactory<PlansCubit>(() => PlansCubit(feedRepository: sl(), planRepository: sl()));
  sl.registerFactory<SettingsCubit>(() => SettingsCubit(profileRepository: sl(), settingsRepository: sl()));
  sl.registerFactory<RegisterConsultantCubit>(() => RegisterConsultantCubit(consultantRepository: sl()));
-  sl.registerFactory<DiaryCubit>(() => DiaryCubit(diaryRepository: sl(), glossaryRepository: sl(), profileRepository: sl()));
+  sl.registerFactory<DiaryCubit>(() => DiaryCubit(diaryRepository: sl(), glossaryRepository: sl(), profileRepository: sl(), dietRepository: sl()));
  sl.registerFactory<AboutDietCubit>(() => AboutDietCubit(dietsRepository: sl(), profileRepository: sl()));
  sl.registerFactory<BlogPostCreateCubit>(() => BlogPostCreateCubit(blogPostRepository: sl()));
  sl.registerFactory<SubCubit>(() => SubCubit(profileRepository: sl()));
@@ -139,6 +143,8 @@ Future<void> init() async {
  sl.registerFactory<ConsultationsCubit>(() => ConsultationsCubit(consultationsRepository: sl()));
  sl.registerFactory<ConsultantCommentsCubit>(() => ConsultantCommentsCubit(diaryRepository: sl()));
  sl.registerFactory<CancelPlanCubit>(() => CancelPlanCubit(cancelPlanRepository: sl()));
+  sl.registerFactory<VerifyEmailCubit>(() => VerifyEmailCubit(profileRepository: sl()));
+  sl.registerFactory<MyRecipesCubit>(() => MyRecipesCubit(myRecipesRepository: sl(), aboutRecipeRepository: sl()));
  sl.registerFactory<ConsultationsArchiveCubit>(() => ConsultationsArchiveCubit(consultationsRepository: sl()));

  // Repository
@@ -167,6 +173,7 @@ Future<void> init() async {
  sl.registerLazySingleton<CancelPlanRepository>(() => CancelPlanRepository(cancelService: sl()));
  sl.registerLazySingleton<CreatePlanRepository>(() => CreatePlanRepository(createPlanService: sl()));
  sl.registerLazySingleton<NotificationsRepository>(() => NotificationsRepository(notificationsService: sl()));
+  sl.registerFactory<MyRecipesRepository>(() => MyRecipesRepository(myRecipesService: sl()));

  // Services
  sl.registerLazySingleton<ChatService>(() => ChatService(sl()));
@@ -195,6 +202,7 @@ Future<void> init() async {
  sl.registerLazySingleton<CancelPlanService>(() => CancelPlanService(sl()));
  sl.registerLazySingleton<CreatePlanService>(() => CreatePlanService(sl()));
  sl.registerLazySingleton<NotificationsService>(() => NotificationsService(sl()));
+  sl.registerLazySingleton<MyRecipesService>(() => MyRecipesService(sl()));

  // External
  sl.registerLazySingleton(
--- a/lib/core/theme/custom_text_style.dart
+++ b/lib/core/theme/custom_text_style.dart
@@ -196,6 +196,12 @@ abstract class TextStyles {
    height: 1.255,
  );

+  static const textLMedium = TextStyle(
+    fontSize: 18,
+    fontWeight: FontWeight.w500,
+    height: 1.255,
+  );
+  
  static const textMSemibold = TextStyle(
    fontSize: 16,
    fontWeight: FontWeight.w600,
--- a/lib/core/widgets/custom_popup.dart
+++ b/lib/core/widgets/custom_popup.dart
@@ -6,14 +6,12 @@ import 'package:eatvio_app/core/utils/toasts.dart';
 import 'package:eatvio_app/core/widgets/show_error_dialog.dart';
 import 'package:eatvio_app/features/blog_post_create/bloc/blog_post_create_cubit/blog_post_create_cubit.dart';
 import 'package:eatvio_app/features/complaining/presentation/complaining_bottom_sheet.dart';
-import 'package:eatvio_app/features/create_diet/presentation/create_diet_screen.dart';
 import 'package:eatvio_app/features/create_recipe/presentation/pages/recipe_create_screen.dart';
 import 'package:eatvio_app/features/feed/models/diets_pagination_model.dart';
 import 'package:eatvio_app/features/feed/models/feed_blog_post_model.dart';
 import 'package:eatvio_app/features/feed/models/recipes_model.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/diets_cubit/diets_cubit.dart';
 import 'package:eatvio_app/features/feed/presentation/bloc/recipes_cubit/recipes_cubit.dart';
-import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.dart';
 import 'package:eatvio_app/features/my_plans/presentation/cubit/my_plans_cubit.dart';
 import 'package:eatvio_app/generated/l10n.dart';
 import 'package:flutter/material.dart';
@@ -100,37 +98,12 @@ class CustomPopup extends StatelessWidget {
          ),
        );
      });
-      addItem('assets/icons/edit_paint.svg', 'Редактировать', () async {
-        if (complainedContentType == ComplainedContent.posts) {
-          GoRouter.of(context).pushNamed('blogPostCreateScreen', extra: feedBlogPostModel);
-        } else if (complainedContentType == ComplainedContent.recipe) {
-          GoRouter.of(context).pushNamed(RecipeCreateScreen.name, extra: recipe);
-        } else if (complainedContentType == ComplainedContent.diet) {
-          await showErrorDialog(context,
-              title: 'Предупреждение', description: 'Диета будет перенесена в архив. Вы создаете новую диету на основе существующей.');
-          await sl<MyDietsCubit>().unpublishDiet(id!);
-          GoRouter.of(context).pushNamed(CreateDietScreen.name, extra: diet);
-        } else {
-          showInfoToast('В разработке');
-          return;
-        }
-      });
-      if (complainedContentType == ComplainedContent.plan || complainedContentType == ComplainedContent.diet) {
-        addItem('assets/icons/remove_from_public.svg', 'Снять с публикации', () async {
-          if (complainedContentType == ComplainedContent.diet) {
-            final result = await sl<MyDietsCubit>().unpublishDiet(id!);
-            if (!result) {
-              showErrorDialog(context, title: S.current.could_not_delete_blog_post);
-              return;
-            }
-            showSuccessToast('Диета перенесена в архив, обновите ленту');
-          } else if (complainedContentType == ComplainedContent.plan) {
-            final result = await sl<MyPlansCubit>().unpublish(slug!);
-            if (!result) {
-              showErrorDialog(context, title: S.current.could_not_delete_blog_post);
-              return;
-            }
-            showSuccessToast('План перенесен в архив, обновите ленту');
+      if (complainedContentType == ComplainedContent.posts || complainedContentType == ComplainedContent.recipe) {
+        addItem('assets/icons/edit_paint.svg', 'Редактировать', () async {
+          if (complainedContentType == ComplainedContent.posts) {
+            GoRouter.of(context).pushNamed('blogPostCreateScreen', extra: feedBlogPostModel);
+          } else if (complainedContentType == ComplainedContent.recipe) {
+            GoRouter.of(context).pushNamed(RecipeCreateScreen.name, extra: recipe);
          }
        });
      }
@@ -145,21 +118,21 @@ class CustomPopup extends StatelessWidget {
        } else if (complainedContentType == ComplainedContent.recipe) {
          final result = await sl<RecipesCubit>().deleteRecipe(slug!);
          if (!result) {
-            showErrorDialog(context, title: S.current.could_not_delete_blog_post);
+            showErrorDialog(context, title: 'Не удалось удалить рецепт');
            return;
          }
          showSuccessToast('Рецепт удален, обновите ленту');
        } else if (complainedContentType == ComplainedContent.diet) {
          final result = await sl<DietsCubit>().deleteDiet(id!);
          if (!result) {
-            showErrorDialog(context, title: S.current.could_not_delete_blog_post);
+            showErrorDialog(context, title: 'Не удалось удалить диету');
            return;
          }
          showSuccessToast('Диета удалена, обновите ленту');
        } else if (complainedContentType == ComplainedContent.plan) {
          final result = await sl<MyPlansCubit>().deletePlan(slug!);
          if (!result) {
-            showErrorDialog(context, title: S.current.could_not_delete_blog_post);
+            showErrorDialog(context, title: 'Не удалось удалить план');
            return;
          }
          showSuccessToast('План удален, обновите ленту');
--- a/lib/core/widgets/loader.dart
+++ b/lib/core/widgets/loader.dart
@@ -1,17 +1,19 @@
 import 'package:flutter/material.dart';
-import 'package:rive/rive.dart';
+import 'package:lottie/lottie.dart';

 class Loader extends StatelessWidget {
  const Loader({super.key});

  @override
  Widget build(BuildContext context) {
-    return const Center(
+    return Center(
      child: SizedBox(
-        height: 32,
-        width: 32,
-        child: RiveAnimation.asset(
-          'assets/rive_animations/loading.riv',
+        height: 42,
+        width: 42,
+        child: Lottie.asset(
+          'assets/lottie_animations/loading.json',
+          width: 42,
+          height: 42,
        ),
      ),
    );