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
Mei Chang van der Werff
f800bfeec4
User manually puts in the port
2026-01-17 00:00:43 +01:00
Natalia Cholewa
7320dd1e46
docs: minutes for week 08
2026-01-16 23:40:00 +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
675e2799a5
Fixed usages of delete.
2026-01-16 19:12:33 +01:00
Oskar Rasieński
face654aa5
Made delete() return a deepcopy of recipe.
2026-01-16 19:11:48 +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
Mei Chang van der Werff
61562d58dc
added some tests
2026-01-16 16:30:37 +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
Aysegul Aydinlik
90653ec312
Merge branch 'Server-testing' into 'main'
...
IngredientController test + a small refactor
Closes #61 and #62
See merge request cse1105/2025-2026/teams/csep-team-76!61
2026-01-16 15:05:12 +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
Mei Chang van der Werff
45bc4e1a1c
Checkstyle errors fix
2026-01-16 03:36:23 +01:00
Mei Chang van der Werff
1c4085ce51
actually set the prgram to the free port
2026-01-16 03:30:37 +01:00
Mei Chang van der Werff
bc144b52ae
Searching for available port method
2026-01-16 03:30:11 +01:00
Aysegul Aydinlik
e2ccad1116
made a few tests for ingredients also did a TODO, made the code for RecipeControllerTest a little bit more readable too
2026-01-15 23:00:47 +01:00
Oskar Rasieński
780724c14a
Merge branch 'client-imposter-fix' into 'main'
...
Fixed Języki having UTF-8 ? instead of ę.
Closes #65
See merge request cse1105/2025-2026/teams/csep-team-76!60
2026-01-15 17:40:57 +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
Aysegul Aydinlik
8542e66869
Agenda-08
2026-01-15 12:38:36 +01:00
Oskar Rasieński
22a8bc4708
Merge branch 'client/server-utils-tests-mock' into 'main'
...
Client/server utils tests mock
See merge request cse1105/2025-2026/teams/csep-team-76!56
2026-01-15 01:07:59 +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
