|
|
6183a905f2
|
Merge pull request 'Update main repository' (#105) from maxxkim/eatvio_app:main into main
Android Release / build (pull_request) Failing after 8m17s
Eatvio App Android Test / build (pull_request) Successful in 12m27s
Reviewed-on: eatvio/eatvio_app#105
|
2024-08-12 09:15:20 +00: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 |
|
|
|
c5c6ec0e98
|
feat(diary): Remove photo is now an icon over the picture
|
2024-08-08 17:10:51 +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
|
6b79d1880b
|
Merge pull request 'feat(feed): add diets api and create blog post screen, fix status bar' (#95) from feature/feed into main
Reviewed-on: maxxkim/eatvio_app#95
|
2024-08-08 07:41:23 +00:00 |
|
mso7nueh
|
f4c6aebdff
|
feat(feed): add diets api and create blog post screen, fix status bar
|
2024-08-08 10:40:37 +03:00 |
|
|
|
78f0db6df0
|
Merge pull request 'feature/feed' (#92) from feature/feed into main
Reviewed-on: maxxkim/eatvio_app#92
|
2024-08-06 12:33:56 +00: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 |
|
|
|
b8227a492d
|
fix(diary): Satiety and mood change API method call fix
|
2024-07-15 15:06:14 +03:00 |
|
mso7nueh
|
ee37f02d78
|
feature(registration): refactor i5
|
2024-07-15 12:45:52 +03:00 |
|
|
|
b4993c827c
|
fix(diary): UI errors fix
|
2024-07-15 11:46:32 +03:00 |
|
mso7nueh
|
8cf2388b18
|
feature(registration): refactor i 4
|
2024-07-15 11:19:29 +03:00 |
|
mso7nueh
|
4780caf389
|
feature(registration): refactor i 3.
|
2024-07-14 22:21:30 +03:00 |
|
mso7nueh
|
d49ce2120a
|
feature(registration): refactor i 2.
|
2024-07-14 22:16:59 +03:00 |
|
mso7nueh
|
da447d6960
|
feature(registration): refactor 2
|
2024-07-14 16:45:57 +03:00 |
|
mso7nueh
|
088fe08b37
|
feature(registration): refactor 1
|
2024-07-14 16:44:08 +03:00 |
|
mso7nueh
|
3cdab9e1bb
|
feature(registration): refactor
|
2024-07-14 16:30:10 +03:00 |
|
mso7nueh
|
12a0db5093
|
feat(registration): refactor
|
2024-07-14 16:25:00 +03:00 |
|
|
|
f3a0df20b7
|
refactor(diary): Fix
|
2024-07-12 16:49:50 +03:00 |
|
mso7nueh
|
c903fa4e65
|
feat(registration): fix
|
2024-07-12 14:48:17 +03:00 |
|
mso7nueh
|
ed74fd99f0
|
refactor(diary): fix service
|
2024-07-12 14:33:18 +03:00 |
|
mso7nueh
|
89b94ea2a0
|
feature(registration): try push
|
2024-07-12 14:23:53 +03:00 |
|
|
|
551debd450
|
refactor(diary): API connect attempt
|
2024-07-12 13:16:01 +03:00 |
|
mso7nueh
|
e3a134b73a
|
feature(registration): fix tests
|
2024-07-11 18:36:17 +03:00 |
|
mso7nueh
|
b9ea8afd4e
|
Revert "feature(registration): temp remove test"
This reverts commit c4fd047d60.
|
2024-07-11 18:30:21 +03:00 |
|
mso7nueh
|
c4fd047d60
|
feature(registration): temp remove test
|
2024-07-11 18:28:02 +03:00 |
|
mso7nueh
|
2294d11ee7
|
feature(registration): fix analyzer 2
|
2024-07-11 18:09:42 +03:00 |
|
mso7nueh
|
0f50f3b1c9
|
feature(registration): fix analyzer
|
2024-07-11 17:39:36 +03:00 |
|
mso7nueh
|
aacba077b7
|
feature(registration): new registration flow
|
2024-07-11 14:49:50 +03:00 |
|
|
|
e4cde31d76
|
refatcor(diary): Refactored (doesn't work yet though)
|
2024-07-11 14:35:29 +03:00 |
|
alex
|
c3f7853d0e
|
refactor(all): refactor fix
|
2024-07-09 17:51:05 +03:00 |
|
alex
|
e180ff16b6
|
refactor(all): refactor
|
2024-07-09 17:50:32 +03:00 |
|
mso7nueh
|
2fe58516c6
|
Merge pull request 'mso7nueh-feat(chat)' (#46) from mso7nueh-feat(chat) into main
Reviewed-on: maxxkim/eatvio_app#46
|
2024-07-09 08:18:25 +00:00 |
|
alex
|
f79b9f03ae
|
feat(chat): add badges
|
2024-07-09 11:17:32 +03:00 |
|
alex
|
5f88f49c71
|
feat(chat): add chat lazy loading, send message and websocket init for notifications and new chat messages
|
2024-07-05 22:28:03 +03:00 |
|
alex
|
7514a9b75f
|
feat(chat): add chat load
|
2024-07-03 19:06:51 +03:00 |
|
|
|
def95aeeb5
|
refactor(diary): LocatorService reg
|
2024-07-03 17:45:36 +03:00 |
|
|
|
3c4afe96d6
|
refactor(diary): Cubit and state for diary
|
2024-07-03 17:39:18 +03:00 |
|
mso7nueh
|
ef6ea4ef56
|
Merge pull request 'mso7nueh-feat(chat)' (#45) from mso7nueh-feat(chat) into diary_refactor
Reviewed-on: maxxkim/eatvio_app#45
|
2024-07-03 14:08:17 +00:00 |
|
mso7nueh
|
c743c0c614
|
Merge pull request 'mso7nueh-feat(chat)' (#44) from mso7nueh-feat(chat) into main
Reviewed-on: maxxkim/eatvio_app#44
|
2024-07-03 14:07:36 +00:00 |
|
alex
|
0a25800038
|
fix(feed): fix feed repository
|
2024-07-03 17:06:28 +03:00 |
|
|
|
fee91ecaa4
|
Merge pull request 'main' (#43) from main into mso7nueh-feat(chat)
Reviewed-on: maxxkim/eatvio_app#43
|
2024-07-03 13:55:37 +00:00 |
|
|
|
507598d962
|
Merge pull request 'main' (#42) from main into diary_refactor
Reviewed-on: maxxkim/eatvio_app#42
|
2024-07-03 13:55:24 +00:00 |
|
|
|
70f6509af8
|
Merge pull request 'mso7nueh-feat(chat)' (#40) from mso7nueh-feat(chat) into main
Reviewed-on: maxxkim/eatvio_app#40
|
2024-07-03 13:55:08 +00:00 |
|
|
|
b4180f7bc9
|
Merge pull request 'fix(app): Merge conflict resolve' (#41) from diary_refactor into main
Reviewed-on: maxxkim/eatvio_app#41
|
2024-07-03 13:54:56 +00:00 |
|
|
|
562935a30f
|
fix(app): Merge conflict resolve
|
2024-07-03 16:54:38 +03:00 |
|
|
|
5dfce4b173
|
Merge pull request 'diary_refactor' (#39) from diary_refactor into main
Reviewed-on: maxxkim/eatvio_app#39
|
2024-07-03 13:51:55 +00:00 |
|
alex
|
4c7519ee4c
|
feat(chat): add init and dispose chat, typing info, receive a messages
|
2024-07-03 16:50:09 +03:00 |
|
|
|
1b2b7646b6
|
refactor(diary): Diary, Meals, Portions and Models models
|
2024-07-03 16:39:06 +03:00 |
|
|
|
d58e96d07a
|
fix(diary): changeMeal fix
|
2024-07-03 15:33:02 +03:00 |
|
|
|
57b6cbdd97
|
Merge pull request 'diary_refactor' (#38) from diary_refactor into main
Reviewed-on: maxxkim/eatvio_app#38
|
2024-07-03 10:37:58 +00:00 |
|
|
|
b2f164da46
|
fix(diary): Type mismatch fix
|
2024-07-03 13:37:38 +03:00 |
|
|
|
6194056dc3
|
mompls
|
2024-07-03 12:53:21 +03:00 |
|
|
|
ef94b6a38e
|
Merge branch 'diary_refactor' of ssh://10.55.5.123:222/maxxkim/eatvio_app into diary_refactor
|
2024-07-03 12:52:38 +03:00 |
|
|
|
deb7b11922
|
makefile
|
2024-07-03 12:44:00 +03:00 |
|
|
|
20b3c045dd
|
Revert "feat(hooks): git hooks added"
This reverts commit 03eba1d832.
|
2024-07-03 12:32:50 +03:00 |
|
|
|
03eba1d832
|
feat(hooks): git hooks added
|
2024-07-03 12:13:02 +03:00 |
|
alex
|
424ce3cb34
|
feat(hooks): prepush hooks broken
|
2024-07-03 12:01:42 +03:00 |
|
alex
|
6a03e06f04
|
feat(hooks): prepush hooks
|
2024-07-03 11:59:32 +03:00 |
|
|
|
ca81316eed
|
Merge pull request 'main' (#37) from main into diary_refactor
Reviewed-on: maxxkim/eatvio_app#37
|
2024-07-03 08:54:03 +00:00 |
|
Anatoliy Poloz
|
5cda945d1f
|
testing hooks added
|
2024-07-03 11:52:40 +03:00 |
|
|
|
9b97967d88
|
refactor(diary): Diary cubit
|
2024-07-03 11:33:10 +03:00 |
|
|
|
9849b03404
|
Merge pull request 'main' (#36) from eatvio/eatvio_app:main into main
Reviewed-on: maxxkim/eatvio_app#36
|
2024-07-01 14:01:28 +00:00 |
|
|
|
1b1275b2f4
|
fix(git): Conflict resolve
|
2024-07-01 17:01:13 +03:00 |
|
|
|
a022d87adb
|
refactor(blog_post): Refactoring blog post create and conflict resolve
|
2024-07-01 16:57:43 +03:00 |
|
apoloz
|
f485ad733a
|
Merge pull request 'add pusher' (#101) from mso7nueh/eatvio_app_mso7nueh:main into main
Reviewed-on: eatvio/eatvio_app#101
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
|
2024-07-01 13:55:01 +00:00 |
|
mso7nueh
|
c9c8883e01
|
feat(chat): pusher
|
2024-07-01 16:08:43 +03:00 |
|
|
|
beaaecad3c
|
Merge branch 'main' of ssh://10.55.5.123:222/maxxkim/eatvio_app# Please enter a commit message to explain why this merge is necessary,
:q::1wsqa
xzczxc
|
2024-06-28 14:41:44 +03:00 |
|
|
|
02f4008394
|
refactor(blog_post): Dio, retrfit and freezed implemented for blog post show screen
|
2024-06-28 14:41:30 +03:00 |
|
alex
|
3151413209
|
refactor(feed): fix analyze
|
2024-06-28 13:17:20 +03:00 |
|
alex
|
060fb512a0
|
refactor(feed): refactor feed screen
|
2024-06-28 12:55:57 +03:00 |
|
|
|
58a7ca933d
|
feat(feed): Dio, retrofit and freezed model stump
|
2024-06-27 16:50:23 +03:00 |
|
mso7nueh
|
70296bc485
|
feat(chat): fix token storage
|
2024-06-27 13:24:44 +03:00 |
|
|
|
b1508c3553
|
feat(app): Initial layouts for subscribers, feed display fix, feed photo upload front end
|
2024-06-27 13:17:53 +03:00 |
|
|
|
6e7f1acf46
|
Merge pull request 'upstream merge' (#35) from eatvio/eatvio_app:main into main
Reviewed-on: maxxkim/eatvio_app#35
|
2024-06-27 08:29:43 +00:00 |
|
apoloz
|
b7929eaacd
|
Merge pull request 'chat update' (#99) from mso7nueh/eatvio_app_mso7nueh:main into main
Reviewed-on: eatvio/eatvio_app#99
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
|
2024-06-27 08:10:35 +00:00 |
|
mso7nueh
|
6b56d45832
|
feat(chat): remove rules
|
2024-06-27 10:49:00 +03:00 |
|
mso7nueh
|
f8bfe36f47
|
feat(chat): fix native analyze
|
2024-06-27 10:44:33 +03:00 |
|
mso7nueh
|
b1b6ffe0f3
|
feat(chat): add trailing comma rules
|
2024-06-25 16:05:55 +03:00 |
|
mso7nueh
|
6ea4a23ad6
|
feat(chat): change package for android build
|
2024-06-25 16:01:52 +03:00 |
|
mso7nueh
|
2337bdd368
|
feat(chat): hero animation + chat select scren
|
2024-06-25 15:26:03 +03:00 |
|
mso7nueh
|
05ccfd289c
|
feat(chat): add websocket
|
2024-06-24 20:03:54 +03:00 |
|
|
|
3f0c47ccdf
|
Merge pull request 'main' (#34) from eatvio/eatvio_app:main into main
Reviewed-on: maxxkim/eatvio_app#34
|
2024-06-24 14:46:43 +00:00 |
|
apoloz
|
d410942271
|
Merge pull request 'feat(ci): rename artifact' (#98) from mso7nueh/eatvio_app_mso7nueh:main into main
Reviewed-on: eatvio/eatvio_app#98
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>
|
2024-06-24 08:39:47 +00:00 |
|
mso7nueh
|
eaa9247927
|
feat(ci): rename artifact
|
2024-06-24 11:15:43 +03:00 |
|
apoloz
|
ff1c4e7b38
|
Merge pull request 'delete some trash' (#97) from apoloz/eatvio_app:main into main
Reviewed-on: eatvio/eatvio_app#97
|
2024-06-21 11:38:55 +00:00 |
|
apoloz
|
bf9308895d
|
Merge pull request 'sync from eatvio main to maxxkim' (#33) from eatvio/eatvio_app:main into main
Reviewed-on: maxxkim/eatvio_app#33
|
2024-06-19 13:13:32 +00:00 |
|
