Mei Chang van der Werff
9077df5164
Merge branch 'fix/Ingredients-ordered' into 'main'
...
Sorts ingredients in alphabetic order
Closes #75
See merge request cse1105/2025-2026/teams/csep-team-76!80
2026-01-22 16:43:47 +01:00
23d6d6bbf6
Merge branch 'client/feature-servings' into 'main'
...
feat(client/servings): inferring serving size from user input
Closes #72
See merge request cse1105/2025-2026/teams/csep-team-76!74
2026-01-22 15:24:46 +01:00
Aysegul Aydinlik
14a4e157ea
Merge branch 'testing-client' into 'main'
...
added IngredientControllerTest
Closes #77
See merge request cse1105/2025-2026/teams/csep-team-76!82
2026-01-22 15:17:03 +01:00
4e901f7847
fix: servings minimum as One
2026-01-22 14:52:33 +01:00
d83494c2a1
chore: move things around
2026-01-22 14:52:33 +01:00
6931367145
feat(client/main): append main UI logic to handle serving size rendering
2026-01-22 14:52:33 +01:00
8615187628
feat(client/serving): declare UI infrastructure and data deps for servings
2026-01-22 14:52:33 +01:00
b7bbebe222
feat(client/scaling): initial implementation
2026-01-22 14:51:03 +01:00
Aysegul Aydinlik
2dd8627f58
added IngredientControllerTest + fix pipeline
2026-01-22 14:50:52 +01:00
Aysegul Aydinlik
9603742220
added IngredientControllerTest + fix comments
2026-01-22 14:44:27 +01:00
46ba82bc0d
Merge branch 'client/feature-kcal-eval' into 'main'
...
feat(client/kcal): kcal/100g per recipe evaluation
Closes #71
See merge request cse1105/2025-2026/teams/csep-team-76!73
2026-01-22 14:40:38 +01:00
Aysegul Aydinlik
f7a1deb9b1
added IngredientControllerTest + fix pipeline fail
2026-01-22 14:31:49 +01:00
Aysegul Aydinlik
0acbb13a49
added IngredientControllerTest
2026-01-22 14:25:35 +01:00
Oskar Rasieński
5915b658e6
Merge branch 'lang-fix' into 'main'
...
Lang fix
See merge request cse1105/2025-2026/teams/csep-team-76!78
2026-01-22 01:21:43 +01:00
Mei Chang van der Werff
55b3811deb
Sorts ingredients in alphabetic order
2026-01-22 01:08:54 +01:00
72f29467bd
fix: no more NaN
2026-01-21 14:58:06 +01:00
Oskar Rasieński
2ca0acbeef
checkstyle fix...
2026-01-21 14:50:14 +01:00
7e5137b317
feat(client/kcal): ui logic for kcal eval
2026-01-21 14:47:46 +01:00
Oskar Rasieński
969d052230
translated ingredients menu
2026-01-21 14:34:57 +01:00
Mei Chang van der Werff
8989cab770
A favourited recipe now becomes blue in text
2026-01-21 14:21:30 +01:00
Oskar Rasieński
638220bb07
Fixed lang in main menu
2026-01-21 13:51:11 +01:00
83910eca72
Merge branch 'client/feature-recipe-scaling' into 'main'
...
feat(client/scaling): Implements client-side recipe scaling
Closes #70
See merge request cse1105/2025-2026/teams/csep-team-76!70
2026-01-19 21:12:20 +01:00
a8ec6f4f62
Merge branch 'turkish-' into 'main'
...
added turkish
Closes #73
See merge request cse1105/2025-2026/teams/csep-team-76!76
2026-01-19 20:35:28 +01:00
Aysegul
fca641b143
added turkish, replaced flag
2026-01-19 20:21:59 +01:00
54db9bddff
feat(client/scaling): initial implementation
2026-01-19 15:32:30 +01:00
Aysegul
be056fc17e
Add Turkish locale resources
2026-01-19 15:24:50 +01:00
Aysegul
32df26724a
added turkish
2026-01-19 15:16:51 +01:00
c6f6a6f73d
fix: use Endpoints for filtered recipe urls
2026-01-19 15:14:18 +01:00
Aysegul Aydinlik
19fdf7f361
Merge branch 'lang/toki-pona' into 'main'
...
Add toki pona as a language
See merge request cse1105/2025-2026/teams/csep-team-76!68
2026-01-19 14:51:43 +01:00
5d199e9a33
fix(client/util): replaced hardcoded values with configService-based impl
2026-01-18 18:39:43 +01:00
Oskar Rasieński
c214eff502
Merge branch 'favourite-refresh-fix' into 'main'
...
Fixed refreshing of recipeList when favouriting
See merge request cse1105/2025-2026/teams/csep-team-76!72
2026-01-18 18:33:31 +01:00
75e9fc1e62
Merge branch 'fix/search-bar-wiring' into 'main'
...
Refined search code and wired up the client side search with server
Closes #68
See merge request cse1105/2025-2026/teams/csep-team-76!66
2026-01-18 18:30:48 +01:00
Oskar Rasieński
1d33f3a3c1
Fixed refreshing of recipeList when favouriting
2026-01-18 16:50:48 +01:00
Natalia Cholewa
4e574bed8d
fix: pipeline
2026-01-18 16:32:01 +01:00
Natalia Cholewa
d2166abf7d
fix: s
2026-01-18 16:29:03 +01:00
Natalia Cholewa
ba956d60ac
fix: unused imports thank you
2026-01-18 16:29:03 +01:00
Natalia Cholewa
48e5581525
test: endpoints
2026-01-18 16:29:03 +01:00
Natalia Cholewa
cdf625294a
fix: endpoints not adding /api
2026-01-18 16:29:03 +01:00
Natalia Cholewa
0ad38aa710
refactor: change ServerUtils location
2026-01-18 16:29:03 +01:00
Natalia Cholewa
61ad8a1ea9
fix: resolve merge conflicts
2026-01-18 16:28:47 +01:00
Oskar Rasieński
5312e8d6b4
Fixed guice
2026-01-18 16:18:53 +01:00
2823711fcd
Merge branch 'client/fix-inject-httpclient' into 'main'
...
fix(client): use Guice injection pattern for HttpClient
Closes #59
See merge request cse1105/2025-2026/teams/csep-team-76!53
2026-01-17 14:28:18 +01:00
caa9e79846
fix(client/tests): fix client tests due to changes made to ServerUtils constructor; see FIXMEs
2026-01-17 13:44:09 +01:00
96b7241056
fix(client): to Guice DI pattern
2026-01-17 13:41:44 +01:00
5942250f11
docs: add notes to makeMenuItems
2026-01-17 13:38:22 +01:00
f87b4e7d37
feat(client/ingredients): make into dropdown
...
It is now possible to see a list of existing ingredients to choose from
in a dropdown menu.
Adds a server dependency to the ingredient list cell. Not ideal but
could be revamped in the future.
2026-01-17 13:38:22 +01:00
Natalia Cholewa
61f35a5b45
feat: toki pona
2026-01-16 23:02:40 +01:00
Oskar Rasieński
f6d5551408
Merge branch 'mourning-recipes' into 'main'
...
Mourning recipes
See merge request cse1105/2025-2026/teams/csep-team-76!65
2026-01-16 22:10:57 +01:00
Rithvik Sriram
1688e7fffa
Refined search code and wired up the client side search with server
2026-01-16 22:05:13 +01:00
Oskar Rasieński
caeacf86e0
Made Delete msg take Recipe instead of id and made alert for recipe mourning.
2026-01-16 19:13:35 +01:00
