Commit graph

204 commits

Author SHA1 Message Date
Rithvik Sriram
6caf4eaa61 Merge branch 'main' into 'fix/wiring_print_button_with_functionality'
# Conflicts: fixed import merge conflict
#   client/src/main/java/client/scenes/recipe/RecipeDetailCtrl.java
2026-01-14 22:15:53 +01:00
Oskar Rasieński
5ef14ae5ee Improved comments 2026-01-14 19:54:56 +01:00
Oskar Rasieński
443908e7b6 Tests with wiremock 2026-01-14 19:41:34 +01:00
Oskar Rasieński
33b73c44b8 Wrong comment 2026-01-14 19:36:40 +01:00
Mei Chang van der Werff
4fce3d3551 fixing my 'fix' 2026-01-13 16:46:30 +01:00
Mei Chang van der Werff
92c1c0eb15 Merge conflict fix 2026-01-13 16:07:36 +01:00
adc79e2d71 Merge branch 'feature/client-recipe-i18n' into 'main'
Client recipe internationalization

Closes #39

See merge request cse1105/2025-2026/teams/csep-team-76!49
2026-01-13 16:05:21 +01:00
Aysegul Aydinlik
07d7e1b1a4 Merge branch 'fix/ingredient-step-list-sizing' into 'main'
style(client): align ingredient and step list widths

Closes #48

See merge request cse1105/2025-2026/teams/csep-team-76!46
2026-01-13 16:04:21 +01:00
Mei Chang van der Werff
625383070d refactor: ConfigServiceTest looks normal again 2026-01-10 20:01:43 +01:00
Mei Chang van der Werff
30635b4a21 added tests to configTest class to improve coverage 2026-01-10 20:01:06 +01:00
Mei Chang van der Werff
78fdb64bdf added test to improve coverage 2026-01-10 19:50:31 +01:00
Mei Chang van der Werff
c83d80bb74 Removed the server dependancy, so they aren't skipped 2026-01-10 19:17:07 +01:00
e5259c8253 fix(client/ui): silently fail ingredient input if any is null 2026-01-10 13:39:26 +01:00
Mei Chang van der Werff
973ccfc50e LOC maxxing 2026-01-09 23:59:17 +01:00
Rithvik Sriram
a82c69d21c Add print/export functionality for recipes
- Implement printRecipe() method in RecipeDetailCtrl to export recipes as text files
- Add directory chooser and filename input dialogs
- Integrate with existing PrintExportService for file generation
- Add comprehensive unit tests for PrintExportService methods
2026-01-09 23:54:21 +01:00
Mei Chang van der Werff
9479aa27b3 refactor:declaring in contructor looks nicer 2026-01-09 23:49:40 +01:00
Natalia Cholewa
453e5b11bd fix: pipeline not passing 2026-01-09 23:49:10 +01:00
Mei Chang van der Werff
a95c5ac7d0 made tests that work in gitlab, without being skipped 2026-01-09 23:44:43 +01:00
Natalia Cholewa
b130381154 feat: clientside language filter and recipe language selector 2026-01-09 23:35:30 +01:00
Aysegul Aydinlik
3c33f2ff35 Merge branch 'idkwhattonameitanymore' into 'main'
added pop up view ingredients + warnings for delete

Closes #53 and #55

See merge request cse1105/2025-2026/teams/csep-team-76!48
2026-01-09 22:47:54 +01:00
Aysegul
ec60b7b7d3 added pop up view ingredients + warnings for delete removed the star import 2026-01-09 21:47:10 +01:00
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