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
23447a96d6
feat(commons/recipe): introduce weight sum calculations
2026-01-22 14:52:32 +01:00
b7bbebe222
feat(client/scaling): initial implementation
2026-01-22 14:51:03 +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
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
47d8aa7721
fix: got it
2026-01-21 16:12:00 +01:00
3a0120dc33
fix: getting to it
2026-01-21 15:53:58 +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
8422734a3f
feat(commons/kcal): kcal eval infrastructure
2026-01-21 14:47:46 +01:00
Mei Chang van der Werff
06dde451f3
Merge branch 'feature/fav-highlight' into 'main'
...
A favourited recipe now becomes blue in text
Closes #74
See merge request cse1105/2025-2026/teams/csep-team-76!77
2026-01-21 14:46:35 +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
Mei Chang van der Werff
3ed44b3626
Merge branch 'PortChange' into 'main'
...
Portchange
Closes #64
See merge request cse1105/2025-2026/teams/csep-team-76!62
2026-01-19 20:34:01 +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
2a4b6d3fce
Merge branch 'bugfix/quick-20260119' into 'main'
...
fix: use Endpoints for filtered recipe urls
See merge request cse1105/2025-2026/teams/csep-team-76!75
2026-01-19 15:27:41 +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
Mei Chang van der Werff
8f0880c215
deleted unused import
2026-01-19 02:44:19 +01:00
Mei Chang van der Werff
c524975854
removed test that fails pipeline
2026-01-19 02:43:05 +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
5a0503de10
Merge branch 'refactor/server-utils' into 'main'
...
Make ServerUtils use server address from config, refactor endpoint generation
See merge request cse1105/2025-2026/teams/csep-team-76!67
2026-01-18 16:37:40 +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
5388c52aaa
Merge branch 'guice-fix' into 'main'
...
Fixed httpclient implementation in guice
See merge request cse1105/2025-2026/teams/csep-team-76!71
2026-01-18 16:22:01 +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
717e44154f
Merge branch 'client/feature-ingredient-select-dropdown' into 'main'
...
feat(client/ingredients): make ingredient list into dropdown
Closes #67
See merge request cse1105/2025-2026/teams/csep-team-76!64
2026-01-17 13:48:45 +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
Mei Chang van der Werff
1da7f416d4
magic number fix
2026-01-17 00:03:46 +01:00
