MAM/VPR-Frontend
3
2
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Merge remote-tracking branch 'origin/merge' into merge

Browse Source
This commit is contained in:
Marc Beyer 2022-02-08 08:51:05 +01:00
commit 34e51cb72f
23 changed files with 156 additions and 86 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
client/app/src/main/java/events/CreateEventController.java
View File

@ -42,6 +42,7 @@ public class CreateEventController {
public CreateEventController() { public CreateEventController() {
} }
//Marco Kühn//
@FXML @FXML
public void initialize() { public void initialize() {
StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY); StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
@ -52,7 +53,7 @@ public class CreateEventController {
timeEnd.setConverter(defaultConverter); timeEnd.setConverter(defaultConverter);
} }
//Marc Beyer//
@FXML @FXML
protected void createBtnClick(ActionEvent actionEvent) { protected void createBtnClick(ActionEvent actionEvent) {
try { try {
@ -84,11 +85,13 @@ public class CreateEventController {
} }
} }
//Marc Beyer//
protected void sendHttpRequest(Event event) throws HttpRequestException { protected void sendHttpRequest(Event event) throws HttpRequestException {
DataController dataController = new DataController(); DataController dataController = new DataController();
dataController.createEvent(event); dataController.createEvent(event);
} }
//Marc Beyer//
@FXML @FXML
protected void abortBtnClick(ActionEvent event) { protected void abortBtnClick(ActionEvent event) {
Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow(); Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

2
client/app/src/main/java/main/MainApplication.java
View File

@ -1,3 +1,4 @@
//Marc Beyer//
package main; package main;
import config.Config; import config.Config;
@ -14,6 +15,7 @@ import java.io.IOException;
import java.util.Objects; import java.util.Objects;
import java.util.function.Consumer; import java.util.function.Consumer;
public class MainApplication extends Application { public class MainApplication extends Application {
@Override @Override
public void start(Stage stage) throws IOException { public void start(Stage stage) throws IOException {

1
client/app/src/main/java/main/MainController.java
View File

@ -1,3 +1,4 @@
/* Marco Kühn, Marc Beyer */
package main; package main;
import config.Config; import config.Config;

1
client/app/src/main/java/main/OptionController.java
View File

@ -1,3 +1,4 @@
/* Marco Kühn */
package main; package main;
import com.jfoenix.controls.*; import com.jfoenix.controls.*;

19
client/app/src/main/java/users/CreateUserController.java
View File

@ -1,13 +1,14 @@
//Alex Rechtin//
package users; package users;
import com.jfoenix.controls.JFXPasswordField;
import com.jfoenix.controls.JFXTextField;
import com.jfoenix.controls.JFXToggleButton;
import helper.HttpRequestException; import helper.HttpRequestException;
import javafx.event.ActionEvent; import javafx.event.ActionEvent;
import javafx.fxml.FXML; import javafx.fxml.FXML;
import javafx.scene.Node; import javafx.scene.Node;
import javafx.scene.control.Label; 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 javafx.stage.Stage;
import container.DataController; import container.DataController;
import container.User; import container.User;
@ -17,17 +18,17 @@ import java.util.Objects;
public class CreateUserController { public class CreateUserController {
@FXML @FXML
protected TextField textName; protected JFXTextField textName;
@FXML @FXML
protected PasswordField textPassword; protected JFXPasswordField textPassword;
@FXML @FXML
protected PasswordField textPasswordSecond; protected JFXPasswordField textPasswordSecond;
@FXML @FXML
protected ToggleButton checkButtonIsAdmin; protected JFXToggleButton checkButtonIsAdmin;
@FXML @FXML
protected TextField textLogin; protected JFXTextField textLogin;
@FXML @FXML
protected TextField textForename; protected JFXTextField textForename;
@FXML @FXML
protected Label labelError; protected Label labelError;

1
client/app/src/main/java/users/EditUserController.java
View File

@ -1,3 +1,4 @@
/* Marc Beyer */
package users; package users;
import container.DataController; import container.DataController;

1
client/app/src/main/java/users/LoginController.java
View File

@ -1,3 +1,4 @@
//Alex Rechtin//
package users; package users;
import com.jfoenix.controls.*; import com.jfoenix.controls.*;

36
client/app/src/main/resources/main/create-event.css
View File

@ -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{ GridPane{
-fx-background-color: #3E415F; -fx-background-color: -fx-dark-background-color;
-fx-padding: 20px; -fx-padding: 20px;
-fx-font-size: 20px; -fx-font-size: 20px;
-fx-font-family: Segoe UI; -fx-font-family: Segoe UI;
-fx-border-insets: 1; -fx-border-insets: 1;
-fx-border-color: #B0B0B0; -fx-border-color: -fx-bright-border-color;
-fx-border-style: solid; -fx-border-style: solid;
-fx-border-width: 2; -fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0); -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
} }
Label{ Label{
-fx-text-fill: white; -fx-text-fill: -fx-brighter-text-color;
-fx-max-width: 150px; -fx-max-width: 150px;
-fx-min-width: 150px; -fx-min-width: 150px;
} }
.mainLabel{ .mainLabel{
-fx-background-color: #8D99AE; -fx-background-color: -fx-bright-background-color;
-fx-padding: 10px; -fx-padding: 10px;
-fx-max-width: 200px; -fx-max-width: 200px;
-fx-min-width: 200px; -fx-min-width: 200px;
@ -28,22 +42,22 @@ Label{
.inputField{ .inputField{
-fx-padding: 10px; -fx-padding: 10px;
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
.mainButton{ .mainButton{
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
JFXButton{ JFXButton{
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
#labelError{ #labelError{
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-max-width: 1000px; -fx-max-width: 1000px;
-fx-text-fill: #ff5555; -fx-text-fill: -fx-brighter-background-color;
-fx-padding: 16px; -fx-padding: 16px;
-fx-min-height: 140px; -fx-min-height: 140px;
-fx-max-height: 400px; -fx-max-height: 400px;
@ -52,15 +66,15 @@ JFXButton{
} }
.inputDate{ .inputDate{
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
.comboBox{ .comboBox{
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
.timePicker{ .timePicker{
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
.jfx-time-picker .date-picker-popup{ .jfx-time-picker .date-picker-popup{

2
client/app/src/main/resources/main/create-event.fxml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Marco Kühn -->
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>

2
client/app/src/main/resources/main/edit-event.fxml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Marco Kühn -->
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>

41
client/app/src/main/resources/main/main-view.css
View File

@ -1,65 +1,70 @@
/*Alex Rechtin, Marco Kühn*/
* { * {
-fx-base-background-color: #2B2D42; -fx-dark-background-color: #525E74;
-fx-base1-background-color: #525E74; -fx-darkest-background-color: #2B2D42;
-fx-main-border-color: #B0B0B0; -fx-bright-background-color: #77859E;
-fx-main-text-color: #ffffff; -fx-brighter-background-color: #282C34 ;
-fx-brightest-background-color: #333333 ;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
} }
GridPane{ GridPane{
-fx-background-color: -fx-base-background-color; -fx-background-color: -fx-darkest-background-color;
} }
.main-panel{ .main-panel{
-fx-background-color: #282C34; -fx-background-color: -fx-brighter-background-color;
} }
.vbox-main{ .vbox-main{
-fx-background-color: #333333; -fx-background-color: -fx-brightest-background-color;
-fx-alignment: top-center; -fx-alignment: top-center;
} }
.gridCalendar Line{ .gridCalendar Line{
-fx-stroke: -fx-main-border-color; -fx-stroke: -fx-bright-border-color;
} }
.gridCalender{ .gridCalender{
-fx-background-color: -fx-base-background-color; -fx-background-color: -fx-darkest-background-color;
-fx-min-height: 80px; -fx-min-height: 80px;
-fx-max-height: 80px; -fx-max-height: 80px;
} }
.labelMonth{ .labelMonth{
-fx-padding: 0 0 0 20; -fx-padding: 0 0 0 20;
-fx-background-color: #77859E; -fx-background-color: -fx-bright-background-color;
-fx-font-size: 35px; -fx-font-size: 35px;
-fx-font-weight: bold; -fx-font-weight: bold;
} }
.scrollDays{ .scrollDays{
-fx-background-color: -fx-base-background-color; -fx-background-color: -fx-darkest-background-color;
-fx-border-color: -fx-main-border-color; -fx-border-color: -fx-bright-border-color;
} }
.vBoxDays{ .vBoxDays{
-fx-background-color: -fx-base-background-color; -fx-background-color: -fx-darkest-background-color;
} }
.labelDays{ .labelDays{
-fx-alignment: center; -fx-alignment: center;
-fx-background-color: -fx-base1-background-color; -fx-background-color: -fx-dark-background-color;
-fx-font-size: 25px; -fx-font-size: 25px;
-fx-border-color: -fx-main-border-color; -fx-border-color: -fx-bright-border-color;
} }
Label{ Label{
-fx-text-fill: -fx-main-text-color; -fx-text-fill: -fx-brighter-text-color;
} }
.event{ .event{
-fx-background-color: -fx-base1-background-color; -fx-background-color: -fx-dark-background-color;
} }
.main-btn{ .main-btn{
@ -76,7 +81,7 @@ Label{
} }
.buttonBox{ .buttonBox{
-fx-background-color: #77859E; -fx-background-color: -fx-bright-background-color;
} }
.navBtn{ .navBtn{

2
client/app/src/main/resources/main/main-view.fxml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Alex Rechtin, Marco Kühn -->
<?import javafx.geometry.*?> <?import javafx.geometry.*?>
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.image.*?> <?import javafx.scene.image.*?>

27
client/app/src/main/resources/main/option-view.css
View File

@ -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{ GridPane{
-fx-background-color: #3E415F; -fx-background-color: -fx-dark-background-color;
-fx-padding: 20px; -fx-padding: 20px;
-fx-font-size: 20px; -fx-font-size: 20px;
-fx-font-family: Segoe UI; -fx-font-family: Segoe UI;
-fx-border-insets: 1; -fx-border-insets: 1;
-fx-border-color: #B0B0B0; -fx-border-color: -fx-bright-border-color;
-fx-border-style: solid; -fx-border-style: solid;
-fx-border-width: 2; -fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0); -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
} }
Label{ Label{
-fx-text-fill: white; -fx-text-fill: -fx-brighter-text-color;
-fx-max-width: 200px; -fx-max-width: 200px;
-fx-min-width: 200px; -fx-min-width: 200px;
} }
.mainLabel{ .mainLabel{
-fx-background-color: #8D99AE; -fx-background-color: -fx-brighter-background-color;
-fx-padding: 10px; -fx-padding: 10px;
-fx-max-width: 200px; -fx-max-width: 200px;
-fx-min-width: 200px; -fx-min-width: 200px;
@ -28,17 +39,17 @@ Label{
.mainButton{ .mainButton{
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
JFXButton{ JFXButton{
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
#labelError{ #labelError{
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-max-width: 1000px; -fx-max-width: 1000px;
-fx-text-fill: #ff5555; -fx-text-fill: -fx-bright-background-color;
-fx-padding: 16px; -fx-padding: 16px;
-fx-min-height: 140px; -fx-min-height: 140px;
-fx-max-height: 400px; -fx-max-height: 400px;
@ -47,7 +58,7 @@ JFXButton{
} }
.comboBox{ .comboBox{
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
-fx-max-width: 200px; -fx-max-width: 200px;
-fx-min-width: 200px; -fx-min-width: 200px;
} }

1
client/app/src/main/resources/main/option-view.fxml
View File

@ -1,4 +1,5 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Marco Kühn -->
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>

22
client/app/src/main/resources/users/create-user.css
View File

@ -1,20 +1,21 @@
/*Alex Rechtin*/
* { * {
-fx-base-background-color: #2B2D42; -fx-dark-background-color: #3E415F;
-fx-base1-background-color: #525E74; -fx-bright-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-main-border-color: #B0B0B0; -fx-brighter-text-color: #ff5555;
-fx-main-text-color: #ffffff; -fx-brightest-text-color: #ffffff;
} }
GridPane{ GridPane{
-fx-background-color: #3E415F; -fx-background-color: -fx-dark-background-color;
-fx-padding: 20px; -fx-padding: 20px;
-fx-font-size: 20px; -fx-font-size: 20px;
-fx-font-family: Segoe UI; -fx-font-family: Segoe UI;
-fx-border-insets: 1; -fx-border-insets: 1;
-fx-border-color: #B0B0B0; -fx-border-color: -fx-bright-border-color;
-fx-border-style: solid; -fx-border-style: solid;
-fx-border-width: 2; -fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0); -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
@ -30,12 +31,13 @@ GridPane{
Label{ Label{
-fx-text-fill: white; -fx-text-fill: -fx-brightest-text-color;
-fx-max-width: 150px; -fx-max-width: 150px;
-fx-min-width: 150px; -fx-min-width: 150px;
} }
.textField{ .textField{
-fx-background-color: -fx-bright-background-color;
-fx-max-width: 400px; -fx-max-width: 400px;
-fx-min-width: 400px; -fx-min-width: 400px;
} }
@ -43,9 +45,11 @@ Label{
.errorMessage{ .errorMessage{
-fx-max-width: 400px; -fx-max-width: 400px;
-fx-min-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-max-width: 150px;
-fx-min-width: 150px; -fx-min-width: 150px;
} }

23
client/app/src/main/resources/users/create-user.fxml
View File

@ -1,9 +1,14 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?> <!-- Alex Rechtin -->
<?import javafx.scene.control.Label?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import com.jfoenix.controls.JFXToggleButton?> <?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" <GridPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml" xmlns:fx="http://javafx.com/fxml"
fx:controller="users.CreateUserController"> fx:controller="users.CreateUserController">
@ -31,15 +36,15 @@
<Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label> <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="3" GridPane.columnIndex="1">Nachname:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</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> <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
<TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" /> <JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" /> <JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" /> <JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" /> <JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" /> <JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/> <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
@ -49,8 +54,8 @@
<HBox.margin> <HBox.margin>
<Insets right="100" left="100"/> <Insets right="100" left="100"/>
</HBox.margin> </HBox.margin>
<Button onAction="#abortBtnClick">Abbrechen</Button> <JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
<Button onAction="#createUser" styleClass="btnLogin" >Anlegen</Button> <JFXButton onAction="#createUser" styleClass="btnLogin" >Anlegen</JFXButton>
</HBox> </HBox>
</GridPane> </GridPane>

22
client/app/src/main/resources/users/edit-user.fxml
View File

@ -1,9 +1,13 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<?import javafx.scene.control.*?> <!-- Alex Rechtin-->
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<?import javafx.geometry.Insets?> <?import javafx.geometry.Insets?>
<?import com.jfoenix.controls.JFXToggleButton?> <?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" <GridPane xmlns="http://javafx.com/javafx"
xmlns:fx="http://javafx.com/fxml" xmlns:fx="http://javafx.com/fxml"
fx:controller="users.EditUserController"> fx:controller="users.EditUserController">
@ -31,15 +35,15 @@
<Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label> <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="3" GridPane.columnIndex="1">Nachname:</Label>
<Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</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> <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
<TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" /> <JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
<TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" /> <JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
<TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" /> <JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
<PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" /> <JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
<PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" /> <JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
<JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/> <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
@ -49,8 +53,8 @@
<HBox.margin> <HBox.margin>
<Insets right="100" left="100"/> <Insets right="100" left="100"/>
</HBox.margin> </HBox.margin>
<Button onAction="#abortBtnClick">Abbrechen</Button> <JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
<Button onAction="#createUser" styleClass="btnLogin" >Bearbeiten</Button> <JFXButton onAction="#createUser" styleClass="btnLogin" >Bearbeiten</JFXButton>
</HBox> </HBox>
</GridPane> </GridPane>

28
client/app/src/main/resources/users/login.css
View File

@ -1,26 +1,30 @@
/* Marco Kühn*/
* { * {
-fx-base-background-color: #2B2D42; -fx-dark-background-color: #3E415F;
-fx-base1-background-color: #525E74;
-fx-main-border-color: #B0B0B0; -fx-brightest-background-color: #ffffff;
-fx-main-text-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-bright-text-color: ##ff5555;
-fx-brighter-text-color: #ffffff;
} }
GridPane{ GridPane{
-fx-background-color: #3E415F; -fx-background-color: -fx-dark-background-color;
-fx-padding: 20px; -fx-padding: 20px;
-fx-font-size: 20px; -fx-font-size: 20px;
-fx-font-family: Segoe UI; -fx-font-family: Segoe UI;
-fx-border-insets: 1; -fx-border-insets: 1;
-fx-border-color: #B0B0B0; -fx-border-color: -fx-bright-border-color;
-fx-border-style: solid; -fx-border-style: solid;
-fx-border-width: 2; -fx-border-width: 2;
-fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0); -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
} }
Label{ Label{
-fx-text-fill: white; -fx-text-fill: -fx-brighter-text-color;
-fx-max-width: 150px; -fx-max-width: 150px;
-fx-min-width: 150px; -fx-min-width: 150px;
} }
@ -28,7 +32,7 @@ Label{
.errorLbl{ .errorLbl{
-fx-font-weight: bold; -fx-font-weight: bold;
-fx-max-width: 200px; -fx-max-width: 200px;
-fx-text-fill: #ff5555; -fx-text-fill: -fx-bright-text-color;
-fx-padding: 16px; -fx-padding: 16px;
-fx-min-height: 140px; -fx-min-height: 140px;
-fx-max-height: 400px; -fx-max-height: 400px;
@ -37,17 +41,17 @@ Label{
} }
.userField{ .userField{
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
.passField{ .passField{
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
.quitBtn{ .quitBtn{
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }
.loginBtn{ .loginBtn{
-fx-background-color: white; -fx-background-color: -fx-brightest-background-color;
} }

2
client/app/src/main/resources/users/login.fxml
View File

@ -1,5 +1,7 @@
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<!-- Marco Kühn -->
<?import javafx.scene.control.*?> <?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?> <?import javafx.scene.layout.*?>
<?import com.jfoenix.controls.*?> <?import com.jfoenix.controls.*?>

1
client/data/src/main/java/config/Config.java
View File

@ -1,3 +1,4 @@
//Marc Beyer//
package config; package config;
public class Config { public class Config {

1
client/data/src/main/java/config/ConfigLoader.java
View File

@ -1,3 +1,4 @@
//Marc Beyer//
package config; package config;
import com.fasterxml.jackson.databind.ObjectMapper; import com.fasterxml.jackson.databind.ObjectMapper;

1
client/data/src/main/java/helper/HttpRequestException.java
View File

@ -1,3 +1,4 @@
//Marc Beyer//
package helper; package helper;
public class HttpRequestException extends Exception{ public class HttpRequestException extends Exception{

1
client/data/src/main/java/helper/Tuple.java
View File

@ -1,3 +1,4 @@
//Marc Beyer//
package helper; package helper;
public class Tuple<X, Y> { public class Tuple<X, Y> {