Commit graph

256 commits

Author SHA1 Message Date
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
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
4bb595dc6b
fix: resolve issue with resource filepath 2025-12-05 16:10:01 +01:00
Rithvik Sriram
b38e0e7482 fixed all pipeline errors 2025-12-05 15:27:53 +01:00
Rithvik Sriram
2339d70499 Merge branch 'feature/client_navigation' into feature/client_printExport 2025-12-05 15:22:05 +01:00
Rithvik Sriram
7d32799f13 Print export Unit tests are written 2025-12-05 15:21:19 +01:00
Rithvik Sriram
4414328fe0 changes from the reviewers implemented, some more error handling implemented with the load function of the show method 2025-12-05 14:12:05 +01:00
Rithvik Sriram
91fbefb392 Basic print functionality done with comments 2025-12-05 13:54:56 +01:00
Rithvik Sriram
2cc702b8f8 Merge branch 'feature/client_config' into 'main'
Added Feature/client config

See merge request cse1105/2025-2026/teams/csep-team-76!8
2025-12-05 13:44:49 +01:00
10868134b0
fix: autoselect cloned recipe after cloning operation 2025-12-04 23:11:16 +01:00
Rithvik Sriram
0bfff2719e fundamental print logic implemented 2025-12-04 22:37:45 +01:00
409877a6fb
chore: a farewell to Add* UI elements 2025-12-04 22:20:54 +01:00
c2fa31aa9f
fix: no null pointer exceptions if the user can't see anything :) 2025-12-04 22:13:22 +01:00
603de94870
feat: bold font recipe name + i18n for controllers 2025-12-04 22:08:39 +01:00
5dd6c89f73
feat: extract abstract OrderedEditableListCell<T>
Abstracts the editable list cell code to make it extendable.

Also includes fix for index (now starts at 1)
2025-12-04 21:39:55 +01:00
40d157cc6c
fix: remove LocaleAware constraint from MainCtrl 2025-12-04 21:09:12 +01:00
Rithvik Sriram
69ae19711b Code handling navigation done by a navigation class with one method 2025-12-04 19:12:31 +01:00
Rithvik Sriram
79b3c0a967 Merge branch 'feature/client_config' into feature/client_navigation
pulling in checkstyle to unblock CI
2025-12-04 18:55:11 +01:00
ccb72481fd
feat: resolve TODO autofocus edit box 2025-12-04 18:22:26 +01:00
30cbfbc454
fix: rectify a NPE caused by wrong ListView model
Apparently a thing can be selected but not focused. Oops.
2025-12-04 18:22:10 +01:00
73324022b0
chore: cleanup debug sout (oops) 2025-12-04 18:21:02 +01:00
Rithvik Sriram
1ad959b238 fixed pipeline issues 2025-12-04 18:09:30 +01:00
8747537901
chore: purge dead weight code 2025-12-04 17:46:52 +01:00
0bec62b9a3
feat: integrate steps list updates
uses JavaFX includes to incorporate a nested controller
2025-12-04 17:46:38 +01:00
2ce855aa3d
feat: integrate ingredient list updates 2025-12-04 17:31:34 +01:00