sync main #2

apoloz · 2024-08-12T09:16:37Z

apoloz commented

2024-08-12 09:16:37 +00:00

No description provided.

apoloz added 139 commits 2024-08-12 09:16:38 +00:00

Merge pull request 'sync from eatvio main to maxxkim' (#33 ) from eatvio/eatvio_app:main into main bf9308895d

Reviewed-on: maxxkim/eatvio_app#33

Merge pull request 'delete some trash' (#97 ) from apoloz/eatvio_app:main into main ff1c4e7b38

Reviewed-on: eatvio/eatvio_app#97

feat(ci): rename artifact eaa9247927

Merge pull request 'feat(ci): rename artifact' (#98 ) from mso7nueh/eatvio_app_mso7nueh:main into main d410942271

Reviewed-on: eatvio/eatvio_app#98
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>

Merge pull request 'main' (#34 ) from eatvio/eatvio_app:main into main 3f0c47ccdf

Reviewed-on: maxxkim/eatvio_app#34

feat(chat): add websocket 05ccfd289c

feat(chat): hero animation + chat select scren 2337bdd368

feat(chat): change package for android build 6ea4a23ad6

feat(chat): add trailing comma rules b1b6ffe0f3

feat(chat): fix native analyze f8bfe36f47

feat(chat): remove rules 6b56d45832

Merge pull request 'chat update' (#99 ) from mso7nueh/eatvio_app_mso7nueh:main into main b7929eaacd

Reviewed-on: eatvio/eatvio_app#99
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>

Merge pull request 'upstream merge' (#35 ) from eatvio/eatvio_app:main into main 6e7f1acf46

Reviewed-on: maxxkim/eatvio_app#35

feat(app): Initial layouts for subscribers, feed display fix, feed photo upload front end b1508c3553

feat(chat): fix token storage 70296bc485

feat(feed): Dio, retrofit and freezed model stump 58a7ca933d

refactor(feed): refactor feed screen 060fb512a0

refactor(feed): fix analyze 3151413209

refactor(blog_post): Dio, retrfit and freezed implemented for blog post show screen 02f4008394

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, beaaecad3c

:q::1wsqa

	xzczxc

feat(chat): pusher c9c8883e01

Merge pull request 'add pusher' (#101 ) from mso7nueh/eatvio_app_mso7nueh:main into main f485ad733a

Reviewed-on: eatvio/eatvio_app#101
Reviewed-by: apoloz <anatoliy.poloz@gmail.com>

refactor(blog_post): Refactoring blog post create and conflict resolve a022d87adb

fix(git): Conflict resolve 1b1275b2f4

Merge pull request 'main' (#36 ) from eatvio/eatvio_app:main into main 9849b03404

Reviewed-on: maxxkim/eatvio_app#36

refactor(diary): Diary cubit 9b97967d88

testing hooks added 5cda945d1f

Merge pull request 'main' (#37 ) from main into diary_refactor ca81316eed

Reviewed-on: maxxkim/eatvio_app#37

feat(hooks): prepush hooks 6a03e06f04

feat(hooks): prepush hooks broken 424ce3cb34

feat(hooks): git hooks added 03eba1d832

Revert "feat(hooks): git hooks added" 20b3c045dd

This reverts commit 03eba1d832.

makefile deb7b11922

Merge branch 'diary_refactor' of ssh://10.55.5.123:222/maxxkim/eatvio_app into diary_refactor ef94b6a38e

mompls 6194056dc3

fix(diary): Type mismatch fix b2f164da46

Merge pull request 'diary_refactor' (#38 ) from diary_refactor into main 57b6cbdd97

Reviewed-on: maxxkim/eatvio_app#38

fix(diary): changeMeal fix d58e96d07a

refactor(diary): Diary, Meals, Portions and Models models 1b2b7646b6

feat(chat): add init and dispose chat, typing info, receive a messages 4c7519ee4c

Merge pull request 'diary_refactor' (#39 ) from diary_refactor into main 5dfce4b173

Reviewed-on: maxxkim/eatvio_app#39

fix(app): Merge conflict resolve 562935a30f

Merge pull request 'fix(app): Merge conflict resolve' (#41 ) from diary_refactor into main b4180f7bc9

Reviewed-on: maxxkim/eatvio_app#41

Merge pull request 'mso7nueh-feat(chat)' (#40 ) from mso7nueh-feat(chat) into main 70f6509af8

Reviewed-on: maxxkim/eatvio_app#40

Merge pull request 'main' (#42 ) from main into diary_refactor 507598d962

Reviewed-on: maxxkim/eatvio_app#42

Merge pull request 'main' (#43 ) from main into mso7nueh-feat(chat) fee91ecaa4

Reviewed-on: maxxkim/eatvio_app#43

fix(feed): fix feed repository 0a25800038

Merge pull request 'mso7nueh-feat(chat)' (#44 ) from mso7nueh-feat(chat) into main c743c0c614

Reviewed-on: maxxkim/eatvio_app#44

Merge pull request 'mso7nueh-feat(chat)' (#45 ) from mso7nueh-feat(chat) into diary_refactor ef6ea4ef56

Reviewed-on: maxxkim/eatvio_app#45

refactor(diary): Cubit and state for diary 3c4afe96d6

refactor(diary): LocatorService reg def95aeeb5

feat(chat): add chat load 7514a9b75f

feat(chat): add chat lazy loading, send message and websocket init for notifications and new chat messages 5f88f49c71

feat(chat): add badges f79b9f03ae

Merge pull request 'mso7nueh-feat(chat)' (#46 ) from mso7nueh-feat(chat) into main 2fe58516c6

Reviewed-on: maxxkim/eatvio_app#46

refactor(all): refactor e180ff16b6

refactor(all): refactor fix c3f7853d0e

refatcor(diary): Refactored (doesn't work yet though) e4cde31d76

feature(registration): new registration flow aacba077b7

feature(registration): fix analyzer 0f50f3b1c9

feature(registration): fix analyzer 2 2294d11ee7

feature(registration): temp remove test c4fd047d60

Revert "feature(registration): temp remove test" b9ea8afd4e

This reverts commit c4fd047d60.

feature(registration): fix tests e3a134b73a

refactor(diary): API connect attempt 551debd450

feature(registration): try push 89b94ea2a0

refactor(diary): fix service ed74fd99f0

feat(registration): fix c903fa4e65

refactor(diary): Fix f3a0df20b7

feat(registration): refactor 12a0db5093

feature(registration): refactor 3cdab9e1bb

feature(registration): refactor 1 088fe08b37

feature(registration): refactor 2 da447d6960

feature(registration): refactor i 2. d49ce2120a

feature(registration): refactor i 3. 4780caf389

feature(registration): refactor i 4 8cf2388b18

fix(diary): UI errors fix b4993c827c

feature(registration): refactor i5 ee37f02d78

fix(diary): Satiety and mood change API method call fix b8227a492d

fix(diary): Wakeup and retire time API method call fix 76c1effe12

feature(registration): iter6 726b74a236

feature(registration): remove .env d859a15cfd

fix(diary): Meal change method fix ae213f39a5

feature(registration): iter 7 fc58ec6042

Merge pull request 'mso7nueh-feat(chat)' (#84 ) from mso7nueh-feat(chat) into main a35a5b6d6b

Reviewed-on: maxxkim/eatvio_app#84

refactor(diary): Refactor product input 8610cacc6f

refactor(diary): Merge conflic resolve 20d253313a

refactor(diary): API mor produc nutritional and new Product model b5becbe665

refactor(diary): API mor produc nutritional and new Product model dbe8ac0999

feature(registration): редизайн авторизации, добавлена оферта 220206ae1c

Merge pull request 'feature(registration): редизайн авторизации, добавлена оферта' (#86 ) from mso7nueh-feat(chat) into main 863bd3132c

Reviewed-on: maxxkim/eatvio_app#86

feature(blogPosts): add image load, fix blog post view a94e2b9db4

feature(blogPosts): pick only one image e472121bbc

feat(diary): New models for calendar and autocomplete fix be461e4183

fix(diary): Remove portion API call fixed 7535e82422

refactor(diary): API methods all refactored and new nutrition charty finished 0671c5d072

refactor(diary): Diary updated on method call success 2d15e9ea4e

fix(diary):fix 6886997fde

feat(calendar): Initial layouts models and API for calendar 6312de5aa8

feat(calendar): Calendar Event class 102154ddb2

fix(calendar): Finished days fix 56e5cdbe16

feature(registration): add location endpoint with debounce 818721a993

feature(registration): fix location model f96c6b53d6

feature(blogPosts): refactor main screen 2b3a3a0e93

feature(blogPosts): fix grey screen 3af1318d1c

feat(registration): add location by coordinates e6b1218199

feat(diary): Nutrition chart looks like half-donut a2360a1c19

feat(calendar): Routes to diary 403e49d657

feat(blogPost): add routing bdfa671c18

Merge remote-tracking branch 'refs/remotes/origin/diary_refactor' 4f7f660cbd

# 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

merge b7ca00b948

Merge remote-tracking branch 'refs/remotes/origin/feature_blogPosts' 7d8a281337

# Conflicts:
#	lib/app_router.dart
#	lib/features/blog_post_create/presentation/pages/blog_post_create_screen.dart
#	pubspec.yaml

merge 35ce394471

Merge remote-tracking branch 'refs/remotes/origin/calendar' cf45e14bb7

# 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

merge c9f293159e

refactor(baseUrl): -> dev2, fix location 6946060c86

refactor(chat): fix chat null 9cfd59b36f

refactor(registration): remove username 2f1d6425dc

feat(blogPost): add recipes 264b10bd0d

feat(app): Server changed to dev2 c83bfee7cc

revert c83bfee7cc f3d099fe0c

revert feat(app): Server changed to dev2

feat(feed): recipes screen c78f8dacdf

feat(feed): add recipes screen 904adbba2f

feat(recipes): add recipes screen 3ba48289b0

feat(diary): Diary ID is passed on calendar click, new layouts for calendar, fixed nutrition chart 5d13358fbc

feat(diary): Diary ID is passed on calendar click, new layouts for calendar, fixed nutrition chart 5ddaf42a5f

feat(calendar): Calendar to diary transition 45e796152c

Merge branch 'main' into feature/feed 21e03d956c

Merge pull request 'feature/feed' (#92 ) from feature/feed into main 78f0db6df0

Reviewed-on: maxxkim/eatvio_app#92

feat(feed): add diets api and create blog post screen, fix status bar f4c6aebdff

Merge pull request 'feat(feed): add diets api and create blog post screen, fix status bar' (#95 ) from feature/feed into main 6b79d1880b

Reviewed-on: maxxkim/eatvio_app#95

feat(calendar): Diet days marked in calendar, diet preview page added a2ea8dd2ba

feat(diary): new layouts for diary 1e8b94c6f6

feat(diary): new layouts for diary c3804bbb20

feat(diary): Remove photo is now an icon over the picture c5c6ec0e98

feat(diary): Remove photo is now an icon over the picture 16d0863958

feat(diary): Chart refactor, photo add and delete refactor e72ecb5e28

feat(diary): Recommended diet product list for current day (stump) fa7bedbac7

Merge pull request 'Update main repository' (#105 ) from maxxkim/eatvio_app:main into main

Android Release / build (pull_request) Failing after 8m17s

Details

Eatvio App Android Test / build (pull_request) Successful in 12m27s

Details

6183a905f2

Reviewed-on: eatvio/eatvio_app#105

apoloz merged commit 6b8fa69269 into main

2024-08-12 09:17:02 +00:00

apoloz referenced this issue from a commit

2024-08-12 09:17:03 +00:00

Merge pull request 'sync main' (#2) from eatvio/eatvio_app:main into main

Sign in to join this conversation.

1 Participants

Notifications

Due Date

No due date set.

Dependencies

No dependencies set.

Reference: apoloz/eatvio_app_old#2