Commit graph

231 commits

Author SHA1 Message Date
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
Oskar Rasieński
cce24ab61d Added isPending to ws dataservice 2026-01-16 19:04:51 +01:00
Aysegul Aydinlik
ecccebe7c5 Merge branch 'updated-button' into 'main'
Update badge addition

Closes #66

See merge request cse1105/2025-2026/teams/csep-team-76!63
2026-01-16 16:43:39 +01:00
Aysegul Aydinlik
1abbeee1ae Merge branch 'client/feature-ingredient-nutrition-view' into 'main'
feat(client/nutrition): Nutrition & Ingredient list view

Closes #54 and #56

See merge request cse1105/2025-2026/teams/csep-team-76!54
2026-01-16 16:12:17 +01:00
Aysegul
b739c78170 Update badge addition 2026-01-16 15:05:53 +01:00
Rithvik Sriram
920eca13d3 Merge branch 'feature/Persitsting_language_options' into 'main'
Add persistent language selection with ConfigService integration

Closes #25

See merge request cse1105/2025-2026/teams/csep-team-76!57
2026-01-16 12:33:00 +01:00
Oskar Rasieński
d278c31993 Improved comments 2026-01-15 17:38:14 +01:00
caecab5f41 Merge branch 'PENGUIN' into 'main'
added the penguin SELF MADE

Closes #63

See merge request cse1105/2025-2026/teams/csep-team-76!59
2026-01-15 17:36:36 +01:00
c5f338bf74
chore: cleanup 2026-01-15 17:24:19 +01:00
9f7f32beff
fix(commons/ingredient): add missing setters 2026-01-15 17:15:05 +01:00
1bfc103ecc
feat(client/nutrition): updated nutrition UI modelling
Uses "idiomatic JavaFX" to model automatic update propagation by object
view models.
2026-01-15 17:12:18 +01:00
b1bb4ad242
feat(client/utils): create update PATCH util function 2026-01-15 17:12:18 +01:00
6b851767e7
chore: integrate changes from newest main 2026-01-15 17:12:18 +01:00
Aysegul Aydinlik
ddd81814e5 added the penguin SELF MADE 2026-01-15 16:05:29 +01:00
Rithvik Sriram
b972023a6e Added changes where when the lang select menu gets initialized, the value is set to the previously selected language 2026-01-15 13:46:42 +01:00
Rithvik Sriram
981b64ae11 Removed redundant listener 2026-01-15 13:34:01 +01:00
Rithvik Sriram
5a17179fcb Merge branch 'fix/wiring_print_button_with_functionality' into 'main'
wiring the print button with the export service

See merge request cse1105/2025-2026/teams/csep-team-76!51
2026-01-15 13:12:50 +01:00
Rithvik Sriram
916fa07418 Add persistent language selection with ConfigService integration 2026-01-15 00:29:12 +01:00
Rithvik Sriram
069e60ef71 Refactored tests based on new constructor for recipes 2026-01-14 23:12:03 +01:00
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
Oskar Rasieński
da0c401168 wiremock dependency 2026-01-14 19:06:26 +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