Commit graph

233 commits

Author SHA1 Message Date
Aysegul
9aae8f918f added pop up view ingredients + warnings for delete 2026-01-09 21:42:57 +01:00
Natalia Cholewa
97774cf709 fix: tests didn't compile oops 2026-01-09 16:34:42 +01:00
Rithvik Sriram
a7d9fcb37b style(client): align ingredient and step list widths
- Remove AnchorPane wrappers from IngredientList and RecipeStepList
- Set maxWidth to Infinity on root VBox elements
- Set maxWidth to Infinity on ListView components
- Both lists now have consistent widths and fill container space

Fixes #48
2026-01-09 16:33:01 +01:00
Natalia Cholewa
74b6f25e24 feat: language in recipes 2026-01-09 14:54:42 +01:00
41353f2252 Logging for flow of the data exchange between client/server 2026-01-09 12:24:18 +01:00
b01d313c9a Merge branch 'client/incremental-websocket-modelling' into 'main'
fix(client/ws): Detailed WebSocket modelling

Closes #31

See merge request cse1105/2025-2026/teams/csep-team-76!39
2026-01-07 11:35:31 +01:00
ef65f33b64
chore(client): use lambda arg 2026-01-06 21:45:29 +01:00
ed87f1c09f
fix(client/print): remove obsolete code & +notimplexception 2026-01-06 21:41:01 +01:00
0cc767d577
fix(client/main): fixed FIXME(1) edit box rendering 2026-01-06 21:36:40 +01:00
9f892e8fb1
refactor(client/ws): divorce WS data handler from the class constructor 2026-01-06 21:32:07 +01:00
6d56e684a3
fix(client): separate Main and UI for IDEA debugger to work
Reference: https://www.reddit.com/r/JavaFX/wiki/common-problems/#wiki_how_do_i_fix_.27error.3A_javafx_runtime_components_are_missing.27.3F
2026-01-06 18:10:51 +01:00
5de11428a8
chore(client): cleanup 2026-01-06 18:07:09 +01:00
042a43e06a
feat(client/ws): integrate changes from main and create client-side WS service 2026-01-06 18:06:40 +01:00
253da0b5bc chore(test/printExport): delegate creation to DefaultValueFactory 2026-01-05 17:24:29 +01:00
b60284fa14 fix(client/serverUtils): immigrate nulling IDs to addRecipe(Recipe) 2026-01-05 17:24:29 +01:00
33a542672f fix(test/client): implement pipeline testing skip in teardown function 2026-01-05 17:24:29 +01:00
c0add049be refactor(test/client): refactor client-side tests 2026-01-05 17:24:29 +01:00
71bb6d03ed fix(client): server utils setting related IDs to null 2026-01-05 17:24:29 +01:00
b77f4aee76 fix(client): fixed some issues on the client-side 2026-01-05 17:24:29 +01:00
f04bbc037e refactor(client): client-side refactor to new modelling 2026-01-05 17:24:29 +01:00
9958ae5fbe Merge branch 'client/ingredient-input-v2' into 'main'
refactor: make ingredient input cells capable of informal & formal inputs

Closes #14

See merge request cse1105/2025-2026/teams/csep-team-76!37
2026-01-05 16:33:28 +01:00
Natalia Cholewa
ee66b643ec refactor: make callbacks clean 2026-01-05 16:05:27 +01:00
6ca38e6613
chore: correct wrong reference to super in commitEdit calls 2025-12-22 00:21:16 +02:00
e4fc67e816
refactor: make ingredient input cells capable of informal & formal inputs 2025-12-21 23:41:48 +02:00
Natalia Cholewa
d2ad5337b9 refactor: put recipe detail controller into its own file, don't use guice for injecting fxml controllers 2025-12-20 22:53:00 +01:00
Aysegul Aydinlik
086b8539c3 added highlighting fav recipes + list 2025-12-20 09:26:41 +01:00
Natalia Cholewa
96eb19d74c merge main into feature/client-side-search 2025-12-19 23:43:39 +01:00
dee91f9245
fix: add period to PrintExportService as MR written before new checkstyle 2025-12-20 00:31:44 +02:00
4fc4ca7327 Merge branch 'feature/client_printExport' into 'main'
Print/Export functionality

See merge request cse1105/2025-2026/teams/csep-team-76!19
2025-12-19 23:28:49 +01:00
00e4bb03f4
refactor: newest delivery from main 2025-12-19 23:54:45 +02: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
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
7a58153cd6 added a star for favouriting a recipe and also unfavouriting it 2025-12-19 20:00:54 +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
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
Aysegul Aydinlik
d752dfbec0 added client side recipe favouriting 2025-12-18 13:25:20 +01:00
Mei Chang van der Werff
a45f31abed Removed all left over example code 2025-12-18 03:44:01 +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
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
3301c75354
feat: init ui definition nutrition view 2025-12-17 15:07:43 +01:00