Commit graph

388 commits

Author SHA1 Message Date
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
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
Rithvik Sriram
26483e6d13 Added all suggested changes from the comments by reviewers 2025-12-04 17:28:02 +01:00
Rithvik Sriram
244ec5ee10 Fixed all changes from comments from merge 2025-12-04 17:07:48 +01:00
bc3744aee5
fix: use proper ServerUtils for the availability check 2025-12-04 17:00:49 +01:00
7d2cadc800
refactor: integrate remote main changes (locale) 2025-12-04 16:56:07 +01:00
Aysegul Aydinlik
78e7f90024 backend stuff for ingredients and nutritions AND FIXED MAGIC NUMBERS 2025-12-04 15:41:43 +01:00
Oskar Rasieński
be82031c1e Merge branch 'feature/locale' into 'main'
feature/locale

See merge request cse1105/2025-2026/teams/csep-team-76!12
2025-12-04 14:43:33 +01:00
Aysegul Aydinlik
88dc43613f backend stuff for ingredients and nutritions 2025-12-04 14:41:45 +01:00
Oskar Rasieński
342c10bcdb added @override to initializeComponents 2025-12-04 14:39:53 +01:00
Oskar Rasieński
c0be17e0b0 overengineered locale switch 2025-12-04 14:36:00 +01:00
Oskar Rasieński
2c75567a7d changed default title names 2025-12-04 14:26:51 +01:00
d42e6ff74c
feat: new UX for add/edit/update recipes
Revised adding recipes to have untitled recipes with inline name editing
(name edit box autofocused upon recipe creation)
2025-12-04 13:34:28 +01:00
805c8fd6ea
feat: refactor the element tree to make inline recipe name change possible 2025-12-04 13:32:32 +01:00
Oskar Rasieński
c7b651e266 fixed errors with detailed view on deletions and edits 2025-12-04 02:14:48 +01:00
Oskar Rasieński
f9db7cf370 removed non existing button 2025-12-04 01:41:27 +01:00
Oskar Rasieński
d0a61aadd8 small fixes 2025-12-04 01:41:01 +01:00
Oskar Rasieński
ebd896cbee All locale should work now 2025-12-04 01:37:32 +01:00
Oskar Rasieński
91c8469282 Everything except window titles works with resource bundles 2025-12-04 01:15:27 +01:00
Oskar Rasieński
c53239d71e AddName, AddIngredient and AddStep all work with localization 2025-12-04 00:26:33 +01:00
Oskar Rasieński
6e9ac2b055 Added base locale functionality. Works in AddNameCtrl for now. 2025-12-04 00:00:38 +01:00
Natalia Cholewa
fc13f7b847 Merge branch 'workingButtons' into 'main'
Making working buttons

Closes #3

See merge request cse1105/2025-2026/teams/csep-team-76!10
2025-12-03 21:09:04 +01:00
Mei Chang van der Werff
29278c2fc1 removing example code 2025-12-02 18:46:38 +01:00
Mei Chang van der Werff
ca00ee8e79 star import checkstyle error fix 2025-12-02 18:20:47 +01:00
Mei Chang van der Werff
517984a9f5 Some checkstyle fixes 2025-12-02 18:07:45 +01:00