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

Compare commits

base: MAM:CSS-Refactor
Branches Tags
MAM:master MAM:merge MAM:1720-UI-User-anlegen MAM:CSS-Refactor MAM:Comments MAM:1800-UI-User-bearbeiten MAM:utf-8_refactor MAM:option-ui MAM:2410-develop MAM:Add-SVGs MAM:Update-components-to-JFoenix MAM:Update_create_and_edit_event_ui MAM:0610-Timepicker MAM:1210-UI-Termine-bearbeiten MAM:2310-Login MAM:0410-Switch-weeks MAM:0510-Validierung MAM:1710-UI-anmelden MAM:refactor MAM:0120-UI-Termine-erstellen MAM:0300-Kalender MAM:0100-Termine_anzeigen
..
compare: MAM:59be5048d80498bd1907181da1a65ad063f204cd
Branches Tags
MAM:master MAM:merge MAM:1720-UI-User-anlegen MAM:CSS-Refactor MAM:Comments MAM:1800-UI-User-bearbeiten MAM:utf-8_refactor MAM:option-ui MAM:2410-develop MAM:Add-SVGs MAM:Update-components-to-JFoenix MAM:Update_create_and_edit_event_ui MAM:0610-Timepicker MAM:1210-UI-Termine-bearbeiten MAM:2310-Login MAM:0410-Switch-weeks MAM:0510-Validierung MAM:1710-UI-anmelden MAM:refactor MAM:0120-UI-Termine-erstellen MAM:0300-Kalender MAM:0100-Termine_anzeigen

6 Commits
CSS-Refact ... 59be5048d8

Author SHA1 Message Date
Alex Rechtin
59be5048d8 fixed bugs in Login 2022-02-08 09:00:44 +01:00
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
6 changed files with 44 additions and 32 deletions
Expand all files Collapse all files

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

@@ -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;

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

@@ -1,8 +1,10 @@
/*Alex Rechtin*/
* {
-fx-dark-background-color: #3E415F;
-fx-bright-background-color: #ffffff;
-fx-bright-border-color: #B0B0B0;
-fx-brighter-text-color: #ffffff;
-fx-brighter-text-color: #ff5555;
-fx-brightest-text-color: #ffffff;
}
@@ -29,12 +31,13 @@ GridPane{
Label{
-fx-text-fill: -fx-brighter-text-color;
-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;
}
@@ -42,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;
}

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

@@ -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>

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

@@ -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>

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

@@ -6,7 +6,7 @@
-fx-bright-border-color: #B0B0B0;
-fx-bright-text-color: ##ff5555;
-fx-bright-text-color: #ff5555;
-fx-brighter-text-color: #ffffff;
}

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

@@ -26,7 +26,7 @@
<JFXTextField styleClass="userField" GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"/>
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel"/>
<Label GridPane.rowIndex="2">Paswort</Label>
<Label GridPane.rowIndex="2">Passwort</Label>
<JFXPasswordField styleClass="passField" GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
<Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>