Commit graph

463 commits

Author SHA1 Message Date
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
Oskar Rasieński
e41dc70f97 Modified Message and its subclasses to work nicely with jackson 2025-12-17 16:19:33 +01:00
Mei Chang van der Werff
a83885745c make the Unit Class enums 2025-12-17 15:35:14 +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
6d2a180fa2
feat: new rule to check javadoc comments 2025-12-07 21:17:33 +01:00
4c372fbdff
fix: MagicNumber check disabled in tests 2025-12-07 21:17:02 +01:00
Natalia Cholewa
f9d4901b6c Merge branch 'feature/ingredient-api' into 'main'
Ingredient controller and tests

See merge request cse1105/2025-2026/teams/csep-team-76!17
2025-12-06 14:16:17 +01:00
Maria Dumitrescu
68600b4222 feedback w4 2025-12-06 12:26:53 +01:00
Rithvik Sriram
fc211473ba Edit agenda-04.md 2025-12-05 23:24:38 +01:00
Natalia Cholewa
566a46178f chore: remove unnecessary dependency 2025-12-05 20:39:32 +01:00
11547778fa Merge branch 'bugfix/solve-resource-file-path' into 'main'
fix: resolve issue with resource filepath

Closes #16

See merge request cse1105/2025-2026/teams/csep-team-76!18
2025-12-05 16:24:42 +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
Natalia Cholewa
6d5f7af225 fix: the 26 checkstyle violations in tests (Thank you checkstyle) 2025-12-05 14:47:30 +01:00
Natalia Cholewa
6b659a2ced fix: formatting in ingredient controller 2025-12-05 14:40:12 +01:00
Natalia Cholewa
3af808ef58 feat: ingredient controller, websocket messages, ingredient controller tests 2025-12-05 14:38:43 +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
6129fc2a5a Merge branch 'feature/revised-client-ux-flow' into 'main'
feat: Revised UX flow for recipe details editing

Closes #13

See merge request cse1105/2025-2026/teams/csep-team-76!13
2025-12-05 12:56:06 +01:00
Natalia Cholewa
433f289c55 Merge branch 'feature/backend-websockets' into 'main'
Backend websockets

See merge request cse1105/2025-2026/teams/csep-team-76!16
2025-12-05 10:47:32 +01:00
Aysegul Aydinlik
cc75e42e8e Merge branch 'BackendOfIngredients' into 'main'
backend stuff for ingredients and nutritions

See merge request cse1105/2025-2026/teams/csep-team-76!14
2025-12-05 00:46:03 +01:00
Aysegul Aydinlik
1c9ff190ea backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS and fixed stevens and oskarsss problems 2025-12-05 00:30:12 +01:00
Aysegul Aydinlik
f9262d4046 backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS and fixed stevens and oskars problems 2025-12-05 00:12:53 +01:00
10868134b0
fix: autoselect cloned recipe after cloning operation 2025-12-04 23:11:16 +01:00
Natalia Cholewa
e85a43725d fix: checkstyle violations 2025-12-04 23:08:10 +01:00
Natalia Cholewa
25fdbcf49e fix: testing with websocket connection 2025-12-04 23:03:52 +01:00
Natalia Cholewa
cfacc37739 Merge remote-tracking branch 'origin/main' into feature/backend-websockets 2025-12-04 22:52:16 +01:00
Natalia Cholewa
8e24e47813 feat: topics, recipe messages 2025-12-04 22:52:14 +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
Oskar Rasieński
d57d7a25bd agenda week 4 2025-12-04 19:29:32 +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