Commit Graph

51 Commits

Author SHA1 Message Date
mso7nueh
d27171eae2 feat(chat): add sound 2024-08-26 12:12:21 +03:00
mso7nueh
3d321f6a9d fix: fix errors 2024-08-23 15:25:04 +03:00
mso7nueh
df587a70dd Merge remote-tracking branch 'refs/remotes/origin/feature/feed'
# Conflicts:
#	lib/features/diary/presentation/pages/diary_screen.dart
2024-08-23 12:19:28 +03:00
mso7nueh
177b815820 feat(feed): add comments to recipes and diets 2024-08-23 11:45:24 +03:00
43547c301b feat(recipe): Multiple FloatingActionButtons fixed 2024-08-21 17:38:08 +03:00
29f833792b feat(app): New lines for localization and new asset icons 2024-08-21 13:07:45 +03:00
0238bd6130 fix(app): Generated files merge 2024-08-16 17:41:51 +03:00
mso7nueh
f9da25df5a Merge remote-tracking branch 'refs/remotes/origin/feature/feed' into recipe_refactor
# Conflicts:
#	lib/features/recipes/models/image.g.dart
#	lib/features/recipes/presentation/bloc/recipe_create_cubit.dart
#	lib/features/recipes/services/recipe_service.g.dart
2024-08-16 17:36:37 +03:00
01b2ee7b10 fix(diary): Fix 2024-08-16 17:10:08 +03:00
f07be1d47e feat(diary): Checkboxes for product when diet is chosen 2024-08-16 16:27:00 +03:00
9497789eb5 feat(diary): Checkboxes for product when diet is chosen 2024-08-16 16:26:22 +03:00
mso7nueh
8b7f2edd9f feat(feed): 2024-08-16 14:04:58 +03:00
aced7e8bcb feat(diary): Recipe create api route enabled 2024-08-15 16:03:39 +03:00
mso7nueh
7a88a7fffc Merge remote-tracking branch 'refs/remotes/origin/feature/feed'
# Conflicts:
#	lib/features/calendar/presentation/pages/calendar_screen.dart
#	lib/features/diary/presentation/pages/diary_screen.dart
2024-08-14 11:35:33 +03:00
mso7nueh
919035a455 feat(feed, profile): добавлен переход на страинцу автора в посте, рецепте и дете. при нажатии на изображение в рецепте и диеты теперь переход на страницу с подробнее. 2024-08-14 11:34:29 +03:00
fa7bedbac7 feat(diary): Recommended diet product list for current day (stump) 2024-08-09 17:40:01 +03:00
e72ecb5e28 feat(diary): Chart refactor, photo add and delete refactor 2024-08-09 17:29:41 +03:00
16d0863958 feat(diary): Remove photo is now an icon over the picture 2024-08-08 17:12:44 +03:00
c3804bbb20 feat(diary): new layouts for diary 2024-08-08 13:35:10 +03:00
1e8b94c6f6 feat(diary): new layouts for diary 2024-08-08 13:34:35 +03:00
a2ea8dd2ba feat(calendar): Diet days marked in calendar, diet preview page added 2024-08-08 12:22:15 +03:00
mso7nueh
f4c6aebdff feat(feed): add diets api and create blog post screen, fix status bar 2024-08-08 10:40:37 +03:00
21e03d956c Merge branch 'main' into feature/feed 2024-08-06 12:03:58 +00:00
45e796152c feat(calendar): Calendar to diary transition 2024-08-06 14:28:03 +03:00
5d13358fbc feat(diary): Diary ID is passed on calendar click, new layouts for calendar, fixed nutrition chart 2024-08-02 18:08:28 +03:00
mso7nueh
904adbba2f feat(feed): add recipes screen 2024-08-02 11:52:10 +03:00
mso7nueh
cf45e14bb7 Merge remote-tracking branch 'refs/remotes/origin/calendar'
# Conflicts:
#	lib/app_router.dart
#	lib/features/calendar/services/calendar_service.dart
#	lib/features/diary/presentation/bloc/diary_bloc.dart
#	lib/features/diary/services/diary_service.dart
#	lib/locator_service.dart
#	lib/main.dart
2024-07-31 13:49:24 +03:00
mso7nueh
b7ca00b948 merge 2024-07-31 13:29:05 +03:00
a2360a1c19 feat(diary): Nutrition chart looks like half-donut 2024-07-31 12:21:17 +03:00
56e5cdbe16 fix(calendar): Finished days fix 2024-07-25 16:53:49 +03:00
6886997fde fix(diary):fix 2024-07-25 10:42:39 +03:00
2d15e9ea4e refactor(diary): Diary updated on method call success 2024-07-25 10:36:14 +03:00
0671c5d072 refactor(diary): API methods all refactored and new nutrition charty finished 2024-07-24 17:12:28 +03:00
7535e82422 fix(diary): Remove portion API call fixed 2024-07-19 15:51:39 +03:00
be461e4183 feat(diary): New models for calendar and autocomplete fix 2024-07-19 11:55:48 +03:00
dbe8ac0999 refactor(diary): API mor produc nutritional and new Product model 2024-07-17 12:39:31 +03:00
b5becbe665 refactor(diary): API mor produc nutritional and new Product model 2024-07-17 12:39:09 +03:00
20d253313a refactor(diary): Merge conflic resolve 2024-07-15 18:13:44 +03:00
8610cacc6f refactor(diary): Refactor product input 2024-07-15 17:44:33 +03:00
ae213f39a5 fix(diary): Meal change method fix 2024-07-15 17:10:55 +03:00
76c1effe12 fix(diary): Wakeup and retire time API method call fix 2024-07-15 15:37:18 +03:00
b8227a492d fix(diary): Satiety and mood change API method call fix 2024-07-15 15:06:14 +03:00
b4993c827c fix(diary): UI errors fix 2024-07-15 11:46:32 +03:00
f3a0df20b7 refactor(diary): Fix 2024-07-12 16:49:50 +03:00
mso7nueh
ed74fd99f0 refactor(diary): fix service 2024-07-12 14:33:18 +03:00
551debd450 refactor(diary): API connect attempt 2024-07-12 13:16:01 +03:00
e4cde31d76 refatcor(diary): Refactored (doesn't work yet though) 2024-07-11 14:35:29 +03:00
3c4afe96d6 refactor(diary): Cubit and state for diary 2024-07-03 17:39:18 +03:00
1b2b7646b6 refactor(diary): Diary, Meals, Portions and Models models 2024-07-03 16:39:06 +03:00
6194056dc3 mompls 2024-07-03 12:53:21 +03:00