Commit Graph

119 Commits

Author SHA1 Message Date
596343fe47 Removed unused imports 2022-01-26 14:27:16 +01:00
f133257194 Map user with JSON 2022-01-26 13:55:12 +01:00
4aafae9896 Merge branch 'option-ui' into merge
# Conflicts:
#	client/data/src/main/java/res/DataController.java
2022-01-26 13:26:15 +01:00
cb5982ef2d Added user class 2022-01-26 13:18:05 +01:00
2147ca1ad8 Added user methods 2022-01-25 20:01:22 +01:00
c4e24549d5 Use edit-event-endpoint to edit events 2022-01-25 19:37:49 +01:00
5e9a09fc7d print msg when config.json is missing 2022-01-25 19:20:06 +01:00
f0e431bf6c Refactored send get-request 2022-01-25 19:19:18 +01:00
f1f07a3515 Fixed main class 2022-01-25 19:18:38 +01:00
3848baddb6 Updated ui 2022-01-24 14:11:34 +01:00
b963a53d85 Fixed gitignore 2022-01-24 13:44:48 +01:00
057c4504d4 First view draft and create user connected 2022-01-24 13:42:11 +01:00
4f6d9670d0 Added logout function 2022-01-24 13:28:19 +01:00
8260c3f732 Removed file 2022-01-24 12:46:53 +01:00
c79e9a4581 Fixed special Chars 2022-01-24 12:45:08 +01:00
4ce4445d50 Merged 2022-01-23 22:05:23 +01:00
7aa615ce54 Merge branch '2410-develop' into merge
# Conflicts:
#	client/app/src/main/java/main/MainController.java
2022-01-23 21:33:42 +01:00
2c3d646c47 Added save login 2022-01-23 21:21:16 +01:00
e021809fd7 use camelCase for static methods 2022-01-23 17:41:40 +01:00
c040e54fb8 Added Config 2022-01-23 17:40:49 +01:00
4020d59284 Added a passwordField 2022-01-23 17:33:26 +01:00
0840ee1d12 Refactored code and added tooltips to the buttons 2022-01-21 11:13:44 +01:00
ea3288a345 Fixed bg-color 2022-01-21 07:58:27 +01:00
1439a67e7c Added svgButton to calender navigation (TODO: Fix bg.color) 2022-01-20 18:27:02 +01:00
14910083f4 Added svgButtons to the left navigation 2022-01-20 15:08:58 +01:00
9345dbc868 Moved SvgBtnCreator to helper package 2022-01-20 14:40:50 +01:00
45c58ea37f Made changeable size of svg 2022-01-20 13:52:35 +01:00
83c1ae6814 Made svg size to const 2022-01-20 13:50:59 +01:00
0d626bb6dc Refactored create svg Buttons 2022-01-20 13:49:07 +01:00
2f0c4b2a4c Added edit-function 2022-01-20 13:33:49 +01:00
141d294b79 Merge branch 'Add-SVGs' into merge 2022-01-19 11:45:04 +01:00
2269f05f52 Fixed event/add endpoint 2022-01-19 00:30:13 +01:00
78505097db Fixed event/all and event/del endpoints 2022-01-19 00:16:23 +01:00
7a119a8aed Merge branch 'merge' into 2410-develop 2022-01-18 22:30:08 +01:00
22e7d30678 Fixed MainApplication the second 2022-01-18 12:56:43 +01:00
3c0ebd24d7 Fixed MainApplication 2022-01-18 12:51:53 +01:00
f649b618cf Merge remote-tracking branch 'origin/merge' into merge 2022-01-18 12:46:31 +01:00
6e6183bf38 Updated create-user, css and the controller 2022-01-18 12:45:18 +01:00
0132077c62 Added edit and delete event svgs 2022-01-18 12:37:58 +01:00
5dafdf08b4 Fixed mainView calander nav Buttons 2022-01-18 10:00:33 +01:00
cf960ff6d6 Fixed mainView 2022-01-18 09:57:07 +01:00
521b1cb2f7 Merge remote-tracking branch 'origin/Update-components-to-JFoenix' into Update-components-to-JFoenix
# Conflicts:
#	client/app/src/main/java/main/CreateEventController.java
2022-01-18 09:48:22 +01:00
a24addf6ec Changed checkbox to toggleButton, refactored code 2022-01-18 09:46:36 +01:00
051000169e Updated login, main-wiew and the controllers 2022-01-15 09:24:30 +01:00
0893c4661e Updated event controller 2022-01-15 09:14:43 +01:00
53b631678a Create/edit event uses JFonix compnents 2022-01-14 23:52:11 +01:00
07c27e84d8 Changed create-event.fxml 2022-01-14 23:33:17 +01:00
0924625a0e Test to change component to JFoenix 2022-01-14 21:22:50 +01:00
947f31f20e Fixed login token 2022-01-14 19:37:06 +01:00
3fe16186e2 Improved layout, removed typ 2022-01-14 11:11:05 +01:00