From 5616bedd257387d24d18ae1bf3ca535baae5f1f8 Mon Sep 17 00:00:00 2001 From: Username1548 Date: Mon, 14 Jul 2025 13:44:44 +0700 Subject: [PATCH] feat(personalDiets): diets suggestions --- lib/core/app_router.dart | 7 ++ lib/core/const.dart | 4 +- lib/core/locator_service.dart | 6 ++ .../models/consultation_model.dart | 1 + .../presentation/widgets/my_diet_widget.dart | 6 +- .../cubit/personal_diet_suggestion_cubit.dart | 67 +++++++++++++++++++ .../cubit/personal_diet_suggestion_state.dart | 16 +++++ .../presentation/consultation_widget.dart | 58 ++++++++++++++++ .../personal_diet_suggestion_screen.dart | 66 ++++++++++++++++++ .../personal_diet_suggestion_repository.dart | 32 +++++++++ .../personal_diet_suggestion_service.dart | 33 +++++++++ lib/generated/intl/messages_en.dart | 3 + lib/generated/l10n.dart | 50 +++++++++++--- lib/l10n/intl_en.arb | 5 +- 14 files changed, 340 insertions(+), 14 deletions(-) create mode 100644 lib/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart create mode 100644 lib/features/personal_diet_suggestion/cubit/personal_diet_suggestion_state.dart create mode 100644 lib/features/personal_diet_suggestion/presentation/consultation_widget.dart create mode 100644 lib/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart create mode 100644 lib/features/personal_diet_suggestion/repository/personal_diet_suggestion_repository.dart create mode 100644 lib/features/personal_diet_suggestion/services/personal_diet_suggestion_service.dart diff --git a/lib/core/app_router.dart b/lib/core/app_router.dart index 223a8913..95f94c04 100644 --- a/lib/core/app_router.dart +++ b/lib/core/app_router.dart @@ -46,6 +46,7 @@ import 'package:eatvio_app/features/finances_and_consultations_archive/presentat import 'package:eatvio_app/features/my_finance/presentation/pages/user_finance_screen.dart'; import 'package:eatvio_app/features/my_plans/presentation/my_plans_screen.dart'; import 'package:eatvio_app/features/notifications/presentation/notifications_screen.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.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'; @@ -515,6 +516,12 @@ class AppRouter { name: MyRecipesScreen.name, builder: (context, state) => const MyRecipesScreen(), ), + + GoRoute( + path: PersonalDietSuggestionScreen.path, + name: PersonalDietSuggestionScreen.name, + builder: (context, state) => PersonalDietSuggestionScreen(dietId: state.extra as int,), + ), ], ); } diff --git a/lib/core/const.dart b/lib/core/const.dart index 31c47e9c..4f38a54e 100644 --- a/lib/core/const.dart +++ b/lib/core/const.dart @@ -1,5 +1,5 @@ -String baseUrl = 'https://eatvio.ru'; -// String baseUrl = 'https://dev2.eatvio.com'; +// String baseUrl = 'https://eatvio.ru'; +String baseUrl = 'https://dev2.eatvio.com'; const List durationValues = [7, 14, 21]; diff --git a/lib/core/locator_service.dart b/lib/core/locator_service.dart index 49c6c5dc..4d4a0712 100644 --- a/lib/core/locator_service.dart +++ b/lib/core/locator_service.dart @@ -81,6 +81,9 @@ import 'package:eatvio_app/features/my_plans/services/my_plans_service.dart'; import 'package:eatvio_app/features/notifications/repository/notifications_repository.dart'; import 'package:eatvio_app/features/notifications/service/notifications_service.dart'; import 'package:eatvio_app/features/order_info/cubit/order_info_cubit.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/repository/personal_diet_suggestion_repository.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/services/personal_diet_suggestion_service.dart'; import 'package:eatvio_app/features/plans/repositories/plans_repository.dart'; import 'package:eatvio_app/features/plans/services/plans_service.dart'; import 'package:eatvio_app/features/plans/presentation/cubit/about_plan_cubit.dart'; @@ -170,6 +173,7 @@ Future init() async { sl.registerFactory(() => ResetPasswordCubit(resetPasswordRepository: sl())); sl.registerFactory(() => BlogPostCubit(sl())); sl.registerFactory(() => BlockedUsersCubit(blockedUsersRepository: sl())); + sl.registerFactory(() => PersonalDietSuggestionCubit(dietRepository: sl(), personalDietSuggestionService: sl())); // Repository sl.registerLazySingleton(() => ChatRepository(chatService: sl())); @@ -201,6 +205,7 @@ Future init() async { sl.registerFactory(() => ResetPasswordRepository(resetPasswordService: sl())); sl.registerLazySingleton(() => BlockedUsersRepository(blockedUserService: sl())); sl.registerLazySingleton(() => CommentsRepository(service: sl())); + sl.registerLazySingleton(() => PersonalDietSuggestionRepository(personalDietSuggestionService: sl())); // Services sl.registerLazySingleton(() => ChatService(sl())); @@ -234,6 +239,7 @@ Future init() async { sl.registerLazySingleton(() => ResetPasswordService(sl())); sl.registerLazySingleton(() => BlockedUserService(sl())); sl.registerLazySingleton(() => CommentsService(sl())); + sl.registerLazySingleton(() => PersonalDietSuggestionService(sl())); // External sl.registerLazySingleton( diff --git a/lib/features/consultations/models/consultation_model.dart b/lib/features/consultations/models/consultation_model.dart index 59c48f09..c73a8d37 100644 --- a/lib/features/consultations/models/consultation_model.dart +++ b/lib/features/consultations/models/consultation_model.dart @@ -22,6 +22,7 @@ abstract class ConsultationModel with _$ConsultationModel { @JsonKey(name: 'end_date', fromJson: parseDate) required DateTime endDate, @JsonKey(name: 'consultant_id') required int consultantId, required List diaries, + @JsonKey(name: 'personal_diet_id') required int? personalDietId, }) = _ConsultationModel; factory ConsultationModel.fromJson(Map json) => _$ConsultationModelFromJson(json); diff --git a/lib/features/my_diets/presentation/widgets/my_diet_widget.dart b/lib/features/my_diets/presentation/widgets/my_diet_widget.dart index 965bd088..c5dd3cdf 100644 --- a/lib/features/my_diets/presentation/widgets/my_diet_widget.dart +++ b/lib/features/my_diets/presentation/widgets/my_diet_widget.dart @@ -16,6 +16,7 @@ import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_cubit.d import 'package:eatvio_app/features/my_diets/presentation/cubit/my_diets_state.dart'; import 'package:eatvio_app/features/my_diets/presentation/widgets/diet_deleted_bottom_sheet.dart'; import 'package:eatvio_app/features/my_diets/presentation/widgets/diet_drafetd_bottom_sheet.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart'; import 'package:eatvio_app/generated/l10n.dart'; import 'package:flutter/material.dart'; import 'package:flutter_bloc/flutter_bloc.dart'; @@ -89,7 +90,9 @@ class _MyDietWidgetState extends State { Padding( padding: const EdgeInsets.symmetric(horizontal: 16), child: Html( - data: widget.diet.details.length > 200 ? '${widget.diet.details.substring(0, 200).replaceAll('\n', '
')}...' : widget.diet.details.replaceAll('\n', '
'), + data: widget.diet.details.length > 200 + ? '${widget.diet.details.substring(0, 200).replaceAll('\n', '
')}...' + : widget.diet.details.replaceAll('\n', '
'), style: { "*": Style( margin: Margins.zero, @@ -128,6 +131,7 @@ class _MyDietWidgetState extends State { showErrorToast('Произошла ошибка. Попробуйте ещё раз через некоторое время'); } } else if (state.selectedStateIndex == 2) { + GoRouter.of(context).pushNamed(PersonalDietSuggestionScreen.name, extra: widget.diet.id); } else { GoRouter.of(context).pushNamed(CreateDietScreen.name, extra: widget.diet); } diff --git a/lib/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart b/lib/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart new file mode 100644 index 00000000..cde49e7e --- /dev/null +++ b/lib/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart @@ -0,0 +1,67 @@ +import 'dart:developer'; + +import 'package:eatvio_app/features/diets/repositories/diet_repository.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_state.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/repository/personal_diet_suggestion_repository.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class PersonalDietSuggestionCubit extends Cubit { + final DietRepository dietRepository; + final PersonalDietSuggestionRepository personalDietSuggestionService; + late final int dietId; + PersonalDietSuggestionCubit({required this.dietRepository, required this.personalDietSuggestionService}) : super(PersonalDietSuggestionState()); + + Future setDietName(int dietId) async { + try { + emit(state.copyWith(isLoading: true, error: null)); + final diet = await dietRepository.getDiet(dietId); + emit(state.copyWith(isLoading: false, dietName: diet.name)); + } catch (e, st) { + log(e.toString(), stackTrace: st); + emit(state.copyWith(isLoading: false, error: e.toString())); + } + } + + Future getConsultationWithPersonalDiets(int dietId) async { + try { + this.dietId = dietId; + emit(state.copyWith(isLoading: true, error: null)); + setDietName(dietId); + final consultations = await personalDietSuggestionService.getConsultationWithPersonalDiets(); + final consultationWithDiet = consultations.where((consultation) => consultation.personalDietId != null).toList(); + final consultationWithoutDiet = consultations.where((consultation) => consultation.personalDietId == null).toList(); + emit(state.copyWith( + isLoading: false, + consultationsWithDiet: consultationWithDiet, + consultationsWithoutDiet: consultationWithoutDiet, + )); + } catch (e, st) { + log(e.toString(), stackTrace: st); + emit(state.copyWith(isLoading: false, error: e.toString())); + } + } + + Future attachDietToConsultation({ + required int consultationId, + }) async { + try { + await personalDietSuggestionService.attachPersonalDiet(consultationId: consultationId, dietId: dietId); + return true; + } catch (e, st) { + log(e.toString(), stackTrace: st); + return false; + } + } + + Future reattachDietToConsultation({ + required int consultationId, + }) async { + try { + await personalDietSuggestionService.reattachPersonalDiet(consultationId: consultationId, dietId: dietId); + return true; + } catch (e, st) { + log(e.toString(), stackTrace: st); + return false; + } + } +} diff --git a/lib/features/personal_diet_suggestion/cubit/personal_diet_suggestion_state.dart b/lib/features/personal_diet_suggestion/cubit/personal_diet_suggestion_state.dart new file mode 100644 index 00000000..da927703 --- /dev/null +++ b/lib/features/personal_diet_suggestion/cubit/personal_diet_suggestion_state.dart @@ -0,0 +1,16 @@ +import 'package:eatvio_app/features/consultations/models/consultation_model.dart'; +import 'package:freezed_annotation/freezed_annotation.dart'; + +part 'personal_diet_suggestion_state.freezed.dart'; + +@freezed +abstract class PersonalDietSuggestionState with _$PersonalDietSuggestionState { + factory PersonalDietSuggestionState({ + @Default([]) List consultationsWithDiet, + @Default([]) List consultationsWithoutDiet, + @Default('') String dietName, + @Default(false) bool isLoading, + @Default(null) String? error, + }) = _PersonalDietSuggestionState; + +} \ No newline at end of file diff --git a/lib/features/personal_diet_suggestion/presentation/consultation_widget.dart b/lib/features/personal_diet_suggestion/presentation/consultation_widget.dart new file mode 100644 index 00000000..0207ed41 --- /dev/null +++ b/lib/features/personal_diet_suggestion/presentation/consultation_widget.dart @@ -0,0 +1,58 @@ +import 'package:eatvio_app/core/theme/custom_text_style.dart'; +import 'package:eatvio_app/core/theme/theme_helper.dart'; +import 'package:eatvio_app/core/widgets/custom_outlined_button.dart'; +import 'package:eatvio_app/features/consultations/models/consultation_model.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart'; +import 'package:eatvio_app/generated/l10n.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class ConsultationWidget extends StatelessWidget { + const ConsultationWidget({super.key, required this.consultationModel}); + final ConsultationModel consultationModel; + @override + Widget build(BuildContext context) { + final s = S.of(context); + return Container( + decoration: BoxDecoration( + borderRadius: BorderRadius.circular(4), + color: appTheme.whiteA700, + ), + child: Column( + children: [ + ListTile( + leading: Container( + decoration: const BoxDecoration( + shape: BoxShape.circle, + ), + child: Image.network(consultationModel.userProfilePhotoUrl), + ), + ), + const SizedBox( + height: 12, + ), + if (consultationModel.personalDietId != null) + CustomOutlinedButton( + text: s.changeDiet, + height: 52, + buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.gray), + buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.dividerColor)), + onPressed: () async { + context.read().reattachDietToConsultation(consultationId: consultationModel.id); + }, + ) + else + CustomOutlinedButton( + text: s.suggestDiet, + height: 52, + buttonTextStyle: TextStyles.textMSemibold.copyWith(color: appTheme.whiteA700), + buttonStyle: ButtonStyle(side: const WidgetStatePropertyAll(BorderSide.none), backgroundColor: WidgetStatePropertyAll(appTheme.blueA400)), + onPressed: () async { + context.read().attachDietToConsultation(consultationId: consultationModel.id); + }, + ) + ], + ), + ); + } +} diff --git a/lib/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart b/lib/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart new file mode 100644 index 00000000..2db01fb3 --- /dev/null +++ b/lib/features/personal_diet_suggestion/presentation/personal_diet_suggestion_screen.dart @@ -0,0 +1,66 @@ +import 'package:eatvio_app/core/locator_service.dart'; +import 'package:eatvio_app/core/theme/custom_text_style.dart'; +import 'package:eatvio_app/core/theme/theme_helper.dart'; +import 'package:eatvio_app/core/widgets/loader.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_cubit.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/cubit/personal_diet_suggestion_state.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/presentation/consultation_widget.dart'; +import 'package:eatvio_app/generated/l10n.dart'; +import 'package:flutter/material.dart'; +import 'package:flutter_bloc/flutter_bloc.dart'; + +class PersonalDietSuggestionScreen extends StatelessWidget { + final int dietId; + const PersonalDietSuggestionScreen({super.key, required this.dietId}); + static const path = '/personal-diet-suggestion'; + static const name = 'personalDietSuggestion'; + @override + Widget build(BuildContext context) { + return BlocProvider( + create: (context) => sl()..getConsultationWithPersonalDiets(dietId), + child: const PersonalDietSuggestionScreenContent(), + ); + } +} + +class PersonalDietSuggestionScreenContent extends StatelessWidget { + const PersonalDietSuggestionScreenContent({super.key}); + @override + Widget build(BuildContext context) { + final s = S.of(context); + return BlocBuilder( + builder: (context, state) { + return Scaffold( + appBar: AppBar( + centerTitle: true, + title: Text( + '${s.dietSuggestion}\n«${state.dietName}»', + style: TextStyles.headingXLSemibold.copyWith(color: appTheme.black), + ), + ), + body: state.isLoading + ? const Center(child: Loader()) + : SingleChildScrollView( + child: Column( + children: [ + ...List.generate(state.consultationsWithDiet.length, (index) { + return ConsultationWidget( + consultationModel: state.consultationsWithDiet[index], + ); + }), + const SizedBox( + height: 12, + ), + ...List.generate(state.consultationsWithoutDiet.length, (index) { + return ConsultationWidget( + consultationModel: state.consultationsWithoutDiet[index], + ); + }) + ], + ), + ), + ); + }, + ); + } +} diff --git a/lib/features/personal_diet_suggestion/repository/personal_diet_suggestion_repository.dart b/lib/features/personal_diet_suggestion/repository/personal_diet_suggestion_repository.dart new file mode 100644 index 00000000..23c32436 --- /dev/null +++ b/lib/features/personal_diet_suggestion/repository/personal_diet_suggestion_repository.dart @@ -0,0 +1,32 @@ +import 'package:eatvio_app/features/consultations/models/consultation_model.dart'; +import 'package:eatvio_app/features/personal_diet_suggestion/services/personal_diet_suggestion_service.dart'; + +class PersonalDietSuggestionRepository { + final PersonalDietSuggestionService personalDietSuggestionService; + + PersonalDietSuggestionRepository({required this.personalDietSuggestionService}); + + Future> getConsultationWithPersonalDiets() async{ + try { + return (await personalDietSuggestionService.getConsultationWithPersonalDiets()).data; + } catch (e) { + rethrow; + } + } + + Future attachPersonalDiet({required int consultationId, required int dietId}) { + try { + return personalDietSuggestionService.attachPersonalDiet(consultationId: consultationId, dietId: dietId); + } catch (e) { + rethrow; + } + } + + Future reattachPersonalDiet({required int consultationId, required int dietId}) { + try { + return personalDietSuggestionService.reattachPersonalDiet(consultationId: consultationId, dietId: dietId); + } catch (e) { + rethrow; + } + } +} diff --git a/lib/features/personal_diet_suggestion/services/personal_diet_suggestion_service.dart b/lib/features/personal_diet_suggestion/services/personal_diet_suggestion_service.dart new file mode 100644 index 00000000..584611e2 --- /dev/null +++ b/lib/features/personal_diet_suggestion/services/personal_diet_suggestion_service.dart @@ -0,0 +1,33 @@ +import 'package:dio/dio.dart'; +import 'package:eatvio_app/features/consultations/models/consultation_model.dart'; + +class PersonalDietSuggestionService { + final Dio dio; + PersonalDietSuggestionService(this.dio); + + Future getConsultationWithPersonalDiets() async { + try { + final response = + await dio.get('/api/consultations', queryParameters: {'filters[plan][has_personal_diet][\$personal_diet]': '1', 'sort[]': 'start_date:desc'}); + return ConsultationPaginationModel.fromJson(response.data); + } catch (e) { + rethrow; + } + } + + Future attachPersonalDiet({required int consultationId, required int dietId}) async { + try { + await dio.post('api/chosen_plans/$consultationId/attach_diet', data: {'diet_id': dietId}); + } catch (e) { + rethrow; + } + } + + Future reattachPersonalDiet({required int consultationId, required int dietId}) async { + try { + await dio.post('api/chosen_plans/$consultationId/re_attach_diet', data: {'diet_id': dietId}); + } catch (e) { + rethrow; + } + } +} diff --git a/lib/generated/intl/messages_en.dart b/lib/generated/intl/messages_en.dart index b7ec0ca8..27ba4cb3 100644 --- a/lib/generated/intl/messages_en.dart +++ b/lib/generated/intl/messages_en.dart @@ -129,6 +129,7 @@ class MessageLookup extends MessageLookupByLibrary { "Если вы любите мучные продукты, но хотите придерживаться диеты, вам подходит диета с добавленим мучных блюд на основе цельнозерновых вариантов. В них больше сложных углеводов и клетчатки, что способствует длительному чувству сытости и поддерживает здоровье пищеварительной системы.", ), "carbohydrates": MessageLookupByLibrary.simpleMessage("Углеводы"), + "changeDiet": MessageLookupByLibrary.simpleMessage("Заменить диету"), "chargeApproved": MessageLookupByLibrary.simpleMessage("Выплата одобрена"), "chargeCollectionFailed": MessageLookupByLibrary.simpleMessage( "Не удалось оформить выплату", @@ -262,6 +263,7 @@ class MessageLookup extends MessageLookupByLibrary { "deleted": MessageLookupByLibrary.simpleMessage("Удалена"), "diary": MessageLookupByLibrary.simpleMessage("Дневник"), "diet": MessageLookupByLibrary.simpleMessage("Диета"), + "dietSuggestion": MessageLookupByLibrary.simpleMessage("Предложение диеты"), "diet_author": MessageLookupByLibrary.simpleMessage("Автор диеты"), "diet_has_been_sent_to_draft": MessageLookupByLibrary.simpleMessage( "снята с публикации и перенесена в черновик", @@ -677,6 +679,7 @@ class MessageLookup extends MessageLookupByLibrary { "successfully_published": MessageLookupByLibrary.simpleMessage( "успешно опубликован", ), + "suggestDiet": MessageLookupByLibrary.simpleMessage("Предложить диету"), "suicide": MessageLookupByLibrary.simpleMessage("Склонение к самоубийству"), "takes_pills": MessageLookupByLibrary.simpleMessage("Принимает лекарства"), "tap_on_link_to_pay": MessageLookupByLibrary.simpleMessage( diff --git a/lib/generated/l10n.dart b/lib/generated/l10n.dart index 97792fb3..a705d918 100644 --- a/lib/generated/l10n.dart +++ b/lib/generated/l10n.dart @@ -3395,16 +3395,6 @@ class S { ); } - /// `Составление индивидуальной диеты` - String get personalDietCreating { - return Intl.message( - 'Составление индивидуальной диеты', - name: 'personalDietCreating', - desc: '', - args: [], - ); - } - /// `Скопировать` String get copy { return Intl.message('Скопировать', name: 'copy', desc: '', args: []); @@ -3424,6 +3414,46 @@ class S { args: [], ); } + + /// `Составление индивидуальной диеты` + String get personalDietCreating { + return Intl.message( + 'Составление индивидуальной диеты', + name: 'personalDietCreating', + desc: '', + args: [], + ); + } + + /// `Предложение диеты` + String get dietSuggestion { + return Intl.message( + 'Предложение диеты', + name: 'dietSuggestion', + desc: '', + args: [], + ); + } + + /// `Предложить диету` + String get suggestDiet { + return Intl.message( + 'Предложить диету', + name: 'suggestDiet', + desc: '', + args: [], + ); + } + + /// `Заменить диету` + String get changeDiet { + return Intl.message( + 'Заменить диету', + name: 'changeDiet', + desc: '', + args: [], + ); + } } class AppLocalizationDelegate extends LocalizationsDelegate { diff --git a/lib/l10n/intl_en.arb b/lib/l10n/intl_en.arb index f88e36a0..d7d81139 100644 --- a/lib/l10n/intl_en.arb +++ b/lib/l10n/intl_en.arb @@ -407,6 +407,9 @@ "reply": "Ответить", "deleteComment": "Удалить комментарий" , - "personalDietCreating": "Составление индивидуальной диеты" + "personalDietCreating": "Составление индивидуальной диеты", + "dietSuggestion": "Предложение диеты", + "suggestDiet": "Предложить диету", + "changeDiet": "Заменить диету" }