fixed the edit-user.fxml

fixed the create-user.fxml
2022-02-07 13:31:43 +01:00 · 2022-02-07 13:30:56 +01:00 · 2022-02-07 13:30:38 +01:00 · 2022-02-07 13:30:22 +01:00 · 2022-02-07 12:34:24 +01:00 · 2022-02-07 12:13:08 +01:00
23 changed files with 121 additions and 60 deletions
--- a/client/app/src/main/java/events/CreateEventController.java
+++ b/client/app/src/main/java/events/CreateEventController.java
@@ -42,6 +42,7 @@ public class CreateEventController {
    public CreateEventController() {
    }

+    //Marco Kühn//
    @FXML
    public void initialize() {
        StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
@@ -52,7 +53,7 @@ public class CreateEventController {
        timeEnd.setConverter(defaultConverter);
    }

-
+    //Marc Beyer//
    @FXML
    protected void createBtnClick(ActionEvent actionEvent) {
        try {
@@ -84,11 +85,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();
--- 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;
@@ -14,6 +15,7 @@ import java.io.IOException;
 import java.util.Objects;
 import java.util.function.Consumer;

+
 public class MainApplication extends Application {
    @Override
    public void start(Stage stage) throws IOException {
--- 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;
--- 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.*;
--- 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 helper.HttpRequestException;
--- 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;
--- 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.*;
--- a/client/app/src/main/resources/main/create-event.css
+++ b/client/app/src/main/resources/main/create-event.css
@@ -1,24 +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;
@@ -28,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;
@@ -52,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{
--- a/client/app/src/main/resources/main/create-event.fxml
+++ b/client/app/src/main/resources/main/create-event.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>

--- a/client/app/src/main/resources/main/edit-event.fxml
+++ b/client/app/src/main/resources/main/edit-event.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>

--- a/client/app/src/main/resources/main/main-view.css
+++ b/client/app/src/main/resources/main/main-view.css
@@ -1,65 +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{
@@ -76,7 +81,7 @@ Label{
 }

 .buttonBox{
-    -fx-background-color: #77859E;
+    -fx-background-color: -fx-bright-background-color;
 }

 .navBtn{
--- a/client/app/src/main/resources/main/main-view.fxml
+++ b/client/app/src/main/resources/main/main-view.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!-- Alex Rechtin, Marco Kühn -->
+
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>
--- a/client/app/src/main/resources/main/option-view.css
+++ b/client/app/src/main/resources/main/option-view.css
@@ -1,24 +1,35 @@
+/* Marco Kühn */
+* {
+   -fx-dark-background-color: #3E415F;
+
+   -fx-bright-background-color: #ff5555;
+   -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-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: 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;
@@ -28,17 +39,17 @@ 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{
    -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;
@@ -47,7 +58,7 @@ JFXButton{
 }

 .comboBox{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
    -fx-max-width: 200px;
    -fx-min-width: 200px;
 }
--- a/client/app/src/main/resources/main/option-view.fxml
+++ b/client/app/src/main/resources/main/option-view.fxml
@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Marco Kühn -->

 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
--- a/client/app/src/main/resources/users/create-user.css
+++ b/client/app/src/main/resources/users/create-user.css
@@ -1,20 +1,20 @@
+/*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: #ff5555;
+  -fx-brightest-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);
@@ -30,7 +30,7 @@ GridPane{


 Label{
-    -fx-text-fill: white;
+    -fx-text-fill: -fx-brightest-text-color;
    -fx-max-width: 150px;
    -fx-min-width: 150px;
 }
@@ -43,6 +43,7 @@ Label{
 .errorMessage{
    -fx-max-width: 400px;
    -fx-min-width: 400px;
+    -fx-text-fill: -fx-brighter-text-color;
 }

 Button{
--- a/client/app/src/main/resources/users/create-user.fxml
+++ b/client/app/src/main/resources/users/create-user.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!-- Alex Rechtin -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
@@ -31,7 +33,7 @@
    <Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
    <Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
    <Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
+    <Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>

    <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>

--- a/client/app/src/main/resources/users/edit-user.fxml
+++ b/client/app/src/main/resources/users/edit-user.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!-- Alex Rechtin-->
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
@@ -31,7 +32,7 @@
    <Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
    <Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
    <Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
+    <Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>

    <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>

--- a/client/app/src/main/resources/users/login.css
+++ b/client/app/src/main/resources/users/login.css
@@ -1,26 +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;
 }
@@ -28,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;
@@ -37,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;
 }
--- a/client/app/src/main/resources/users/login.fxml
+++ b/client/app/src/main/resources/users/login.fxml
@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>

+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.*?>
--- 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 {
--- 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;
--- 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{
--- 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<X, Y> {
Author	SHA1	Message	Date
Alex Rechtin	af441656de	fixed the edit-user.fxml	2022-02-07 13:31:43 +01:00
Alex Rechtin	a190d91e7a	fixed the edit-user.fxml	2022-02-07 13:30:56 +01:00
Alex Rechtin	1050455a4a	fixed the create-user.fxml	2022-02-07 13:30:38 +01:00
Alex Rechtin	8c46670148	fixed the create-user.css	2022-02-07 13:30:22 +01:00
Alex Rechtin	136ead454d	Refactor the create-event.css	2022-02-07 12:34:24 +01:00
Alex Rechtin	0f4ad96dc0	Refactor the login.css	2022-02-07 12:13:08 +01:00
Alex Rechtin	33f8c326d1	Refactor the create-user.css and fixed the option-view.css	2022-02-07 12:07:42 +01:00
Alex Rechtin	de4811ee12	Refactor the option-view.css	2022-02-07 11:48:53 +01:00
Alex Rechtin	f3a7ce21cc	Refactor the main-view.css	2022-02-07 11:42:03 +01:00
Alex Rechtin	a29f6d204f	Merge branch 'merge' into CSS-Refactor # Conflicts: # client/app/src/main/resources/main/main-view.css # client/app/src/main/resources/main/main-view.fxml	2022-02-07 11:22:31 +01:00
Alex Rechtin	ede28ae4a7	Commit the new Files	2022-02-07 11:06:21 +01:00
Alex Rechtin	4c94cadf11	Merge branch 'merge' into Comments # Conflicts: # client/app/src/main/java/customUI/Button.java # client/app/src/main/java/customUI/Converter.java # client/app/src/main/java/customUI/Label.java # client/app/src/main/java/customUI/Tooltip.java # client/app/src/main/java/events/EditEventController.java # client/app/src/main/java/helper/SvgBtnCreator.java # client/app/src/main/java/main/MainController.java # client/data/src/main/java/container/Event.java # client/data/src/main/java/res/DataController.java # client/data/src/main/java/res/HttpRequest.java	2022-02-07 10:40:53 +01:00
Alex Rechtin	898054bb63	Comments all Files with Creator name	2022-01-25 11:14:16 +01:00
Alex Rechtin	7e3bd66571	Improvement of the main-view.fxml and main-view.css	2021-12-13 12:46:01 +01:00