From 7e3bd6657131a8b128642a62df633b5ce3919af8 Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 13 Dec 2021 12:46:01 +0100 Subject: [PATCH 01/13] Improvement of the main-view.fxml and main-view.css --- .../app/src/main/resources/main/main-view.css | 54 +++++++++---------- .../src/main/resources/main/main-view.fxml | 21 ++++---- 2 files changed, 38 insertions(+), 37 deletions(-) diff --git a/client/app/src/main/resources/main/main-view.css b/client/app/src/main/resources/main/main-view.css index af0f292..f6a436d 100644 --- a/client/app/src/main/resources/main/main-view.css +++ b/client/app/src/main/resources/main/main-view.css @@ -1,70 +1,68 @@ * { - -fx-base-background-color: #2B2D42; - -fx-base1-background-color: #525E74; + -fx-dark-background-color: #525E74; + -fx-darkest-background-color: #2B2D42; + + -fx-bright-background-color: #77859E; + -fx-brighter-background-color: #52567E; + -fx-brightest-background-color: #ffffff; + + -fx-bright-border-color: #B0B0B0; + -fx-brighter-text-color: #ffffff; - -fx-main-border-color: #B0B0B0; - -fx-main-text-color: #ffffff; } - -GridPane{ - -fx-background-color: -fx-base-background-color; +.mainGrid{ + -fx-background-color: -fx-darkest-background-color; } -.main-panel{ - -fx-background-color: #282C34; -} - -.vbox-main{ - -fx-background-color: #333333; - -fx-alignment: top-center; - +.mainVbox{ + -fx-background-color: -fx-dark-background-color; } .gridCalendar Line{ - -fx-stroke: -fx-main-border-color; + -fx-stroke: -fx-bright-border-color; } .gridCalender{ - -fx-background-color: -fx-base-background-color; + -fx-background-color: -fx-darkest-background-color; -fx-min-height: 80px; -fx-max-height: 80px; } .labelMonth{ -fx-padding: 0 0 0 20; - -fx-background-color: #77859E; + -fx-background-color: -fx-bright-background-color; -fx-font-size: 35px; -fx-font-weight: bold; } .scrollDays{ - -fx-background-color: -fx-base-background-color; - -fx-border-color: -fx-main-border-color; + -fx-background-color: -fx-darkest-background-color; + -fx-border-color: -fx-bright-border-color; } .vBoxDays{ - -fx-background-color: -fx-base-background-color; + -fx-background-color: -fx-darkest-background-color; } .labelDays{ -fx-alignment: center; - -fx-background-color: -fx-base1-background-color; + -fx-background-color: -fx-dark-background-color; -fx-font-size: 25px; - -fx-border-color: -fx-main-border-color; + -fx-border-color: -fx-bright-border-color; } Label{ - -fx-text-fill: -fx-main-text-color; + -fx-text-fill: -fx-brighter-text-color; } .event{ - -fx-background-color: -fx-base1-background-color; + -fx-background-color: -fx-dark-background-color; } -.main-btn{ - -fx-background-color: #ffffff; - -fx-text-fill: -fx-main-text-color; +.mainBtn{ + -fx-background-color: -fx-brightest-background-color; + -fx-text-fill: -fx-brighter-text-color; -fx-background-radius: 5em; -fx-min-width: 40px; -fx-min-height: 40px; diff --git a/client/app/src/main/resources/main/main-view.fxml b/client/app/src/main/resources/main/main-view.fxml index b5bf7e2..f7b211a 100644 --- a/client/app/src/main/resources/main/main-view.fxml +++ b/client/app/src/main/resources/main/main-view.fxml @@ -5,7 +5,8 @@ - + @@ -13,17 +14,17 @@ - + - - - @@ -36,16 +37,19 @@ - From 898054bb63dab67355b22a7f4a09516d40d7bc22 Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Tue, 25 Jan 2022 11:14:16 +0100 Subject: [PATCH 02/13] Comments all Files with Creator name --- client/app/src/main/java/customUI/Button.java | 1 + client/app/src/main/java/customUI/Converter.java | 1 + client/app/src/main/java/customUI/Label.java | 1 + client/app/src/main/java/customUI/Tooltip.java | 1 + client/app/src/main/java/helper/SvgBtnCreator.java | 1 + .../src/main/java/main/CreateEventController.java | 5 ++++- .../src/main/java/main/EditEventController.java | 1 + client/app/src/main/java/main/MainApplication.java | 2 ++ client/app/src/main/java/main/MainController.java | 14 ++++++++++++++ .../src/main/java/users/CreateUserController.java | 1 + .../app/src/main/java/users/LoginController.java | 1 + .../app/src/main/resources/main/create-event.css | 1 + .../app/src/main/resources/main/create-event.fxml | 2 ++ client/app/src/main/resources/main/edit-event.fxml | 2 ++ client/app/src/main/resources/main/main-view.css | 1 + client/app/src/main/resources/main/main-view.fxml | 2 ++ .../app/src/main/resources/users/create-user.css | 1 + .../app/src/main/resources/users/create-user.fxml | 2 ++ client/app/src/main/resources/users/login.css | 1 + client/app/src/main/resources/users/login.fxml | 2 ++ client/data/src/main/java/config/Config.java | 1 + client/data/src/main/java/config/ConfigLoader.java | 1 + .../src/main/java/helper/HttpRequestException.java | 1 + client/data/src/main/java/helper/Tuple.java | 1 + client/data/src/main/java/res/DataController.java | 1 + client/data/src/main/java/res/Event.java | 1 + client/data/src/main/java/res/HttpRequest.java | 1 + 27 files changed, 49 insertions(+), 1 deletion(-) diff --git a/client/app/src/main/java/customUI/Button.java b/client/app/src/main/java/customUI/Button.java index 61df976..5aefb5d 100644 --- a/client/app/src/main/java/customUI/Button.java +++ b/client/app/src/main/java/customUI/Button.java @@ -1,3 +1,4 @@ +//Marc Beyer// package customUI; public class Button extends javafx.scene.control.Button { diff --git a/client/app/src/main/java/customUI/Converter.java b/client/app/src/main/java/customUI/Converter.java index dc737af..bb89c59 100644 --- a/client/app/src/main/java/customUI/Converter.java +++ b/client/app/src/main/java/customUI/Converter.java @@ -1,3 +1,4 @@ +//Marc Beyer// package customUI; public class Converter { diff --git a/client/app/src/main/java/customUI/Label.java b/client/app/src/main/java/customUI/Label.java index ad5321e..546502d 100644 --- a/client/app/src/main/java/customUI/Label.java +++ b/client/app/src/main/java/customUI/Label.java @@ -1,3 +1,4 @@ +//Marc Beyer// package customUI; public class Label extends javafx.scene.control.Label { diff --git a/client/app/src/main/java/customUI/Tooltip.java b/client/app/src/main/java/customUI/Tooltip.java index 2a5324a..77bd78e 100644 --- a/client/app/src/main/java/customUI/Tooltip.java +++ b/client/app/src/main/java/customUI/Tooltip.java @@ -1,3 +1,4 @@ +//Marco Kühn// package customUI; public class Tooltip extends javafx.scene.control.Tooltip { diff --git a/client/app/src/main/java/helper/SvgBtnCreator.java b/client/app/src/main/java/helper/SvgBtnCreator.java index c9546fe..6cf614f 100644 --- a/client/app/src/main/java/helper/SvgBtnCreator.java +++ b/client/app/src/main/java/helper/SvgBtnCreator.java @@ -1,3 +1,4 @@ +//Marco Kühn// package helper; import javafx.geometry.Bounds; diff --git a/client/app/src/main/java/main/CreateEventController.java b/client/app/src/main/java/main/CreateEventController.java index e36cd4a..6eb5d06 100644 --- a/client/app/src/main/java/main/CreateEventController.java +++ b/client/app/src/main/java/main/CreateEventController.java @@ -42,6 +42,7 @@ public class CreateEventController { public CreateEventController() { } + //Marco Kühn// @FXML public void initialize() { @@ -53,7 +54,7 @@ public class CreateEventController { timeEnd.setConverter(defaultConverter); } - + //Marc Beyer// @FXML protected void createBtnClick(ActionEvent actionEvent) { try { @@ -85,11 +86,13 @@ public class CreateEventController { } } + //Marc Beyer// protected void sendHttpRequest(Event event) throws HttpRequestException { DataController dataController = new DataController(); dataController.createEvent(event); } + //Marc Beyer// @FXML protected void abortBtnClick(ActionEvent event) { Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow(); diff --git a/client/app/src/main/java/main/EditEventController.java b/client/app/src/main/java/main/EditEventController.java index 58d1ea6..aa2fb1e 100644 --- a/client/app/src/main/java/main/EditEventController.java +++ b/client/app/src/main/java/main/EditEventController.java @@ -1,3 +1,4 @@ +//Marc Beyer// package main; import customUI.Converter; diff --git a/client/app/src/main/java/main/MainApplication.java b/client/app/src/main/java/main/MainApplication.java index 09274f4..7daa65c 100644 --- a/client/app/src/main/java/main/MainApplication.java +++ b/client/app/src/main/java/main/MainApplication.java @@ -1,3 +1,4 @@ +//Marc Beyer// package main; import config.Config; @@ -12,6 +13,7 @@ import res.HttpRequest; import java.io.IOException; import java.util.Objects; + public class MainApplication extends Application { @Override public void start(Stage stage) throws IOException { diff --git a/client/app/src/main/java/main/MainController.java b/client/app/src/main/java/main/MainController.java index dbc8948..feda480 100644 --- a/client/app/src/main/java/main/MainController.java +++ b/client/app/src/main/java/main/MainController.java @@ -58,6 +58,7 @@ public class MainController { } @FXML + //Marco Kühn,Marc Beyer// public void initialize() { createWeek(); setDates(); @@ -66,6 +67,7 @@ public class MainController { leftNav.setSpacing(40); } + //Marc Beyer// private void updateEvents() { for (VBox vBox : dayVBoxes) { vBox.getChildren().clear(); @@ -83,6 +85,7 @@ public class MainController { } } + //Marc Beyer// @FXML protected void onBackClick() { weekOffset--; @@ -90,6 +93,7 @@ public class MainController { updateEvents(); } + //Marc Beyer// @FXML protected void onTodayClick() { weekOffset = 0; @@ -97,6 +101,7 @@ public class MainController { updateEvents(); } + //Marc Beyer// @FXML protected void onNextClick() { weekOffset++; @@ -104,6 +109,8 @@ public class MainController { updateEvents(); } + + //Marco Kühn,Marc Beyer// @FXML protected void onAddBtnClick() { try { @@ -125,10 +132,12 @@ public class MainController { updateEvents(); } + //Marco Kühn// protected void onSettingBtnClick(){ } + //Marc Beyer// protected void onLogoutBtnClick(ActionEvent event){ ConfigLoader.save(new Config()); DataController.USER_ID = -1; @@ -137,6 +146,7 @@ public class MainController { stage.close(); } + //Marc Beyer// private void createWeek() { for (int i = 0; i < 7; i++) { Label label = new Label(); @@ -164,6 +174,7 @@ public class MainController { } } + //Marco Kühn ,Marc Beyer// private void addEvent(Event event) { VBox vBox = new VBox(); vBox.getStyleClass().add("event"); @@ -253,6 +264,7 @@ public class MainController { } } + //Marc Beyer// private String formatTime(String time) { String[] timeArr = time.split(":"); if (timeArr.length > 2) { @@ -261,6 +273,7 @@ public class MainController { return time; } + //Marc Beyer// private void setDates() { DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy"); DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM"); @@ -279,6 +292,7 @@ public class MainController { } + //Marco Kühn// private void createBtns(){ Group svgAdd = new Group( SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"), diff --git a/client/app/src/main/java/users/CreateUserController.java b/client/app/src/main/java/users/CreateUserController.java index 3f54a46..aa39bee 100644 --- a/client/app/src/main/java/users/CreateUserController.java +++ b/client/app/src/main/java/users/CreateUserController.java @@ -1,3 +1,4 @@ +//Alex Rechtin// package users; import javafx.event.ActionEvent; diff --git a/client/app/src/main/java/users/LoginController.java b/client/app/src/main/java/users/LoginController.java index 3bce950..569073d 100644 --- a/client/app/src/main/java/users/LoginController.java +++ b/client/app/src/main/java/users/LoginController.java @@ -1,3 +1,4 @@ +//Alex Rechtin// package users; import com.jfoenix.controls.*; diff --git a/client/app/src/main/resources/main/create-event.css b/client/app/src/main/resources/main/create-event.css index be03557..817e88c 100644 --- a/client/app/src/main/resources/main/create-event.css +++ b/client/app/src/main/resources/main/create-event.css @@ -1,3 +1,4 @@ +/*Marco Kühn*/ GridPane{ -fx-background-color: #3E415F; -fx-padding: 20px; diff --git a/client/app/src/main/resources/main/create-event.fxml b/client/app/src/main/resources/main/create-event.fxml index e2798db..706ff51 100644 --- a/client/app/src/main/resources/main/create-event.fxml +++ b/client/app/src/main/resources/main/create-event.fxml @@ -1,5 +1,7 @@ + + diff --git a/client/app/src/main/resources/main/edit-event.fxml b/client/app/src/main/resources/main/edit-event.fxml index 939dddb..00a1f33 100644 --- a/client/app/src/main/resources/main/edit-event.fxml +++ b/client/app/src/main/resources/main/edit-event.fxml @@ -1,5 +1,7 @@ + + diff --git a/client/app/src/main/resources/main/main-view.css b/client/app/src/main/resources/main/main-view.css index 56d1402..3dcf8ac 100644 --- a/client/app/src/main/resources/main/main-view.css +++ b/client/app/src/main/resources/main/main-view.css @@ -1,3 +1,4 @@ +/*Alex Rechtin, Marco Kühn*/ * { -fx-base-background-color: #2B2D42; -fx-base1-background-color: #525E74; diff --git a/client/app/src/main/resources/main/main-view.fxml b/client/app/src/main/resources/main/main-view.fxml index 8f2d3f8..5cd69e3 100644 --- a/client/app/src/main/resources/main/main-view.fxml +++ b/client/app/src/main/resources/main/main-view.fxml @@ -1,5 +1,7 @@ + + diff --git a/client/app/src/main/resources/users/create-user.css b/client/app/src/main/resources/users/create-user.css index 6d2ca93..2d13534 100644 --- a/client/app/src/main/resources/users/create-user.css +++ b/client/app/src/main/resources/users/create-user.css @@ -1,3 +1,4 @@ +/*Alex Rechtin*/ * { -fx-base-background-color: #2B2D42; -fx-base1-background-color: #525E74; diff --git a/client/app/src/main/resources/users/create-user.fxml b/client/app/src/main/resources/users/create-user.fxml index e542f73..629309d 100644 --- a/client/app/src/main/resources/users/create-user.fxml +++ b/client/app/src/main/resources/users/create-user.fxml @@ -1,5 +1,7 @@ + + diff --git a/client/app/src/main/resources/users/login.css b/client/app/src/main/resources/users/login.css index 687435b..963c6b6 100644 --- a/client/app/src/main/resources/users/login.css +++ b/client/app/src/main/resources/users/login.css @@ -1,3 +1,4 @@ +/* Marco Kühn*/ * { -fx-base-background-color: #2B2D42; -fx-base1-background-color: #525E74; diff --git a/client/app/src/main/resources/users/login.fxml b/client/app/src/main/resources/users/login.fxml index 9356f08..711054b 100644 --- a/client/app/src/main/resources/users/login.fxml +++ b/client/app/src/main/resources/users/login.fxml @@ -1,5 +1,7 @@ + + diff --git a/client/data/src/main/java/config/Config.java b/client/data/src/main/java/config/Config.java index 07e8b2f..ce4b5e8 100644 --- a/client/data/src/main/java/config/Config.java +++ b/client/data/src/main/java/config/Config.java @@ -1,3 +1,4 @@ +//Marc Beyer// package config; public class Config { diff --git a/client/data/src/main/java/config/ConfigLoader.java b/client/data/src/main/java/config/ConfigLoader.java index 56e195e..85af735 100644 --- a/client/data/src/main/java/config/ConfigLoader.java +++ b/client/data/src/main/java/config/ConfigLoader.java @@ -1,3 +1,4 @@ +//Marc Beyer// package config; import com.fasterxml.jackson.databind.ObjectMapper; diff --git a/client/data/src/main/java/helper/HttpRequestException.java b/client/data/src/main/java/helper/HttpRequestException.java index 972dd3f..1734ddc 100644 --- a/client/data/src/main/java/helper/HttpRequestException.java +++ b/client/data/src/main/java/helper/HttpRequestException.java @@ -1,3 +1,4 @@ +//Marc Beyer// package helper; public class HttpRequestException extends Exception{ diff --git a/client/data/src/main/java/helper/Tuple.java b/client/data/src/main/java/helper/Tuple.java index e342ad6..5ae234e 100644 --- a/client/data/src/main/java/helper/Tuple.java +++ b/client/data/src/main/java/helper/Tuple.java @@ -1,3 +1,4 @@ +//Marc Beyer// package helper; public class Tuple { diff --git a/client/data/src/main/java/res/DataController.java b/client/data/src/main/java/res/DataController.java index f920bac..bc9930b 100644 --- a/client/data/src/main/java/res/DataController.java +++ b/client/data/src/main/java/res/DataController.java @@ -1,3 +1,4 @@ +//Marc Beyer// package res; import com.fasterxml.jackson.core.JsonProcessingException; diff --git a/client/data/src/main/java/res/Event.java b/client/data/src/main/java/res/Event.java index efabe57..33a6515 100644 --- a/client/data/src/main/java/res/Event.java +++ b/client/data/src/main/java/res/Event.java @@ -1,3 +1,4 @@ +//Marc Beyer// package res; import com.sun.jdi.event.StepEvent; diff --git a/client/data/src/main/java/res/HttpRequest.java b/client/data/src/main/java/res/HttpRequest.java index 311fad4..cc4b46e 100644 --- a/client/data/src/main/java/res/HttpRequest.java +++ b/client/data/src/main/java/res/HttpRequest.java @@ -1,3 +1,4 @@ +//Marc Beyer// package res; import helper.Tuple; From ede28ae4a7b0f4c9d8ad52dc89192f78e6c6993c Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 11:06:21 +0100 Subject: [PATCH 03/13] Commit the new Files --- client/app/src/main/java/main/MainController.java | 1 + client/app/src/main/java/main/OptionController.java | 1 + client/app/src/main/java/users/EditUserController.java | 1 + client/app/src/main/resources/main/option-view.css | 1 + client/app/src/main/resources/main/option-view.fxml | 1 + 5 files changed, 5 insertions(+) diff --git a/client/app/src/main/java/main/MainController.java b/client/app/src/main/java/main/MainController.java index 541db6c..8473f08 100644 --- a/client/app/src/main/java/main/MainController.java +++ b/client/app/src/main/java/main/MainController.java @@ -1,3 +1,4 @@ +/* Marco Kühn, Marc Beyer */ package main; import config.Config; diff --git a/client/app/src/main/java/main/OptionController.java b/client/app/src/main/java/main/OptionController.java index 0cf0c33..e2915aa 100644 --- a/client/app/src/main/java/main/OptionController.java +++ b/client/app/src/main/java/main/OptionController.java @@ -1,3 +1,4 @@ +/* Marco Kühn */ package main; import com.jfoenix.controls.*; diff --git a/client/app/src/main/java/users/EditUserController.java b/client/app/src/main/java/users/EditUserController.java index 703eb3d..3b00b42 100644 --- a/client/app/src/main/java/users/EditUserController.java +++ b/client/app/src/main/java/users/EditUserController.java @@ -1,3 +1,4 @@ +/* Marc Beyer */ package users; import container.DataController; diff --git a/client/app/src/main/resources/main/option-view.css b/client/app/src/main/resources/main/option-view.css index 291a5d3..63f8e9b 100644 --- a/client/app/src/main/resources/main/option-view.css +++ b/client/app/src/main/resources/main/option-view.css @@ -1,3 +1,4 @@ +/* Marco Kühn */ GridPane{ -fx-background-color: #3E415F; -fx-padding: 20px; diff --git a/client/app/src/main/resources/main/option-view.fxml b/client/app/src/main/resources/main/option-view.fxml index 13e2edd..56ef502 100644 --- a/client/app/src/main/resources/main/option-view.fxml +++ b/client/app/src/main/resources/main/option-view.fxml @@ -1,4 +1,5 @@ + From f3a7ce21cc800281552218577ef5e94277b1f24a Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 11:42:03 +0100 Subject: [PATCH 04/13] Refactor the main-view.css --- .../app/src/main/resources/main/main-view.css | 40 ++++++++++--------- 1 file changed, 22 insertions(+), 18 deletions(-) diff --git a/client/app/src/main/resources/main/main-view.css b/client/app/src/main/resources/main/main-view.css index 3dcf8ac..3df14ed 100644 --- a/client/app/src/main/resources/main/main-view.css +++ b/client/app/src/main/resources/main/main-view.css @@ -1,66 +1,70 @@ /*Alex Rechtin, Marco Kühn*/ * { - -fx-base-background-color: #2B2D42; - -fx-base1-background-color: #525E74; + -fx-dark-background-color: #525E74; + -fx-darkest-background-color: #2B2D42; - -fx-main-border-color: #B0B0B0; - -fx-main-text-color: #ffffff; + -fx-bright-background-color: #77859E; + -fx-brighter-background-color: #282C34 ; + -fx-brightest-background-color: #333333 ; + + -fx-bright-border-color: #B0B0B0; + -fx-brighter-text-color: #ffffff; } GridPane{ - -fx-background-color: -fx-base-background-color; + -fx-background-color: -fx-darkest-background-color; } .main-panel{ - -fx-background-color: #282C34; + -fx-background-color: -fx-brighter-background-color; } .vbox-main{ - -fx-background-color: #333333; + -fx-background-color: -fx-brightest-background-color; -fx-alignment: top-center; } .gridCalendar Line{ - -fx-stroke: -fx-main-border-color; + -fx-stroke: -fx-bright-border-color; } .gridCalender{ - -fx-background-color: -fx-base-background-color; + -fx-background-color: -fx-darkest-background-color; -fx-min-height: 80px; -fx-max-height: 80px; } .labelMonth{ -fx-padding: 0 0 0 20; - -fx-background-color: #77859E; + -fx-background-color: -fx-bright-background-color; -fx-font-size: 35px; -fx-font-weight: bold; } .scrollDays{ - -fx-background-color: -fx-base-background-color; - -fx-border-color: -fx-main-border-color; + -fx-background-color: -fx-darkest-background-color; + -fx-border-color: -fx-bright-border-color; } .vBoxDays{ - -fx-background-color: -fx-base-background-color; + -fx-background-color: -fx-darkest-background-color; } .labelDays{ -fx-alignment: center; - -fx-background-color: -fx-base1-background-color; + -fx-background-color: -fx-dark-background-color; -fx-font-size: 25px; - -fx-border-color: -fx-main-border-color; + -fx-border-color: -fx-bright-border-color; } Label{ - -fx-text-fill: -fx-main-text-color; + -fx-text-fill: -fx-brighter-text-color; } .event{ - -fx-background-color: -fx-base1-background-color; + -fx-background-color: -fx-dark-background-color; } .main-btn{ @@ -77,7 +81,7 @@ Label{ } .buttonBox{ - -fx-background-color: #77859E; + -fx-background-color: -fx-bright-background-color; } .navBtn{ From de4811ee125016011b50e03e74566c588d1fb7a6 Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 11:48:53 +0100 Subject: [PATCH 05/13] Refactor the option-view.css --- .../src/main/resources/main/option-view.css | 22 +++++++++++++------ 1 file changed, 15 insertions(+), 7 deletions(-) diff --git a/client/app/src/main/resources/main/option-view.css b/client/app/src/main/resources/main/option-view.css index 63f8e9b..c42faaf 100644 --- a/client/app/src/main/resources/main/option-view.css +++ b/client/app/src/main/resources/main/option-view.css @@ -1,25 +1,33 @@ /* Marco Kühn */ +* { + -fx-bright-background-color: #3E415F; + -fx-brighter-background-color: #8D99AE; + -fx-brightest-background-color: #ffffff; + + -fx-bright-border-color: #B0B0B0; + -fx-brighter-text-color: #ffffff; +} GridPane{ - -fx-background-color: #3E415F; + -fx-background-color: -fx-bright-background-color; -fx-padding: 20px; -fx-font-size: 20px; -fx-font-family: Segoe UI; -fx-border-insets: 1; - -fx-border-color: #B0B0B0; + -fx-border-color: -fx-bright-border-color; -fx-border-style: solid; -fx-border-width: 2; -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0); } Label{ - -fx-text-fill: white; + -fx-text-fill: -fx-brighter-text-color; -fx-max-width: 200px; -fx-min-width: 200px; } .mainLabel{ - -fx-background-color: #8D99AE; + -fx-background-color: -fx-brighter-background-color; -fx-padding: 10px; -fx-max-width: 200px; -fx-min-width: 200px; @@ -29,11 +37,11 @@ Label{ .mainButton{ -fx-font-weight: bold; - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } JFXButton{ - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } #labelError{ @@ -48,7 +56,7 @@ JFXButton{ } .comboBox{ - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; -fx-max-width: 200px; -fx-min-width: 200px; } From 33f8c326d16d04c53e16ce0ff17561a1e01de659 Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 12:07:42 +0100 Subject: [PATCH 06/13] Refactor the create-user.css and fixed the option-view.css --- client/app/src/main/resources/main/option-view.css | 8 +++++--- .../app/src/main/resources/users/create-user.css | 14 ++++++-------- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/client/app/src/main/resources/main/option-view.css b/client/app/src/main/resources/main/option-view.css index c42faaf..1c99062 100644 --- a/client/app/src/main/resources/main/option-view.css +++ b/client/app/src/main/resources/main/option-view.css @@ -1,6 +1,8 @@ /* Marco Kühn */ * { - -fx-bright-background-color: #3E415F; + -fx-dark-background-color: #3E415F; + + -fx-bright-background-color: #ff5555; -fx-brighter-background-color: #8D99AE; -fx-brightest-background-color: #ffffff; @@ -8,7 +10,7 @@ -fx-brighter-text-color: #ffffff; } GridPane{ - -fx-background-color: -fx-bright-background-color; + -fx-background-color: -fx-dark-background-color; -fx-padding: 20px; -fx-font-size: 20px; -fx-font-family: Segoe UI; @@ -47,7 +49,7 @@ JFXButton{ #labelError{ -fx-font-weight: bold; -fx-max-width: 1000px; - -fx-text-fill: #ff5555; + -fx-text-fill: -fx-bright-background-color; -fx-padding: 16px; -fx-min-height: 140px; -fx-max-height: 400px; diff --git a/client/app/src/main/resources/users/create-user.css b/client/app/src/main/resources/users/create-user.css index 2d13534..94ea607 100644 --- a/client/app/src/main/resources/users/create-user.css +++ b/client/app/src/main/resources/users/create-user.css @@ -1,21 +1,19 @@ /*Alex Rechtin*/ * { - -fx-base-background-color: #2B2D42; - -fx-base1-background-color: #525E74; - - -fx-main-border-color: #B0B0B0; - -fx-main-text-color: #ffffff; + -fx-dark-background-color: #3E415F; + -fx-bright-border-color: #B0B0B0; + -fx-brighter-text-color: #ffffff; } GridPane{ - -fx-background-color: #3E415F; + -fx-background-color: -fx-dark-background-color; -fx-padding: 20px; -fx-font-size: 20px; -fx-font-family: Segoe UI; -fx-border-insets: 1; - -fx-border-color: #B0B0B0; + -fx-border-color: -fx-bright-border-color; -fx-border-style: solid; -fx-border-width: 2; -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0); @@ -31,7 +29,7 @@ GridPane{ Label{ - -fx-text-fill: white; + -fx-text-fill: -fx-brighter-text-color; -fx-max-width: 150px; -fx-min-width: 150px; } From 0f4ad96dc016b762ba86f5b77174f504d0a2acdd Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 12:13:08 +0100 Subject: [PATCH 07/13] Refactor the login.css --- client/app/src/main/resources/users/login.css | 27 ++++++++++--------- 1 file changed, 15 insertions(+), 12 deletions(-) diff --git a/client/app/src/main/resources/users/login.css b/client/app/src/main/resources/users/login.css index 963c6b6..c0a102f 100644 --- a/client/app/src/main/resources/users/login.css +++ b/client/app/src/main/resources/users/login.css @@ -1,27 +1,30 @@ /* Marco Kühn*/ * { - -fx-base-background-color: #2B2D42; - -fx-base1-background-color: #525E74; + -fx-dark-background-color: #3E415F; - -fx-main-border-color: #B0B0B0; - -fx-main-text-color: #ffffff; + -fx-brightest-background-color: #ffffff; + + -fx-bright-border-color: #B0B0B0; + + -fx-bright-text-color: ##ff5555; + -fx-brighter-text-color: #ffffff; } GridPane{ - -fx-background-color: #3E415F; + -fx-background-color: -fx-dark-background-color; -fx-padding: 20px; -fx-font-size: 20px; -fx-font-family: Segoe UI; -fx-border-insets: 1; - -fx-border-color: #B0B0B0; + -fx-border-color: -fx-bright-border-color; -fx-border-style: solid; -fx-border-width: 2; -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0); } Label{ - -fx-text-fill: white; + -fx-text-fill: -fx-brighter-text-color; -fx-max-width: 150px; -fx-min-width: 150px; } @@ -29,7 +32,7 @@ Label{ .errorLbl{ -fx-font-weight: bold; -fx-max-width: 200px; - -fx-text-fill: #ff5555; + -fx-text-fill: -fx-bright-text-color; -fx-padding: 16px; -fx-min-height: 140px; -fx-max-height: 400px; @@ -38,17 +41,17 @@ Label{ } .userField{ - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } .passField{ - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } .quitBtn{ - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } .loginBtn{ - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } \ No newline at end of file From 136ead454da73c3425a9bc92e98287708ac8ad7e Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 12:34:24 +0100 Subject: [PATCH 08/13] Refactor the create-event.css --- .../src/main/resources/main/create-event.css | 35 +++++++++++++------ 1 file changed, 24 insertions(+), 11 deletions(-) diff --git a/client/app/src/main/resources/main/create-event.css b/client/app/src/main/resources/main/create-event.css index 2918a45..3e91667 100644 --- a/client/app/src/main/resources/main/create-event.css +++ b/client/app/src/main/resources/main/create-event.css @@ -1,25 +1,38 @@ /*Marco Kühn*/ +* { + -fx-dark-background-color: #3E415F; + + -fx-darkest-background-color: #2B2D42; + + -fx-bright-background-color: #8D99AE; + -fx-brighter-background-color: #ff5555; + -fx-brightest-background-color: #ffffff; + + -fx-bright-border-color: #B0B0B0; + -fx-brighter-text-color: #ffffff; +} + GridPane{ - -fx-background-color: #3E415F; + -fx-background-color: -fx-dark-background-color; -fx-padding: 20px; -fx-font-size: 20px; -fx-font-family: Segoe UI; -fx-border-insets: 1; - -fx-border-color: #B0B0B0; + -fx-border-color: -fx-bright-border-color; -fx-border-style: solid; -fx-border-width: 2; -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0); } Label{ - -fx-text-fill: white; + -fx-text-fill: -fx-brighter-text-color; -fx-max-width: 150px; -fx-min-width: 150px; } .mainLabel{ - -fx-background-color: #8D99AE; + -fx-background-color: -fx-bright-background-color; -fx-padding: 10px; -fx-max-width: 200px; -fx-min-width: 200px; @@ -29,22 +42,22 @@ Label{ .inputField{ -fx-padding: 10px; - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } .mainButton{ -fx-font-weight: bold; - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } JFXButton{ - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } #labelError{ -fx-font-weight: bold; -fx-max-width: 1000px; - -fx-text-fill: #ff5555; + -fx-text-fill: -fx-brighter-background-color; -fx-padding: 16px; -fx-min-height: 140px; -fx-max-height: 400px; @@ -53,15 +66,15 @@ JFXButton{ } .inputDate{ - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } .comboBox{ - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } .timePicker{ - -fx-background-color: white; + -fx-background-color: -fx-brightest-background-color; } .jfx-time-picker .date-picker-popup{ From 8c46670148945fe3c3a3b2792d1b3428e3cb65f3 Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 13:30:22 +0100 Subject: [PATCH 09/13] fixed the create-user.css --- client/app/src/main/resources/users/create-user.css | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/client/app/src/main/resources/users/create-user.css b/client/app/src/main/resources/users/create-user.css index 94ea607..c56e8b2 100644 --- a/client/app/src/main/resources/users/create-user.css +++ b/client/app/src/main/resources/users/create-user.css @@ -2,7 +2,8 @@ * { -fx-dark-background-color: #3E415F; -fx-bright-border-color: #B0B0B0; - -fx-brighter-text-color: #ffffff; + -fx-brighter-text-color: #ff5555; + -fx-brightest-text-color: #ffffff; } @@ -29,7 +30,7 @@ GridPane{ Label{ - -fx-text-fill: -fx-brighter-text-color; + -fx-text-fill: -fx-brightest-text-color; -fx-max-width: 150px; -fx-min-width: 150px; } @@ -42,6 +43,7 @@ Label{ .errorMessage{ -fx-max-width: 400px; -fx-min-width: 400px; + -fx-text-fill: -fx-brighter-text-color; } Button{ From 1050455a4a9970e4c906e23df7b0e4450f305a91 Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 13:30:38 +0100 Subject: [PATCH 10/13] fixed the create-user.fxml --- client/app/src/main/resources/users/create-user.fxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/src/main/resources/users/create-user.fxml b/client/app/src/main/resources/users/create-user.fxml index f48f872..b296bcd 100644 --- a/client/app/src/main/resources/users/create-user.fxml +++ b/client/app/src/main/resources/users/create-user.fxml @@ -33,7 +33,7 @@ - + From a190d91e7a887aef193691c2c68d67ace439bcce Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 13:30:56 +0100 Subject: [PATCH 11/13] fixed the edit-user.fxml --- client/app/src/main/resources/users/edit-user.fxml | 1 + 1 file changed, 1 insertion(+) diff --git a/client/app/src/main/resources/users/edit-user.fxml b/client/app/src/main/resources/users/edit-user.fxml index 7ee0071..18f27a5 100644 --- a/client/app/src/main/resources/users/edit-user.fxml +++ b/client/app/src/main/resources/users/edit-user.fxml @@ -1,5 +1,6 @@ + From af441656deb3771a9fae2a26d2606d3700f63145 Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 13:31:43 +0100 Subject: [PATCH 12/13] fixed the edit-user.fxml --- client/app/src/main/resources/users/edit-user.fxml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/app/src/main/resources/users/edit-user.fxml b/client/app/src/main/resources/users/edit-user.fxml index 18f27a5..c5da6a1 100644 --- a/client/app/src/main/resources/users/edit-user.fxml +++ b/client/app/src/main/resources/users/edit-user.fxml @@ -32,7 +32,7 @@ - + From 111d5758e0daa5b6a779de2f3ce929ad2e98c72f Mon Sep 17 00:00:00 2001 From: Alex Rechtin Date: Mon, 7 Feb 2022 13:48:58 +0100 Subject: [PATCH 13/13] improved the edit,create-user to JFX --- .../main/java/users/CreateUserController.java | 18 +++++++++--------- .../src/main/resources/users/create-user.css | 5 ++++- .../src/main/resources/users/create-user.fxml | 19 +++++++++++-------- .../src/main/resources/users/edit-user.fxml | 19 +++++++++++-------- 4 files changed, 35 insertions(+), 26 deletions(-) diff --git a/client/app/src/main/java/users/CreateUserController.java b/client/app/src/main/java/users/CreateUserController.java index 6078e21..f6604df 100644 --- a/client/app/src/main/java/users/CreateUserController.java +++ b/client/app/src/main/java/users/CreateUserController.java @@ -1,14 +1,14 @@ //Alex Rechtin// package users; +import com.jfoenix.controls.JFXPasswordField; +import com.jfoenix.controls.JFXTextField; +import com.jfoenix.controls.JFXToggleButton; import helper.HttpRequestException; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.Node; import javafx.scene.control.Label; -import javafx.scene.control.PasswordField; -import javafx.scene.control.TextField; -import javafx.scene.control.ToggleButton; import javafx.stage.Stage; import container.DataController; import container.User; @@ -18,17 +18,17 @@ import java.util.Objects; public class CreateUserController { @FXML - protected TextField textName; + protected JFXTextField textName; @FXML - protected PasswordField textPassword; + protected JFXPasswordField textPassword; @FXML - protected PasswordField textPasswordSecond; + protected JFXPasswordField textPasswordSecond; @FXML - protected ToggleButton checkButtonIsAdmin; + protected JFXToggleButton checkButtonIsAdmin; @FXML - protected TextField textLogin; + protected JFXTextField textLogin; @FXML - protected TextField textForename; + protected JFXTextField textForename; @FXML protected Label labelError; diff --git a/client/app/src/main/resources/users/create-user.css b/client/app/src/main/resources/users/create-user.css index c56e8b2..f6343dd 100644 --- a/client/app/src/main/resources/users/create-user.css +++ b/client/app/src/main/resources/users/create-user.css @@ -1,6 +1,7 @@ /*Alex Rechtin*/ * { -fx-dark-background-color: #3E415F; + -fx-bright-background-color: #ffffff; -fx-bright-border-color: #B0B0B0; -fx-brighter-text-color: #ff5555; -fx-brightest-text-color: #ffffff; @@ -36,6 +37,7 @@ Label{ } .textField{ + -fx-background-color: -fx-bright-background-color; -fx-max-width: 400px; -fx-min-width: 400px; } @@ -46,7 +48,8 @@ Label{ -fx-text-fill: -fx-brighter-text-color; } -Button{ +JFXButton{ + -fx-background-color: -fx-bright-background-color; -fx-max-width: 150px; -fx-min-width: 150px; } diff --git a/client/app/src/main/resources/users/create-user.fxml b/client/app/src/main/resources/users/create-user.fxml index b296bcd..db8cd57 100644 --- a/client/app/src/main/resources/users/create-user.fxml +++ b/client/app/src/main/resources/users/create-user.fxml @@ -2,10 +2,13 @@ - + + + + @@ -37,11 +40,11 @@ - - - - - + + + + + @@ -51,8 +54,8 @@ - - + Abbrechen + Anlegen diff --git a/client/app/src/main/resources/users/edit-user.fxml b/client/app/src/main/resources/users/edit-user.fxml index c5da6a1..718ba2b 100644 --- a/client/app/src/main/resources/users/edit-user.fxml +++ b/client/app/src/main/resources/users/edit-user.fxml @@ -1,10 +1,13 @@ - + + + + @@ -36,11 +39,11 @@ - - - - - + + + + + @@ -50,8 +53,8 @@ - - + Abbrechen + Bearbeiten