Commit Graph

  • 6b8fa69269 Merge pull request 'sync main' (#2) from eatvio/eatvio_app:main into main main apoloz 2024-08-12 09:17:01 +00:00
  • 6183a905f2 Merge pull request 'Update main repository' (#105) from maxxkim/eatvio_app:main into main apoloz 2024-08-12 09:15:20 +00:00
  • fa7bedbac7 feat(diary): Recommended diet product list for current day (stump) maxxkim 2024-08-09 17:40:01 +03:00
  • e72ecb5e28 feat(diary): Chart refactor, photo add and delete refactor maxxkim 2024-08-09 17:29:41 +03:00
  • 16d0863958 feat(diary): Remove photo is now an icon over the picture maxxkim 2024-08-08 17:12:44 +03:00
  • c5c6ec0e98 feat(diary): Remove photo is now an icon over the picture maxxkim 2024-08-08 17:10:51 +03:00
  • c3804bbb20 feat(diary): new layouts for diary maxxkim 2024-08-08 13:35:10 +03:00
  • 1e8b94c6f6 feat(diary): new layouts for diary maxxkim 2024-08-08 13:34:35 +03:00
  • a2ea8dd2ba feat(calendar): Diet days marked in calendar, diet preview page added maxxkim 2024-08-08 12:22:15 +03:00
  • 6b79d1880b Merge pull request 'feat(feed): add diets api and create blog post screen, fix status bar' (#95) from feature/feed into main mso7nueh 2024-08-08 07:41:23 +00:00
  • f4c6aebdff feat(feed): add diets api and create blog post screen, fix status bar mso7nueh 2024-08-08 10:39:53 +03:00
  • 78f0db6df0 Merge pull request 'feature/feed' (#92) from feature/feed into main maxxkim 2024-08-06 12:33:56 +00:00
  • 21e03d956c Merge branch 'main' into feature/feed maxxkim 2024-08-06 12:03:58 +00:00
  • 45e796152c feat(calendar): Calendar to diary transition maxxkim 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 maxxkim 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 maxxkim 2024-08-02 18:08:28 +03:00
  • 3ba48289b0 feat(recipes): add recipes screen mso7nueh 2024-08-02 17:52:06 +03:00
  • 904adbba2f feat(feed): add recipes screen mso7nueh 2024-08-02 11:52:10 +03:00
  • c78f8dacdf feat(feed): recipes screen mso7nueh 2024-08-02 11:50:47 +03:00
  • f3d099fe0c revert c83bfee7cc maxxkim 2024-08-02 07:29:32 +00:00
  • c83bfee7cc feat(app): Server changed to dev2 maxxkim 2024-08-02 10:20:06 +03:00
  • 264b10bd0d feat(blogPost): add recipes mso7nueh 2024-07-31 17:41:38 +03:00
  • 2f1d6425dc refactor(registration): remove username mso7nueh 2024-07-31 15:44:04 +03:00
  • 9cfd59b36f refactor(chat): fix chat null mso7nueh 2024-07-31 15:35:14 +03:00
  • 6946060c86 refactor(baseUrl): -> dev2, fix location mso7nueh 2024-07-31 14:39:36 +03:00
  • c9f293159e merge mso7nueh 2024-07-31 13:56:07 +03:00
  • cf45e14bb7 Merge remote-tracking branch 'refs/remotes/origin/calendar' mso7nueh 2024-07-31 13:49:24 +03:00
  • 35ce394471 merge mso7nueh 2024-07-31 13:35:26 +03:00
  • 7d8a281337 Merge remote-tracking branch 'refs/remotes/origin/feature_blogPosts' mso7nueh 2024-07-31 13:34:47 +03:00
  • b7ca00b948 merge mso7nueh 2024-07-31 13:29:05 +03:00
  • 4f7f660cbd Merge remote-tracking branch 'refs/remotes/origin/diary_refactor' mso7nueh 2024-07-31 13:18:23 +03:00
  • bdfa671c18 feat(blogPost): add routing mso7nueh 2024-07-31 13:10:07 +03:00
  • 403e49d657 feat(calendar): Routes to diary maxxkim 2024-07-31 13:09:28 +03:00
  • a2360a1c19 feat(diary): Nutrition chart looks like half-donut maxxkim 2024-07-31 12:21:17 +03:00
  • e6b1218199 feat(registration): add location by coordinates mso7nueh 2024-07-31 11:36:03 +03:00
  • 3af1318d1c feature(blogPosts): fix grey screen mso7nueh 2024-07-29 16:14:48 +03:00
  • 2b3a3a0e93 feature(blogPosts): refactor main screen mso7nueh 2024-07-29 15:55:48 +03:00
  • f96c6b53d6 feature(registration): fix location model mso7nueh 2024-07-29 11:20:01 +03:00
  • 818721a993 feature(registration): add location endpoint with debounce mso7nueh 2024-07-28 18:39:36 +03:00
  • 56e5cdbe16 fix(calendar): Finished days fix maxxkim 2024-07-25 16:53:49 +03:00
  • 102154ddb2 feat(calendar): Calendar Event class maxxkim 2024-07-25 15:29:30 +03:00
  • 6312de5aa8 feat(calendar): Initial layouts models and API for calendar maxxkim 2024-07-25 14:16:13 +03:00
  • 6886997fde fix(diary):fix maxxkim 2024-07-25 10:42:39 +03:00
  • 2d15e9ea4e refactor(diary): Diary updated on method call success maxxkim 2024-07-25 10:36:14 +03:00
  • 0671c5d072 refactor(diary): API methods all refactored and new nutrition charty finished maxxkim 2024-07-24 17:12:28 +03:00
  • 7535e82422 fix(diary): Remove portion API call fixed maxxkim 2024-07-19 15:51:39 +03:00
  • be461e4183 feat(diary): New models for calendar and autocomplete fix maxxkim 2024-07-19 11:55:48 +03:00
  • e472121bbc feature(blogPosts): pick only one image mso7nueh 2024-07-17 17:08:01 +03:00
  • a94e2b9db4 feature(blogPosts): add image load, fix blog post view mso7nueh 2024-07-17 17:04:00 +03:00
  • 863bd3132c Merge pull request 'feature(registration): редизайн авторизации, добавлена оферта' (#86) from mso7nueh-feat(chat) into main mso7nueh 2024-07-17 09:50:38 +00:00
  • 220206ae1c feature(registration): редизайн авторизации, добавлена оферта mso7nueh 2024-07-17 12:48:38 +03:00
  • dbe8ac0999 refactor(diary): API mor produc nutritional and new Product model maxxkim 2024-07-17 12:39:31 +03:00
  • b5becbe665 refactor(diary): API mor produc nutritional and new Product model maxxkim 2024-07-17 12:39:09 +03:00
  • 20d253313a refactor(diary): Merge conflic resolve maxxkim 2024-07-15 18:13:44 +03:00
  • 8610cacc6f refactor(diary): Refactor product input maxxkim 2024-07-15 17:44:33 +03:00
  • a35a5b6d6b Merge pull request 'mso7nueh-feat(chat)' (#84) from mso7nueh-feat(chat) into main mso7nueh 2024-07-15 14:37:45 +00:00
  • fc58ec6042 feature(registration): iter 7 mso7nueh 2024-07-15 17:34:04 +03:00
  • ae213f39a5 fix(diary): Meal change method fix maxxkim 2024-07-15 17:10:55 +03:00
  • d859a15cfd feature(registration): remove .env mso7nueh 2024-07-15 17:06:13 +03:00
  • 726b74a236 feature(registration): iter6 mso7nueh 2024-07-15 16:33:33 +03:00
  • 76c1effe12 fix(diary): Wakeup and retire time API method call fix maxxkim 2024-07-15 15:37:18 +03:00
  • b8227a492d fix(diary): Satiety and mood change API method call fix maxxkim 2024-07-15 15:06:14 +03:00
  • ee37f02d78 feature(registration): refactor i5 mso7nueh 2024-07-15 12:45:52 +03:00
  • b4993c827c fix(diary): UI errors fix maxxkim 2024-07-15 11:46:32 +03:00
  • 8cf2388b18 feature(registration): refactor i 4 mso7nueh 2024-07-15 11:19:29 +03:00
  • 4780caf389 feature(registration): refactor i 3. mso7nueh 2024-07-14 22:21:30 +03:00
  • d49ce2120a feature(registration): refactor i 2. mso7nueh 2024-07-14 22:16:59 +03:00
  • da447d6960 feature(registration): refactor 2 mso7nueh 2024-07-14 16:45:57 +03:00
  • 088fe08b37 feature(registration): refactor 1 mso7nueh 2024-07-14 16:44:08 +03:00
  • 3cdab9e1bb feature(registration): refactor mso7nueh 2024-07-14 16:30:10 +03:00
  • 12a0db5093 feat(registration): refactor mso7nueh 2024-07-14 16:25:00 +03:00
  • f3a0df20b7 refactor(diary): Fix maxxkim 2024-07-12 16:49:50 +03:00
  • c903fa4e65 feat(registration): fix mso7nueh 2024-07-12 14:48:17 +03:00
  • ed74fd99f0 refactor(diary): fix service mso7nueh 2024-07-12 14:33:18 +03:00
  • 89b94ea2a0 feature(registration): try push mso7nueh 2024-07-12 14:23:53 +03:00
  • 551debd450 refactor(diary): API connect attempt maxxkim 2024-07-12 13:16:01 +03:00
  • e3a134b73a feature(registration): fix tests mso7nueh 2024-07-11 18:36:17 +03:00
  • b9ea8afd4e Revert "feature(registration): temp remove test" mso7nueh 2024-07-11 18:30:21 +03:00
  • c4fd047d60 feature(registration): temp remove test mso7nueh 2024-07-11 18:28:02 +03:00
  • 2294d11ee7 feature(registration): fix analyzer 2 mso7nueh 2024-07-11 18:09:42 +03:00
  • 0f50f3b1c9 feature(registration): fix analyzer mso7nueh 2024-07-11 17:39:36 +03:00
  • aacba077b7 feature(registration): new registration flow mso7nueh 2024-07-11 14:49:50 +03:00
  • e4cde31d76 refatcor(diary): Refactored (doesn't work yet though) maxxkim 2024-07-11 14:35:29 +03:00
  • c3f7853d0e refactor(all): refactor fix alex 2024-07-09 17:51:05 +03:00
  • e180ff16b6 refactor(all): refactor alex 2024-07-09 17:50:32 +03:00
  • 2fe58516c6 Merge pull request 'mso7nueh-feat(chat)' (#46) from mso7nueh-feat(chat) into main mso7nueh 2024-07-09 08:18:25 +00:00
  • f79b9f03ae feat(chat): add badges alex 2024-07-09 11:17:32 +03:00
  • 5f88f49c71 feat(chat): add chat lazy loading, send message and websocket init for notifications and new chat messages alex 2024-07-05 22:28:03 +03:00
  • 7514a9b75f feat(chat): add chat load alex 2024-07-03 19:06:51 +03:00
  • def95aeeb5 refactor(diary): LocatorService reg maxxkim 2024-07-03 17:45:36 +03:00
  • 3c4afe96d6 refactor(diary): Cubit and state for diary maxxkim 2024-07-03 17:39:18 +03:00
  • ef6ea4ef56 Merge pull request 'mso7nueh-feat(chat)' (#45) from mso7nueh-feat(chat) into diary_refactor mso7nueh 2024-07-03 14:08:17 +00:00
  • c743c0c614 Merge pull request 'mso7nueh-feat(chat)' (#44) from mso7nueh-feat(chat) into main mso7nueh 2024-07-03 14:07:36 +00:00
  • 0a25800038 fix(feed): fix feed repository alex 2024-07-03 17:06:28 +03:00
  • fee91ecaa4 Merge pull request 'main' (#43) from main into mso7nueh-feat(chat) maxxkim 2024-07-03 13:55:37 +00:00
  • 507598d962 Merge pull request 'main' (#42) from main into diary_refactor maxxkim 2024-07-03 13:55:24 +00:00
  • 70f6509af8 Merge pull request 'mso7nueh-feat(chat)' (#40) from mso7nueh-feat(chat) into main maxxkim 2024-07-03 13:55:08 +00:00
  • b4180f7bc9 Merge pull request 'fix(app): Merge conflict resolve' (#41) from diary_refactor into main maxxkim 2024-07-03 13:54:56 +00:00
  • 562935a30f fix(app): Merge conflict resolve maxxkim 2024-07-03 16:54:38 +03:00
  • 5dfce4b173 Merge pull request 'diary_refactor' (#39) from diary_refactor into main maxxkim 2024-07-03 13:51:55 +00:00