Commit Graph

467 Commits

Author SHA1 Message Date
mso7nueh
7128d4f2d6 merge 2024-08-16 17:37:25 +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
mso7nueh
35ac41cdad feat(chat): refactor 2024-08-16 17:31:02 +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
684b2eec9d fix(recipe): Fix 2024-08-16 15:49:26 +03:00
mso7nueh
8b7f2edd9f feat(feed): 2024-08-16 14:04:58 +03:00
92d5437e06 feat(recipe): API for recipe create and edit 2024-08-16 14:04:25 +03:00
1c63127eb5 feat(recipe): Recipe edit screen and API 2024-08-16 13:38:23 +03:00
aced7e8bcb feat(diary): Recipe create api route enabled 2024-08-15 16:03:39 +03:00
mso7nueh
d784b22265 feat(feed): add share url 2024-08-14 16:15:16 +03:00
bd9bf4843e fix(recipe): Fix 2024-08-14 15:13:02 +03:00
mso7nueh
09b3889d43 fix(diets): add to locator 2024-08-14 15:01:15 +03:00
mso7nueh
1c1f909cc4 merge 2024-08-14 14:53:17 +03:00
167134beb6 fix(recipe): Fix 2024-08-14 14:37:23 +03:00
f697f403f4 feat(recipe): Models, service and repository for eecpe create. Recipe create now uses cubit 2024-08-14 14:36:06 +03:00
mso7nueh
d636857b05 feat(feed): добавлен аватар автора, имя и время создания поста. добавлено количетсво лайков, комментариев и просмотров. при нажатии на комментарий, открываеться экран с постом 2024-08-14 14:32:33 +03:00
mso7nueh
eee0282de0 feat(blogPostCreate): при вводе данных в текстовое поле, изображение уменьшается 2024-08-14 13:09:15 +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
750b9dcb15 Merge pull request 'recipe_crud' (#107) from recipe_crud into main
Reviewed-on: maxxkim/eatvio_app#107
2024-08-13 13:37:02 +00:00
mso7nueh
a75d0a9123 refactor(merger): resolve merge conflict 2024-08-13 16:35:18 +03:00
mso7nueh
9c5e8f960b Merge remote-tracking branch 'refs/remotes/origin/feature/feed'
# Conflicts:
#	lib/app_router.dart
#	lib/locator_service.dart
2024-08-13 16:34:48 +03:00
mso7nueh
1e992e9dd6 feat(diets): fix profile 2024-08-13 16:25:25 +03:00
c53fa419d7 feat(recipes): Add steps and photos for recipe create 2024-08-13 16:17:22 +03:00
9a5bdf3e41 feat(recipes): Add steps and photos for recipe create 2024-08-13 16:15:17 +03:00
6c55c9d020 feat(recipe): New layout for recipe create 2024-08-12 17:00:45 +03:00
mso7nueh
762c54fe28 feat(diets): about diets screen and profile screen from diet 2024-08-12 14:35:34 +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
mso7nueh
4af39985ee feat(feed): about diets screen 2024-08-09 15:10:27 +03:00
16d0863958 feat(diary): Remove photo is now an icon over the picture 2024-08-08 17:12:44 +03:00
mso7nueh
6620ed5337 feat(feed): refactor creating post 2024-08-08 16:40: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
5ddaf42a5f feat(diary): Diary ID is passed on calendar click, new layouts for calendar, fixed nutrition chart 2024-08-02 18:08:39 +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
3ba48289b0 feat(recipes): add recipes screen 2024-08-02 17:52:06 +03:00
mso7nueh
904adbba2f feat(feed): add recipes screen 2024-08-02 11:52:10 +03:00
mso7nueh
c78f8dacdf feat(feed): recipes screen 2024-08-02 11:50:47 +03:00
f3d099fe0c revert c83bfee7cc
revert feat(app): Server changed to dev2
2024-08-02 07:29:32 +00:00
c83bfee7cc feat(app): Server changed to dev2 2024-08-02 10:20:06 +03:00
mso7nueh
264b10bd0d feat(blogPost): add recipes 2024-07-31 17:41:38 +03:00
mso7nueh
2f1d6425dc refactor(registration): remove username 2024-07-31 15:44:04 +03:00
mso7nueh
9cfd59b36f refactor(chat): fix chat null 2024-07-31 15:35:14 +03:00