5db8721148
Merge branch 'client/lang-button-dropdown' into 'main'
...
feat: Client language switching as dropdown menu
Closes #18
See merge request cse1105/2025-2026/teams/csep-team-76!21
2025-12-19 22:57:31 +01:00
00e4bb03f4
refactor: newest delivery from main
2025-12-19 23:54:45 +02:00
Mei Chang van der Werff
c56344d88a
Merge branch 'RecipeIngredientTest' into 'main'
...
Made tests for the RecipeIngredient class
Closes #20
See merge request cse1105/2025-2026/teams/csep-team-76!29
2025-12-19 22:34:41 +01:00
ca7c5cbfb9
fix(logic): immigrates LangSelectMenu to own controller
...
fix(println): also disappears the debug println statement from prod code
TODO: in the distant future, consider using a nice logging framework
(log4j?? or whatever spring boot is using..)
2025-12-19 23:29:27 +02:00
7e69976e5e
feat: controller for language list control
2025-12-19 23:10:50 +02:00
6b0d728ad3
chore: acquired flag images of langs
2025-12-19 23:10:50 +02:00
f7ff7497a2
feat: lang button into combo box
2025-12-19 23:10:50 +02:00
6c7a9434ca
chore: create display texts for langs
2025-12-19 23:10:50 +02:00
Mei Chang van der Werff
bb5e4a85a4
minutes for meeting week 6
2025-12-19 21:37:15 +01:00
Natalia Cholewa
d802d8627e
fix: checkstyle violations
2025-12-19 20:16:21 +01:00
Natalia Cholewa
4b28d073b9
Merge branch 'main' into 'feature/client-side-search'
...
# Conflicts:
# client/src/main/java/client/MyModule.java
# client/src/main/java/client/scenes/FoodpalApplicationCtrl.java
2025-12-19 20:12:51 +01:00
Natalia Cholewa
3c45143d76
feat: client side search box
2025-12-19 20:08:30 +01:00
Aysegul Aydinlik
96eff80653
Merge branch 'favourite-button-ui' into 'main'
...
added a star for favouriting a recipe and also unfavouriting it
See merge request cse1105/2025-2026/teams/csep-team-76!32
2025-12-19 20:03:21 +01:00
Aysegul Aydinlik
7a58153cd6
added a star for favouriting a recipe and also unfavouriting it
2025-12-19 20:00:54 +01:00
Aysegul Aydinlik
c07bae8d74
Merge branch 'favouriteMessage' into 'main'
...
Created a message for favourite Recipe
Closes #23
See merge request cse1105/2025-2026/teams/csep-team-76!30
2025-12-19 18:30:35 +01:00
Aysegul Aydinlik
3b53dd8ec6
Merge branch 'client/nutrition-view' into 'main'
...
feat: init ui definition nutrition view
Closes #9
See merge request cse1105/2025-2026/teams/csep-team-76!23
2025-12-19 18:29:40 +01:00
Mei Chang van der Werff
b0272fd276
Merge branch 'removeExampleCode' into 'main'
...
Removed all left over example code
Closes #27
See merge request cse1105/2025-2026/teams/csep-team-76!28
2025-12-19 00:48:19 +01:00
Rithvik Sriram
5feab76d94
Edit agenda-05.md
2025-12-18 20:44:14 +01:00
Aysegul Aydinlik
118aaef93a
Merge branch 'client-support-for-favourite' into 'main'
...
added client side recipe favouriting
See merge request cse1105/2025-2026/teams/csep-team-76!31
2025-12-18 19:31:18 +01:00
Oskar Rasieński
60efdc3a78
Merge branch 'feature/ws-client' into 'main'
...
Feature/ws-client
See merge request cse1105/2025-2026/teams/csep-team-76!25
2025-12-18 18:15:01 +01:00
Maria Dumitrescu
cf8d4096e7
feedback w6
2025-12-18 16:31:41 +01:00
Mei Chang van der Werff
3e47fdbb96
big Long instead of small long
2025-12-18 14:36:04 +01:00
Rithvik Sriram
6d66304bf3
Edit agenda-05.md
2025-12-18 14:32:04 +01:00
Rithvik Sriram
7f82d81b8c
Edit agenda-05.md
2025-12-18 14:27:02 +01:00
Aysegul Aydinlik
d752dfbec0
added client side recipe favouriting
2025-12-18 13:25:20 +01:00
Rithvik Sriram
65a7b0291a
Upload New File
2025-12-18 12:26:23 +01:00
Mei Chang van der Werff
b553cee6fd
fix checkstyle error
2025-12-18 04:27:04 +01:00
Mei Chang van der Werff
6794efa3a6
tested all units conversion and made every unit type a field
2025-12-18 04:25:42 +01:00
Mei Chang van der Werff
a45f31abed
Removed all left over example code
2025-12-18 03:44:01 +01:00
Mei Chang van der Werff
fef20ec876
refactor to setters TODO, ingredientController
2025-12-18 03:35:47 +01:00
Mei Chang van der Werff
a5ec17e486
created FavouriteRecipeMessage class
2025-12-18 03:25:12 +01:00
Mei Chang van der Werff
4a902ead20
ConvertToBaseUnit test + code fix
2025-12-18 03:20:03 +01:00
Mei Chang van der Werff
87f8a883d5
getUnit() tests
2025-12-18 03:20:03 +01:00
Aysegul Aydinlik
397bbedd9f
Merge branch 'quickfixforconfigissue' into 'main'
...
fixed 2 checkstyle errors and ConfigServiceTest.java issue
See merge request cse1105/2025-2026/teams/csep-team-76!27
2025-12-18 03:00:11 +01:00
Aysegul Aydinlik
1f545d3a63
fixed 2 checkstyle errors and ConfigServiceTest.java issue
2025-12-18 02:02:51 +01:00
19ebad93e8
Merge branch 'lenient-checkstyle' into 'main'
...
fix: A More Chill CheckStyle
Closes #15 and #17
See merge request cse1105/2025-2026/teams/csep-team-76!20
2025-12-17 22:21:15 +01:00
Mei Chang van der Werff
5d30a8eac1
Merge branch 'enumUnit' into 'main'
...
make the Unit Class enums
Closes #22
See merge request cse1105/2025-2026/teams/csep-team-76!24
2025-12-17 17:44:55 +01:00
Oskar Rasieński
8bceffa67c
Implemented websockets in foodpal ctrl.
2025-12-17 16:50:30 +01:00
Oskar Rasieński
3da89c386b
Created utils for websockets.
2025-12-17 16:26:27 +01:00
Oskar Rasieński
e41dc70f97
Modified Message and its subclasses to work nicely with jackson
2025-12-17 16:19:33 +01:00
Mei Chang van der Werff
a83885745c
make the Unit Class enums
2025-12-17 15:35:14 +01:00
3301c75354
feat: init ui definition nutrition view
2025-12-17 15:07:43 +01:00
Oskar Rasieński
f5eed945a2
Merge branch 'bugfix/new-recipe-selection' into 'main'
...
Bugfix/new recipe selection
Closes #21 and #19
See merge request cse1105/2025-2026/teams/csep-team-76!22
2025-12-17 13:44:52 +01:00
Oskar Rasieński
0dca957e43
Fixed bug and improved debug print
2025-12-17 13:32:14 +01:00
ca1d7ab872
Merge branch 'feature/client_navigation' into 'main'
...
Feature/client navigation
See merge request cse1105/2025-2026/teams/csep-team-76!15
2025-12-17 13:17:07 +01:00
ea840f032e
chore: add periods to all sentences.
2025-12-07 21:17:49 +01:00
6d2a180fa2
feat: new rule to check javadoc comments
2025-12-07 21:17:33 +01:00
4c372fbdff
fix: MagicNumber check disabled in tests
2025-12-07 21:17:02 +01:00
Natalia Cholewa
f9d4901b6c
Merge branch 'feature/ingredient-api' into 'main'
...
Ingredient controller and tests
See merge request cse1105/2025-2026/teams/csep-team-76!17
2025-12-06 14:16:17 +01:00
Maria Dumitrescu
68600b4222
feedback w4
2025-12-06 12:26:53 +01:00
