Commit Graph

640 Commits

Author SHA1 Message Date
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
mso7nueh
6946060c86 refactor(baseUrl): -> dev2, fix location 2024-07-31 14:39:36 +03:00
mso7nueh
c9f293159e merge 2024-07-31 13:56:07 +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
35ce394471 merge 2024-07-31 13:35:26 +03:00
mso7nueh
7d8a281337 Merge remote-tracking branch 'refs/remotes/origin/feature_blogPosts'
# Conflicts:
#	lib/app_router.dart
#	lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
#	pubspec.yaml
2024-07-31 13:34:47 +03:00
mso7nueh
b7ca00b948 merge 2024-07-31 13:29:05 +03:00
mso7nueh
4f7f660cbd Merge remote-tracking branch 'refs/remotes/origin/diary_refactor'
# Conflicts:
#	lib/app_router.dart
#	lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
#	lib/features/blog_post_create/services/blog_service.dart
#	lib/features/calendar/services/calendar_service.g.dart
#	lib/features/diary/presentation/bloc/diary_cubit.dart
#	lib/features/diary/presentation/bloc/diary_event.dart
#	lib/features/diary/presentation/bloc/diary_state.dart
#	lib/features/diary/presentation/pages/diary_screen.dart
#	lib/features/diary/repositories/diary_repository.dart
#	lib/features/diary/services/diary_service.dart
#	lib/locator_service.dart
#	lib/presentation/diary/diary_edit_screen/bloc/diary_edit_bloc.dart
#	lib/presentation/diary/diary_edit_screen/diary_edit_screen.dart
#	lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.freezed.dart
#	lib/presentation/feed/blog_post_create_screen/models/blog_post_create_credentials_model.g.dart
#	pubspec.yaml
2024-07-31 13:18:23 +03:00
mso7nueh
bdfa671c18 feat(blogPost): add routing 2024-07-31 13:10:07 +03:00
403e49d657 feat(calendar): Routes to diary 2024-07-31 13:09:28 +03:00
a2360a1c19 feat(diary): Nutrition chart looks like half-donut 2024-07-31 12:21:17 +03:00
mso7nueh
e6b1218199 feat(registration): add location by coordinates 2024-07-31 11:36:03 +03:00
mso7nueh
3af1318d1c feature(blogPosts): fix grey screen 2024-07-29 16:14:48 +03:00
mso7nueh
2b3a3a0e93 feature(blogPosts): refactor main screen 2024-07-29 15:55:48 +03:00
mso7nueh
f96c6b53d6 feature(registration): fix location model 2024-07-29 11:20:01 +03:00
mso7nueh
818721a993 feature(registration): add location endpoint with debounce 2024-07-28 18:39:36 +03:00
56e5cdbe16 fix(calendar): Finished days fix 2024-07-25 16:53:49 +03:00
102154ddb2 feat(calendar): Calendar Event class 2024-07-25 15:29:30 +03:00
6312de5aa8 feat(calendar): Initial layouts models and API for calendar 2024-07-25 14:16:13 +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
mso7nueh
e472121bbc feature(blogPosts): pick only one image 2024-07-17 17:08:01 +03:00
mso7nueh
a94e2b9db4 feature(blogPosts): add image load, fix blog post view 2024-07-17 17:04:00 +03:00
mso7nueh
863bd3132c Merge pull request 'feature(registration): редизайн авторизации, добавлена оферта' (#86) from mso7nueh-feat(chat) into main
Reviewed-on: maxxkim/eatvio_app#86
2024-07-17 09:50:38 +00:00
mso7nueh
220206ae1c feature(registration): редизайн авторизации, добавлена оферта 2024-07-17 12:48:38 +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
mso7nueh
a35a5b6d6b Merge pull request 'mso7nueh-feat(chat)' (#84) from mso7nueh-feat(chat) into main
Reviewed-on: maxxkim/eatvio_app#84
2024-07-15 14:37:45 +00:00
mso7nueh
fc58ec6042 feature(registration): iter 7 2024-07-15 17:34:04 +03:00
ae213f39a5 fix(diary): Meal change method fix 2024-07-15 17:10:55 +03:00
mso7nueh
d859a15cfd feature(registration): remove .env 2024-07-15 17:06:13 +03:00
mso7nueh
726b74a236 feature(registration): iter6 2024-07-15 16:33:33 +03:00
76c1effe12 fix(diary): Wakeup and retire time API method call fix 2024-07-15 15:37:18 +03:00