Improved layout, removed typ

# Conflicts:
#	client/app/src/main/java/main/MainController.java

client/app/build.gradle.kts

@@ -16,7 +16,12 @@ application {
     mainClassName = "client.MainApplication"
 }
 
+repositories {
+    mavenCentral()
+}
+
 dependencies {
+    implementation("com.jfoenix:jfoenix:9.0.10")
     implementation(project(":data"))
 }
 

client/app/src/main/java/customUI/Button.java

@@ -0,0 +1,8 @@
+package customUI;
+
+public class Button extends javafx.scene.control.Button {
+
+    public void setTextValue(String text){
+        super.setText(Converter.CONVERT_STR(text));
+    }
+}

client/app/src/main/java/customUI/Converter.java

@@ -0,0 +1,21 @@
+package customUI;
+
+public class Converter {
+    /*
+    Ä, ä 		\u00c4, \u00e4
+    Ö, ö 		\u00d6, \u00f6
+    Ü, ü 		\u00dc, \u00fc
+    ß 		    \u00df
+     */
+    @SuppressWarnings("all")
+    public static String CONVERT_STR(String str){
+        return str
+                .replace("ä", "\u00e4")
+                .replace("Ä", "\u00c4")
+                .replace("ö", "\u00f6")
+                .replace("Ö", "\u00d6")
+                .replace("ü", "\u00fc")
+                .replace("Ü", "\u00dc")
+                .replace("ß", "\u00df");
+    }
+}

client/app/src/main/java/customUI/Label.java

@@ -0,0 +1,15 @@
+package customUI;
+
+public class Label extends javafx.scene.control.Label {
+    public Label(String content){
+        super(Converter.CONVERT_STR(content));
+    }
+
+    public Label(){
+        super();
+    }
+
+    public void setTextValue(String text){
+        super.setText(Converter.CONVERT_STR(text));
+    }
+}

client/app/src/main/java/main/CreateEventController.java

@@ -1,26 +1,30 @@
 package main;
 
+import com.jfoenix.controls.JFXTimePicker;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.*;
+import javafx.scene.layout.GridPane;
 import javafx.stage.Stage;
+import javafx.util.StringConverter;
+import javafx.util.converter.LocalTimeStringConverter;
 import res.DataController;
 import res.Event;
 
+import java.time.LocalTime;
+import java.time.format.FormatStyle;
+import java.util.Locale;
+
 public class CreateEventController {
 
+    @FXML
+    public GridPane mainGrid;
     @FXML
     public DatePicker datePickerDate;
     @FXML
     public TextField textName;
     @FXML
-    public TextField textStart;
-    @FXML
-    public TextField textEnd;
-    @FXML
-    public ComboBox<String> ComboBoxTyp;
-    @FXML
     public ComboBox<String> ComboBoxPriotity;
     @FXML
     public CheckBox checkBoxIsFullDay;
@@ -28,7 +32,10 @@ public class CreateEventController {
     public CheckBox checkBoxIsPrivate;
     @FXML
     public Label labelError;
-
+    @FXML
+    public JFXTimePicker timeStart;
+    @FXML
+    public JFXTimePicker timeEnd;
 
 
     public CreateEventController() {
@@ -36,13 +43,29 @@ public class CreateEventController {
 
     @FXML
     public void initialize() {
+
+        StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
+
+        JFXTimePicker timePickerStart = new JFXTimePicker();
+        timeStart = timePickerStart;
+        timePickerStart.set24HourView(true);
+        timePickerStart.setConverter(defaultConverter);
+        timePickerStart.getStyleClass().add("timePicker");
+        mainGrid.add(timePickerStart, 1 , 3);
+
+        JFXTimePicker timePickerEnd = new JFXTimePicker();
+        timeEnd = timePickerEnd;
+        timePickerEnd.set24HourView(true);
+        timePickerEnd.setConverter(defaultConverter);
+        timePickerEnd.getStyleClass().add("timePicker");
+        mainGrid.add(timePickerEnd, 1 , 4);
     }
 
 
     @FXML
     protected void createBtnClick(ActionEvent actionEvent) {
         try {
-            if(datePickerDate.getValue() == null){
+            if (datePickerDate.getValue() == null) {
                 throw new IllegalArgumentException("Bitte w\u00e4hle ein Datum aus");
             }
 
@@ -51,10 +74,10 @@ public class CreateEventController {
                     ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
                     checkBoxIsFullDay.isSelected(),
                     checkBoxIsPrivate.isSelected(),
-                    textStart.getText(),
-                    textEnd.getText(),
+                    timeStart.getValue().toString(),
+                    timeEnd.getValue().toString(),
                     datePickerDate.getValue().atStartOfDay(),
-                    1
+                    (int) DataController.USER_ID
             );
 
             System.out.println(event.getAsUrlParam());

client/app/src/main/java/main/MainApplication.java

@@ -4,6 +4,7 @@ import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import res.DataController;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -14,19 +15,23 @@ public class MainApplication extends Application {
         FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
 
         Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
-        scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm());
+        scene.getStylesheets().add(Objects.requireNonNull(
+                MainApplication.class.getResource("main-view.css")).toExternalForm());
         stage.setTitle("SharePlaner");
         stage.setScene(scene);
-        stage.show();
 
         FXMLLoader fxmlLoaderLogin = new FXMLLoader(MainApplication.class.getResource("../users/login.fxml"));
         Scene sceneLogin = new Scene(fxmlLoaderLogin.load(), 650, 500);
-        sceneLogin.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("../users/login.css")).toExternalForm());
+        sceneLogin.getStylesheets().add(Objects.requireNonNull(
+                MainApplication.class.getResource("../users/login.css")).toExternalForm());
         Stage stageLogin = new Stage();
         stageLogin.setTitle("Anmelden");
         stageLogin.setScene(sceneLogin);
-        stageLogin.show();
+        stageLogin.showAndWait();
 
+        if (DataController.USER_ID >= 0) {
+            stage.show();
+        }
     }
 
     public static void main(String[] args) {

client/app/src/main/java/main/MainController.java

@@ -1,13 +1,11 @@
 package main;
 
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
-import javafx.scene.control.Button;
-import javafx.scene.control.Label;
+import customUI.Button;
+import customUI.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
@@ -30,7 +28,7 @@ public class MainController {
     private GridPane calendarGrid;
 
     @FXML
-    private Label LabelMonth;
+    private javafx.scene.control.Label LabelMonth;
 
     private final String[] dayNames = {"Montag", "Dienstag", "Mittwoch", "Donnerstag", "Freitag", "Samstag", "Sonntag"};
     private final Label[] dayLabel = new Label[7];
@@ -73,7 +71,7 @@ public class MainController {
     }
 
     @FXML
-    protected void onTodayClick(){
+    protected void onTodayClick() {
         weekOffset = 0;
         setDates();
         updateEvents();
@@ -89,9 +87,11 @@ public class MainController {
     @FXML
     protected void onAddBtnClick() {
         try {
-            FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("create-event.fxml"));
+            FXMLLoader fxmlLoader = new FXMLLoader(
+                    MainApplication.class.getResource("create-event.fxml"));
             Scene scene = new Scene(fxmlLoader.load(), 650, 650);
-            scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("create-event.css")).toExternalForm());
+            scene.getStylesheets().add(Objects.requireNonNull(
+                    MainApplication.class.getResource("create-event.css")).toExternalForm());
             Stage stage = new Stage();
             stage.setTitle("Termin erstellen");
             stage.setScene(scene);
@@ -108,7 +108,7 @@ public class MainController {
     private void createWeek() {
         for (int i = 0; i < 7; i++) {
             Label label = new Label();
-            label.setText(dayNames[i]);
+            label.setTextValue(dayNames[i]);
             label.setMaxHeight(Double.MAX_VALUE);
             label.setMaxWidth(Double.MAX_VALUE);
             label.getStyleClass().add("labelDays");
@@ -140,14 +140,31 @@ public class MainController {
         HBox btnHBox = new HBox();
         btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
         Button deleteBtn = new Button();
-        deleteBtn.setText(" X ");
+        deleteBtn.setTextValue(" X ");
         deleteBtn.setOnAction(e -> {
             DataController dataController = new DataController();
             dataController.deleteEvent(event.getId());
             updateEvents();
         });
         Button editBtn = new Button();
-        editBtn.setText("edit");
+        editBtn.setTextValue("edit");
+        editBtn.setOnAction(event1 -> {
+            try {
+                FXMLLoader fxmlLoader = new FXMLLoader(
+                        MainApplication.class.getResource("edit-event.fxml"));
+                Scene scene = new Scene(fxmlLoader.load(), 650, 650);
+                scene.getStylesheets().add(Objects.requireNonNull(
+                        MainApplication.class.getResource("create-event.css")).toExternalForm());
+                Stage stage = new Stage();
+                stage.setTitle("Termin bearbeiten");
+                stage.setScene(scene);
+                stage.initModality(Modality.APPLICATION_MODAL);
+                stage.setResizable(false);
+                stage.showAndWait();
+            } catch (IOException e) {
+                e.printStackTrace();
+            }
+        });
         btnHBox.getChildren().add(editBtn);
         btnHBox.getChildren().add(deleteBtn);
         vBox.getChildren().add(btnHBox);
@@ -165,12 +182,6 @@ public class MainController {
         Label typeLabel = new Label("Wer: " + event.getOwnerName());
         vBox.getChildren().add(typeLabel);
 
-        /*
-        Ä, ä 		\u00c4, \u00e4
-        Ö, ö 		\u00d6, \u00f6
-        Ü, ü 		\u00dc, \u00fc
-        ß 		    \u00df
-         */
         Label prioLabel = new Label("Priorit\u00e4t: " + event.getPriority());
         vBox.getChildren().add(prioLabel);
 
@@ -182,7 +193,8 @@ public class MainController {
 
         LocalDateTime eventDate = event.getDate();
 
-        int day = (int) Duration.between(weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
+        int day = (int) Duration.between(
+                weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
 
         if (day >= 0 && day < 7) {
             dayVBoxes[day].getChildren().add(vBox);
@@ -208,7 +220,7 @@ public class MainController {
         weekStartDateTime = now.plusDays(weekOffset * 7L - dayOfWeek + 1);
 
         for (int i = 0; i < 7; i++) {
-            dayLabel[i].setText(dayFormatter.format(weekStartDateTime.plusDays(i)));
+            dayLabel[i].setTextValue(dayFormatter.format(weekStartDateTime.plusDays(i)));
         }
 
         LabelMonth.setText(dateFormatter.format(weekStartDateTime));

client/app/src/main/java/users/LoginControler.java

@@ -1,4 +0,0 @@
-package users;
-
-public class LoginControler {
-}

client/app/src/main/java/users/LoginController.java

@@ -0,0 +1,50 @@
+package users;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.scene.Node;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.stage.Stage;
+import res.DataController;
+
+public class LoginController {
+    @FXML
+    public TextField userField;
+    @FXML
+    public TextField passField;
+    @FXML
+    public Label userErrLabel;
+    @FXML
+    public Label passErrLabel;
+
+    @FXML
+    protected void login(ActionEvent event) {
+        if (userField.getText().trim().isEmpty()) {
+            userErrLabel.setText("Bitte Usernamen eingeben!");
+            passErrLabel.setText("");
+            return;
+        }
+        if (passField.getText().trim().isEmpty()) {
+            userErrLabel.setText("");
+            passErrLabel.setText("Bitte Passwort eingeben!");
+            return;
+        }
+
+        DataController dataController = new DataController();
+        if (!dataController.login(userField.getText(), passField.getText())) {
+            userErrLabel.setText("Name und Passwort passen nicht zueinander!");
+            passErrLabel.setText("Name und Passwort passen nicht zueinander!");
+            return;
+        }
+
+        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
+        stage.close();
+    }
+
+    @FXML
+    protected void abortBtnClick(ActionEvent event) {
+        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
+        stage.close();
+    }
+}

client/app/src/main/resources/main/create-event.css

@@ -44,3 +44,8 @@ Label{
     -fx-wrap-text: true;
     -fx-font-size: 16px;
 }
+
+.timePicker{
+    -fx-background-color: white;
+    -fx-max-width: 200px;
+}

client/app/src/main/resources/main/create-event.fxml

@@ -5,7 +5,8 @@
 
 <?import javafx.collections.FXCollections?>
 <?import java.lang.String?>
-<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.CreateEventController">
+<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
+          fx:controller="main.CreateEventController">
 
     <columnConstraints>
         <ColumnConstraints/>
@@ -13,49 +14,46 @@
         <ColumnConstraints/>
     </columnConstraints>
     <rowConstraints>
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
     </rowConstraints>
 
     <Label styleClass="mainLabel">Termin anlegen</Label>
 
-    <Label styleClass="inputLabel" GridPane.rowIndex="1">Datum:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="2">Titel:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="1">Titel:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="2">Datum:</Label>
     <Label styleClass="inputLabel" GridPane.rowIndex="3">Von:</Label>
     <Label styleClass="inputLabel" GridPane.rowIndex="4">Bis:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="5">Typ:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="6">Priorität:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="7">Ganztägig:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="8">Privat:</Label>
 
-    <DatePicker fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
-    <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="400" minWidth="400"/>
-    <TextField fx:id="textStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="400" minWidth="400"/>
-    <TextField fx:id="textEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="400" minWidth="400"/>
-    <ComboBox fx:id="ComboBoxTyp" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="400" minWidth="400"/>
-    <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="6" maxWidth="200" minWidth="200">
+    <Label styleClass="inputLabel" GridPane.rowIndex="5">Priorität:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="6">Ganztägig:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="7">Privat:</Label>
+
+    <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
+    <DatePicker fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="200" minWidth="200"/>
+
+    <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
             <FXCollections fx:factory="observableArrayList">
-                <String fx:value="gering" />
-                <String fx:value="mittel" />
-                <String fx:value="hoch" />
+                <String fx:value="gering"/>
+                <String fx:value="mittel"/>
+                <String fx:value="hoch"/>
             </FXCollections>
         </items>
     </ComboBox>
-    <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
-    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
-    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
+    <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
 
-    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" GridPane.columnSpan="2"  alignment="CENTER_RIGHT">
-        <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150" >Abbrechen</Button>
+    <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
+        <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</Button>
         <Button styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Anlegen</Button>
     </HBox>
 

client/app/src/main/resources/main/edit-event.fxml

@@ -0,0 +1,60 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.collections.FXCollections?>
+<?import java.lang.String?>
+
+<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
+          fx:controller="main.CreateEventController">
+
+    <columnConstraints>
+        <ColumnConstraints/>
+        <ColumnConstraints/>
+        <ColumnConstraints/>
+    </columnConstraints>
+    <rowConstraints>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+    </rowConstraints>
+
+    <Label styleClass="mainLabel">Termin bearbeiten</Label>
+
+    <Label styleClass="inputLabel" GridPane.rowIndex="1">Titel:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="2">Datum:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="3">Von:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="4">Bis:</Label>
+
+    <Label styleClass="inputLabel" GridPane.rowIndex="5">Priorität:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="6">Ganztägig:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="7">Privat:</Label>
+
+    <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
+    <DatePicker fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="200" minWidth="200"/>
+
+    <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
+        <items>
+            <FXCollections fx:factory="observableArrayList">
+                <String fx:value="gering"/>
+                <String fx:value="mittel"/>
+                <String fx:value="hoch"/>
+            </FXCollections>
+        </items>
+    </ComboBox>
+    <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
+    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
+
+    <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
+        <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</Button>
+        <Button styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Speichern</Button>
+    </HBox>
+
+</GridPane>

client/app/src/main/resources/main/main-view.fxml

@@ -5,15 +5,17 @@
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
 
-<GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.MainController">
+<GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
+          fx:controller="main.MainController">
     <columnConstraints>
-        <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
-        <ColumnConstraints hgrow="ALWAYS" />
+        <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0"/>
+        <ColumnConstraints hgrow="ALWAYS"/>
     </columnConstraints>
     <rowConstraints>
-        <RowConstraints vgrow="SOMETIMES" />
+        <RowConstraints vgrow="SOMETIMES"/>
     </rowConstraints>
-    <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #525E74;">
+    <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
+          style="-fx-background-color: #525E74;">
         <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
 
         </ImageView>
@@ -29,39 +31,42 @@
     </VBox>
     <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
         <columnConstraints>
-        <ColumnConstraints hgrow="ALWAYS" />
-            <ColumnConstraints />
-            <ColumnConstraints />
-            <ColumnConstraints />
-            <ColumnConstraints />
+            <ColumnConstraints hgrow="ALWAYS"/>
+            <ColumnConstraints/>
+            <ColumnConstraints/>
+            <ColumnConstraints/>
+            <ColumnConstraints/>
         </columnConstraints>
         <rowConstraints>
-            <RowConstraints />
-            <RowConstraints vgrow="ALWAYS" />
+            <RowConstraints/>
+            <RowConstraints vgrow="ALWAYS"/>
         </rowConstraints>
-        <Label fx:id="LabelMonth" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
+        <Label fx:id="LabelMonth" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308"
+               styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
             Monat
             <padding>
-                <Insets left="5" />
+                <Insets left="5"/>
             </padding>
         </Label>
         <Button onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</Button>
         <Button onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</Button>
         <Button onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</Button>
 
-        <GridPane fx:id="calendarGrid" gridLinesVisible="true"  styleClass="gridCalendar" GridPane.columnSpan="4" GridPane.columnIndex="0" GridPane.rowIndex="1">
+        <GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnSpan="4"
+                  GridPane.columnIndex="0" GridPane.rowIndex="1">
             <columnConstraints>
-                <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857" percentWidth="14.2857142857" />
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
-                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />
+                <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857"
+                                   percentWidth="14.2857142857"/>
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
+                <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857"/>
             </columnConstraints>
             <rowConstraints>
-                <RowConstraints maxHeight="55.0" minHeight="25.0" vgrow="NEVER" />
-                <RowConstraints percentHeight="-Infinity" vgrow="ALWAYS" />
+                <RowConstraints maxHeight="55.0" minHeight="25.0" vgrow="NEVER"/>
+                <RowConstraints percentHeight="-Infinity" vgrow="ALWAYS"/>
             </rowConstraints>
 
         </GridPane>

client/app/src/main/resources/users/login.css

@@ -0,0 +1,37 @@
+* {
+   -fx-base-background-color: #2B2D42;
+   -fx-base1-background-color: #525E74;
+
+   -fx-main-border-color: #B0B0B0;
+   -fx-main-text-color: #ffffff;
+}
+
+GridPane{
+    -fx-background-color: #3E415F;
+    -fx-padding: 20px;
+    -fx-font-size: 20px;
+    -fx-font-family: Segoe UI;
+
+    -fx-border-insets: 1;
+    -fx-border-color: #B0B0B0;
+    -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-max-width: 150px;
+    -fx-min-width: 150px;
+}
+
+.errorLbl{
+    -fx-font-weight: bold;
+        -fx-max-width: 200px;
+        -fx-text-fill: #ff5555;
+        -fx-padding: 16px;
+        -fx-min-height: 140px;
+        -fx-max-height: 400px;
+        -fx-wrap-text: true;
+        -fx-font-size: 16px;
+}

client/app/src/main/resources/users/login.fxml

@@ -1,12 +1,8 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-
-<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"  fx:controller="users.LoginControler">
+<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="users.LoginController">
 
     <columnConstraints>
         <ColumnConstraints/>
@@ -14,23 +10,23 @@
         <ColumnConstraints/>
     </columnConstraints>
     <rowConstraints>
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
     </rowConstraints>
 
     <Label GridPane.columnIndex="1">Anmelden</Label>
 
     <Label GridPane.rowIndex="1">Username</Label>
-    <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"></TextField>
-    <Label GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel">Error</Label>
+    <TextField 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>
-    <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"></PasswordField>
-    <Label GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel">Error</Label>
+    <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
+    <Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
 
-    <Button GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>
-    <Button GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button>
+    <Button onAction="#abortBtnClick" GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>
+    <Button onAction="#login" GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button>
 
 </GridPane>

client/data/src/main/java/res/DataController.java

@@ -14,28 +14,47 @@ import java.util.*;
 
 public class DataController {
 
-    private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/vpr/all-events";
-    private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/vpr/all-users";
-    private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/vpr/add-event";
-    private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/vpr/del-event";
+    public static long USER_ID = -1;
+
+    private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/event/all";
+    private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/event/add";
+    private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del";
+
+    private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login";
+    private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
 
     private final HttpRequest httpRequest;
 
-    public DataController(){
+    public DataController() {
         httpRequest = new HttpRequest();
     }
 
-    public void createEvent(Event event){
+    public boolean login(String username, String password) {
         try {
-            System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam()));
+            USER_ID = Long.parseLong(httpRequest.sendPostRequest(
+                    LOGIN_ENDPOINT,
+                    "login=" + username
+                            + "&password=" + password,
+                    false
+            ));
+        } catch (Exception e) {
+            e.printStackTrace();
+            return false;
+        }
+        return USER_ID >= 0;
+    }
+
+    public void createEvent(Event event) {
+        try {
+            System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true));
         } catch (Exception e) {
             throw new RuntimeException("Es konnte keine Verbindung mit dem Server hergestellt werden.");
         }
     }
 
-    public void deleteEvent(int eventId){
+    public void deleteEvent(int eventId) {
         try {
-            System.out.println(httpRequest.sendPostRequest(DELETE_EVENT_ENDPOINT, "eventId=" + eventId));
+            System.out.println(httpRequest.sendPostRequest(DELETE_EVENT_ENDPOINT, "eventId=" + eventId, true));
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -45,16 +64,16 @@ public class DataController {
         ArrayList<Event> eventList = new ArrayList<>();
 
         try {
-            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=1");
+            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=" + USER_ID, true);
             System.out.println(jsonResponse);
 
             ObjectMapper objectMapper = new ObjectMapper();
             //String json = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }";
 
-            for (Object obj : objectMapper.readValue(jsonResponse, Object[].class)){
+            for (Object obj : objectMapper.readValue(jsonResponse, Object[].class)) {
                 ArrayList<Object> list = new ArrayList<>();
                 if (obj.getClass().isArray()) {
-                    list = (ArrayList<Object>) Arrays.asList((Object[])obj);
+                    list = (ArrayList<Object>) Arrays.asList((Object[]) obj);
                 } else if (obj instanceof Collection) {
                     list = new ArrayList<>((Collection<?>) obj);
                 }

client/data/src/main/java/res/Event.java

@@ -2,6 +2,7 @@ package res;
 
 import com.sun.jdi.event.StepEvent;
 
+import java.nio.charset.StandardCharsets;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
@@ -70,10 +71,30 @@ public class Event {
         if(name.length() < 3){
             throw new IllegalArgumentException("Der Name muss eine L\u00e4nge von 3 haben.");
         }
-        Pattern pattern = Pattern.compile("[A-Za-zÄÖÜäöü0-9 =!?+*/$%€.:,;_<>()-]*");
+        Pattern pattern = Pattern.compile("[A-Za-z\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df0-9 =!?+*/$.:,;_<>()-]*");
         Matcher matcher = pattern.matcher(name);
         if(!matcher.matches()){
-            throw new IllegalArgumentException("Der Name Darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: =!?+*/$%€.:,;_ <>()-");
+            System.out.println(name);
+
+            byte[] bytes = name.getBytes(StandardCharsets.UTF_16);
+
+            String utf8EncodedString = new String(bytes, StandardCharsets.UTF_16);
+            System.out.println(utf8EncodedString);
+
+            for (char c : (name).toCharArray()) {
+                System.out.print(c + " " + (int)c + ", ");
+            }
+            System.out.println();
+            for (char c : (name).toCharArray()) {
+                System.out.print(c + " " + (int)c + ", ");
+            }
+            System.out.println();
+            for (char c : ("TäöüÄÖÜ").toCharArray()) {
+                System.out.print(c + " " + (int)c + ", ");
+            }
+            System.out.println();
+
+            throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: \u00e4\u00f6\u00fc \u00c4\u00d6\u00dc \u00df =!?+*/$.:,;_ <>()-");
         }
         if(priority < 0){
             throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");
@@ -106,7 +127,7 @@ public class Event {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = convertToASCII(name);
     }
 
     public int getPriority() {
@@ -192,4 +213,9 @@ public class Event {
                 "&isFullDay=" + isFullDay() +
                 "&isPrivate=" + isPrivate();
     }
+
+    private String convertToASCII(String s){
+        byte[] germanBytes = s.getBytes();
+        return new String(germanBytes, StandardCharsets.US_ASCII);
+    }
 }

client/data/src/main/java/res/HttpRequest.java

@@ -9,10 +9,23 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 public class HttpRequest {
-    public String sendPostRequest(String urlString, String urlParameters) throws Exception{
+    public String sendPostRequest(String urlString, String urlParameters, boolean sendAuth) throws Exception {
         byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
         int postDataLength = postData.length;
 
+        /*
+        URL url = new URL("http://test.de:8080/event/add");
+        HttpURLConnection http = (HttpURLConnection)url.openConnection();
+        http.setRequestMethod("POST");
+        http.setDoOutput(true);
+        http.setRequestProperty("Accept", "application/json");
+        http.setRequestProperty("Authorization", "Bearer {token}");
+        http.setRequestProperty("Content-Type", "");
+        http.setRequestProperty("Content-Length", "0");
+
+        System.out.println(http.getResponseCode() + " " + http.getResponseMessage());
+        http.disconnect();
+         */
         URL url = new URL(urlString);
         HttpURLConnection con = (HttpURLConnection) url.openConnection();
 
@@ -23,6 +36,12 @@ public class HttpRequest {
         con.setRequestProperty("charset", "utf-8");
         con.setRequestProperty("Content-Length", Integer.toString(postDataLength));
         con.setUseCaches(false);
+
+        if(sendAuth){
+            con.setRequestProperty("Accept", "application/json");
+            con.setRequestProperty("Authorization", "Bearer {token}");
+        }
+
         try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
             wr.write(postData);
         }
@@ -46,7 +65,7 @@ public class HttpRequest {
         }
     }
 
-    public String sendGetRequest(String urlString) throws Exception{
+    public String sendGetRequest(String urlString) throws Exception {
         URL url = new URL(urlString);
         HttpURLConnection con = (HttpURLConnection) url.openConnection();
         con.setRequestMethod("GET");