improved the edit,create-user to JFX

fixed the edit-user.fxml
2022-02-07 13:48:58 +01:00 · 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
8 changed files with 125 additions and 85 deletions
--- 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;

--- 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{
--- 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{
--- a/client/app/src/main/resources/main/option-view.css
+++ b/client/app/src/main/resources/main/option-view.css
@ -1,25 +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;
@ -29,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;
@ -48,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/users/create-user.css
+++ b/client/app/src/main/resources/users/create-user.css
@ -1,21 +1,21 @@
 /*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-background-color: #ffffff;
+  -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);
@ -31,12 +31,13 @@ GridPane{


 Label{
-    -fx-text-fill: white;
+    -fx-text-fill: -fx-brightest-text-color;
    -fx-max-width: 150px;
    -fx-min-width: 150px;
 }

 .textField{
+    -fx-background-color: -fx-bright-background-color;
    -fx-max-width: 400px;
    -fx-min-width: 400px;
 }
@ -44,9 +45,11 @@ Label{
 .errorMessage{
    -fx-max-width: 400px;
    -fx-min-width: 400px;
+    -fx-text-fill: -fx-brighter-text-color;
 }

-Button{
+JFXButton{
+    -fx-background-color: -fx-bright-background-color;
    -fx-max-width: 150px;
    -fx-min-width: 150px;
 }
--- a/client/app/src/main/resources/users/create-user.fxml
+++ b/client/app/src/main/resources/users/create-user.fxml
@ -2,10 +2,13 @@

 <!-- Alex Rechtin -->

-<?import javafx.scene.control.*?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import com.jfoenix.controls.JFXToggleButton?>
+<?import com.jfoenix.controls.JFXButton?>
+<?import com.jfoenix.controls.JFXPasswordField?>
+<?import com.jfoenix.controls.JFXTextField?>
 <GridPane xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
          fx:controller="users.CreateUserController">
@ -33,15 +36,15 @@
    <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>

-    <TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-    <TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-    <TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+    <JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+    <JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+    <JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+    <JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+    <JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />

    <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>

@ -51,8 +54,8 @@
        <HBox.margin>
            <Insets right="100" left="100"/>
        </HBox.margin>
-        <Button onAction="#abortBtnClick">Abbrechen</Button>
-        <Button onAction="#createUser" styleClass="btnLogin" >Anlegen</Button>
+        <JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
+        <JFXButton onAction="#createUser" styleClass="btnLogin" >Anlegen</JFXButton>

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

-<?import javafx.scene.control.*?>
+<!-- Alex Rechtin-->
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import com.jfoenix.controls.JFXToggleButton?>
+<?import com.jfoenix.controls.JFXTextField?>
+<?import com.jfoenix.controls.JFXPasswordField?>
+<?import com.jfoenix.controls.JFXButton?>
+<?import javafx.scene.control.Label?>
 <GridPane xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
          fx:controller="users.EditUserController">
@ -31,15 +35,15 @@
    <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>

-    <TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-    <TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-    <TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+    <JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+    <JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+    <JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+    <JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+    <JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />

    <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>

@ -49,8 +53,8 @@
        <HBox.margin>
            <Insets right="100" left="100"/>
        </HBox.margin>
-        <Button onAction="#abortBtnClick">Abbrechen</Button>
-        <Button onAction="#createUser" styleClass="btnLogin" >Bearbeiten</Button>
+        <JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
+        <JFXButton onAction="#createUser" styleClass="btnLogin" >Bearbeiten</JFXButton>

    </HBox>
 </GridPane>
--- 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;
 }
Author	SHA1	Message	Date
Alex Rechtin	111d5758e0	improved the edit,create-user to JFX	2022-02-07 13:48:58 +01:00
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	7e3bd66571	Improvement of the main-view.fxml and main-view.css	2021-12-13 12:46:01 +01:00