Fixed event/add endpoint

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

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,6 +1,6 @@
 package main;
 
-import com.jfoenix.controls.JFXTimePicker;
+import com.jfoenix.controls.*;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
@@ -12,6 +12,7 @@ import javafx.util.converter.LocalTimeStringConverter;
 import res.DataController;
 import res.Event;
 
+import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.FormatStyle;
 import java.util.Locale;
@@ -21,17 +22,15 @@ public class CreateEventController {
     @FXML
     public GridPane mainGrid;
     @FXML
-    public DatePicker datePickerDate;
+    public JFXDatePicker datePickerDate;
     @FXML
-    public TextField textName;
+    public JFXTextField textName;
     @FXML
-    public ComboBox<String> ComboBoxTyp;
+    public JFXComboBox<String> ComboBoxPriotity;
     @FXML
-    public ComboBox<String> ComboBoxPriotity;
+    public JFXToggleButton toggleBtnIsFullDay;
     @FXML
-    public CheckBox checkBoxIsFullDay;
+    public JFXToggleButton toggleBtnIsPrivate;
-    @FXML
-    public CheckBox checkBoxIsPrivate;
     @FXML
     public Label labelError;
     @FXML
@@ -47,20 +46,11 @@ public class CreateEventController {
     public void initialize() {
 
         StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
+        timeStart.set24HourView(true);
+        timeStart.setConverter(defaultConverter);
 
-        JFXTimePicker timePickerStart = new JFXTimePicker();
+        timeEnd.set24HourView(true);
-        timeStart = timePickerStart;
+        timeEnd.setConverter(defaultConverter);
-        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);
     }
 
 
@@ -74,10 +64,10 @@ public class CreateEventController {
             Event event = new Event(
                     textName.getText(),
                     ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
-                    checkBoxIsFullDay.isSelected(),
+                    toggleBtnIsFullDay.isSelected(),
-                    checkBoxIsPrivate.isSelected(),
+                    toggleBtnIsPrivate.isSelected(),
-                    timeStart.getValue().toString(),
+                    timeStart.getValue(),
-                    timeEnd.getValue().toString(),
+                    timeEnd.getValue(),
                     datePickerDate.getValue().atStartOfDay(),
                     (int) DataController.USER_ID
             );

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

@@ -12,25 +12,33 @@ import java.util.Objects;
 public class MainApplication extends Application {
     @Override
     public void start(Stage stage) throws IOException {
-        FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
 
-        Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
+        System.out.println("Ignore 'Illegal reflective access operation'-Warning. See https://github.com/sshahine/JFoenix/issues/1170");
-        scene.getStylesheets().add(Objects.requireNonNull(
-                MainApplication.class.getResource("main-view.css")).toExternalForm());
-        stage.setTitle("SharePlaner");
-        stage.setScene(scene);
 
+        // Load login-scene
         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());
+                MainApplication.class.getResource("../users/login.css")).toExternalForm()
+        );
         Stage stageLogin = new Stage();
         stageLogin.setTitle("Anmelden");
         stageLogin.setScene(sceneLogin);
         stageLogin.showAndWait();
 
         if (DataController.USER_ID >= 0) {
+            // Load main-scene
+            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()
+            );
+            stage.setTitle("SharePlaner");
+            stage.setScene(scene);
             stage.show();
+
+            System.out.println("Logged in...");
         }
     }
 

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

@@ -4,8 +4,8 @@ import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
-import javafx.scene.control.Button;
+import customUI.Button;
-import javafx.scene.control.Label;
+import customUI.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
@@ -28,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];
@@ -56,7 +56,7 @@ public class MainController {
         }
 
         DataController dataController = new DataController();
-        ArrayList<Event> eventList = dataController.getAllVisibleEvents();
+        ArrayList<Event> eventList = dataController.getAllVisibleEvents(weekStartDateTime, weekStartDateTime.plusDays(7));
 
         for (Event event : eventList) {
             addEvent(event);
@@ -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,14 @@ 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());
+            dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
             updateEvents();
         });
         Button editBtn = new Button();
-        editBtn.setText("edit");
+        editBtn.setTextValue("edit");
         editBtn.setOnAction(event1 -> {
             try {
                 FXMLLoader fxmlLoader = new FXMLLoader(
@@ -182,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);
 
@@ -226,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/CreateUserController.java

@@ -0,0 +1,55 @@
+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.scene.control.ToggleButton;
+import javafx.stage.Stage;
+
+import java.util.Objects;
+
+public class CreateUserController {
+
+    public TextField textName;
+    public TextField textPassword;
+    public TextField textPasswordSecond;
+    public ToggleButton checkButtonIsAdmin;
+    public TextField textLogin;
+    public TextField textForename;
+    public Label labelError;
+
+    @FXML
+    protected void createUser(ActionEvent event) {
+        if (textLogin.getText().trim().isEmpty()){
+            labelError.setText("Bitte Login Namen angeben");
+            return;
+        }
+        if (textForename.getText().trim().isEmpty()) {
+            labelError.setText("Bitte Vornamen eingeben!");
+            return;
+        }
+        if (textName.getText().trim().isEmpty()) {
+            labelError.setText("Bitte Nachnamen eingeben!");
+            return;
+        }
+        if (textPassword.getText().trim().isEmpty()) {
+            labelError.setText("Bitte Passwort eingeben!");
+            return;
+        }
+        if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
+            labelError.setText("Passwörter stimmen nicht überein!");
+            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/java/users/LoginController.java

@@ -1,18 +1,18 @@
 package users;
 
+import com.jfoenix.controls.*;
 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;
+    public JFXTextField userField;
     @FXML
-    public TextField passField;
+    public JFXPasswordField passField;
     @FXML
     public Label userErrLabel;
     @FXML

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

@@ -28,10 +28,16 @@ Label{
 
 .inputField{
     -fx-padding: 10px;
+    -fx-background-color: white;
 }
 
 .mainButton{
     -fx-font-weight: bold;
+    -fx-background-color: white;
+}
+
+JFXButton{
+    -fx-background-color: white;
 }
 
 #labelError{
@@ -45,7 +51,14 @@ Label{
     -fx-font-size: 16px;
 }
 
+.inputDate{
+    -fx-background-color: white;
+}
+
+.comboBox{
+    -fx-background-color: white;
+}
+
 .timePicker{
     -fx-background-color: white;
-    -fx-max-width: 150px;
 }

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

@@ -5,6 +5,8 @@
 
 <?import javafx.collections.FXCollections?>
 <?import java.lang.String?>
+<?import com.jfoenix.controls.*?>
+
 <GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
           fx:controller="main.CreateEventController">
 
@@ -23,24 +25,25 @@
         <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="1">Titel:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="2">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"/>
+    <Label styleClass="inputLabel" GridPane.rowIndex="5">Priorität:</Label>
-    <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="400" minWidth="400"/>
+    <Label styleClass="inputLabel" GridPane.rowIndex="6">Ganztägig:</Label>
-    <ComboBox fx:id="ComboBoxTyp" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="400" minWidth="400"/>
+    <Label styleClass="inputLabel" GridPane.rowIndex="7">Privat:</Label>
-    <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="6" maxWidth="200" minWidth="200">
+
+    <JFXTextField styleClass="inputField" fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
+    <JFXDatePicker styleClass="inputDate" fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="200" minWidth="200"/>
+
+    <JFXComboBox fx:id="ComboBoxPriotity" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
             <FXCollections fx:factory="observableArrayList">
                 <String fx:value="gering"/>
@@ -48,14 +51,14 @@
                 <String fx:value="hoch"/>
             </FXCollections>
         </items>
-    </ComboBox>
+    </JFXComboBox>
-    <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+    <JFXToggleButton styleClass="checkbox" fx:id="toggleBtnIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
-    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
+    <JFXToggleButton styleClass="checkbox"  fx:id="toggleBtnIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
-    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
+    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
 
-    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
+    <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
-        <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</Button>
+        <JFXButton onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</JFXButton>
-        <Button styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Anlegen</Button>
+        <JFXButton styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Anlegen</JFXButton>
     </HBox>
 
 </GridPane>

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

@@ -2,8 +2,10 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
+
 <?import javafx.collections.FXCollections?>
 <?import java.lang.String?>
+<?import com.jfoenix.controls.*?>
 
 <GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
           fx:controller="main.CreateEventController">
@@ -23,24 +25,25 @@
         <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">Datum:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="1">Titel:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="2">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"/>
+    <Label styleClass="inputLabel" GridPane.rowIndex="5">Priorität:</Label>
-    <TextField fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="400" minWidth="400"/>
+    <Label styleClass="inputLabel" GridPane.rowIndex="6">Ganztägig:</Label>
-    <ComboBox fx:id="ComboBoxTyp" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="400" minWidth="400"/>
+    <Label styleClass="inputLabel" GridPane.rowIndex="7">Privat:</Label>
-    <ComboBox fx:id="ComboBoxPriotity" GridPane.columnIndex="1" GridPane.rowIndex="6" maxWidth="200" minWidth="200">
+
+    <JFXTextField styleClass="inputField" fx:id="textName" GridPane.columnIndex="1" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
+    <JFXDatePicker styleClass="inputDate" fx:id="datePickerDate" GridPane.columnIndex="1" GridPane.rowIndex="2" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeStart" GridPane.columnIndex="1" GridPane.rowIndex="3" maxWidth="200" minWidth="200"/>
+    <JFXTimePicker styleClass="timePicker" fx:id="timeEnd" GridPane.columnIndex="1" GridPane.rowIndex="4" maxWidth="200" minWidth="200"/>
+
+    <JFXComboBox fx:id="ComboBoxPriotity" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
             <FXCollections fx:factory="observableArrayList">
                 <String fx:value="gering"/>
@@ -48,14 +51,14 @@
                 <String fx:value="hoch"/>
             </FXCollections>
         </items>
-    </ComboBox>
+    </JFXComboBox>
-    <CheckBox fx:id="checkBoxIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
+    <JFXToggleButton styleClass="checkbox" fx:id="toggleBtnIsFullDay" GridPane.columnIndex="1" GridPane.rowIndex="6"/>
-    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
+    <JFXToggleButton styleClass="checkbox"  fx:id="toggleBtnIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="7"/>
-    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
+    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
 
-    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
+    <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2" alignment="CENTER_RIGHT">
-        <Button onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</Button>
+        <JFXButton onAction="#abortBtnClick" maxWidth="150" minWidth="150">Abbrechen</JFXButton>
-        <Button styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Speichern</Button>
+        <JFXButton styleClass="mainButton" onAction="#createBtnClick" maxWidth="150" minWidth="150">Speichern</JFXButton>
     </HBox>
 
 </GridPane>

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

@@ -72,3 +72,7 @@ Label{
     -fx-max-height: 40px;
 }
 
+.navBtn{
+    -fx-background-color: white;
+}
+

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

@@ -4,6 +4,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
+<?import com.jfoenix.controls.*?>
 
 <GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
           fx:controller="main.MainController">
@@ -19,15 +20,15 @@
         <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
 
         </ImageView>
-        <Button onAction="#onAddBtnClick" styleClass="main-btn">
+        <JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
             ADD
-        </Button>
+        </JFXButton>
-        <Button onAction="#onAddBtnClick" styleClass="main-btn">
+        <JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
             ADD
-        </Button>
+        </JFXButton>
-        <Button onAction="#onAddBtnClick" styleClass="main-btn">
+        <JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
             ADD
-        </Button>
+        </JFXButton>
     </VBox>
     <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
         <columnConstraints>
@@ -48,9 +49,9 @@
                 <Insets left="5"/>
             </padding>
         </Label>
-        <Button onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</Button>
+        <JFXButton styleClass="navBtn" onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</JFXButton>
-        <Button onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</Button>
+        <JFXButton styleClass="navBtn" onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</JFXButton>
-        <Button onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</Button>
+        <JFXButton styleClass="navBtn" onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</JFXButton>
 
         <GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnSpan="4"
                   GridPane.columnIndex="0" GridPane.rowIndex="1">

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

@@ -0,0 +1,56 @@
+* {
+   -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);
+}
+
+.mainLabel{
+    -fx-padding: 10px;
+    -fx-max-width: 400px;
+    -fx-min-width: 400px;
+    -fx-font-weight: bold;
+    -fx-alignment: top-center;
+}
+
+
+Label{
+    -fx-text-fill: white;
+    -fx-max-width: 150px;
+    -fx-min-width: 150px;
+}
+
+.textField{
+    -fx-max-width: 400px;
+    -fx-min-width: 400px;
+}
+
+.errorMessage{
+    -fx-max-width: 400px;
+    -fx-min-width: 400px;
+}
+
+Button{
+    -fx-max-width: 150px;
+    -fx-min-width: 150px;
+}
+
+.btnLogin{
+    -fx-font-weight: bold;
+}
+

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

@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<?import javafx.geometry.Insets?>
+<GridPane xmlns="http://javafx.com/javafx"
+          xmlns:fx="http://javafx.com/fxml"
+          fx:controller="users.CreateUserController">
+    <columnConstraints>
+        <ColumnConstraints minWidth="100"/>
+        <ColumnConstraints minWidth="100"/>
+        <ColumnConstraints minWidth="100"/>
+    </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>
+
+    <Label styleClass="mainLabel" GridPane.columnIndex="2" >User anlegen</Label>
+
+    <Label styleClass="inputLabel" GridPane.rowIndex="1" GridPane.columnIndex="1">Login:</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="4" GridPane.columnIndex="1">Passwort:</Label>
+    <Label styleClass="inputLabel" 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" />
+    <TextField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+    <TextField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+
+    <ToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
+
+    <Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="2" GridPane.rowIndex="7"/>
+
+    <HBox GridPane.columnIndex="2" GridPane.rowIndex="8" alignment="CENTER_RIGHT">
+        <HBox.margin>
+            <Insets right="100" left="100"/>
+        </HBox.margin>
+        <Button onAction="#abortBtnClick">Abbrechen</Button>
+        <Button onAction="#createUser" styleClass="btnLogin" >Anmelden</Button>
+
+    </HBox>
+</GridPane>
+

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

@@ -34,4 +34,20 @@ Label{
         -fx-max-height: 400px;
         -fx-wrap-text: true;
         -fx-font-size: 16px;
+}
+
+.userField{
+    -fx-background-color: white;
+}
+
+.passField{
+    -fx-background-color: white;
+}
+
+.quitBtn{
+    -fx-background-color: white;
+}
+
+.loginBtn{
+    -fx-background-color: white;
 }

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

@@ -2,6 +2,8 @@
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
+<?import com.jfoenix.controls.*?>
+
 <GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="users.LoginController">
 
     <columnConstraints>
@@ -19,14 +21,14 @@
     <Label GridPane.columnIndex="1">Anmelden</Label>
 
     <Label GridPane.rowIndex="1">Username</Label>
-    <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"/>
+    <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>
-    <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
+    <JFXPasswordField styleClass="passField" GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
     <Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
 
-    <Button onAction="#abortBtnClick" GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>
+    <JFXButton styleClass="quitBtn" onAction="#abortBtnClick" GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</JFXButton>
-    <Button onAction="#login" GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button>
+    <JFXButton styleClass="loginBtn" onAction="#login" GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</JFXButton>
 
 </GridPane>

client/data/build.gradle.kts

@@ -7,4 +7,5 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
     implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
     implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
+    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
 }

client/data/src/main/java/helper/Tuple.java

@@ -0,0 +1,27 @@
+package helper;
+
+public class Tuple<X, Y> {
+    public final X key;
+    public final Y value;
+
+    public Tuple(X key, Y value) {
+        this.key = key;
+        this.value = value;
+    }
+
+    public X getKey() {
+        return key;
+    }
+
+    public Y getValue() {
+        return value;
+    }
+
+    @Override
+    public String toString() {
+        return "Tuple{" +
+                "key=" + key +
+                ", value=" + value +
+                '}';
+    }
+}

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

@@ -1,7 +1,9 @@
 package res;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
+import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import helper.Tuple;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -10,6 +12,7 @@ import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
+import java.time.LocalDateTime;
 import java.util.*;
 
 public class DataController {
@@ -22,6 +25,7 @@ public class DataController {
 
     private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login";
     private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
+    private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";
 
     private final HttpRequest httpRequest;
 
@@ -31,54 +35,68 @@ public class DataController {
 
     public boolean login(String username, String password) {
         try {
-            USER_ID = Long.parseLong(httpRequest.sendPostRequest(
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(
                     LOGIN_ENDPOINT,
                     "login=" + username
-                            + "&password=" + password
+                            + "&password=" + password,
-            ));
+                    false
+            );
+            String[] data = response.getValue().split("\\s+");
+
+            USER_ID = Long.parseLong(data[1]);
+            HttpRequest.TOKEN = data[0];
+
+            Tuple<Integer, String> auth = httpRequest.sendPostRequest(
+                    HEADER_TEST_ENDPOINT,
+                    "",
+                    true
+            );
+            System.out.println("auth " + auth);
         } 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()));
+            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 userId, int eventId, LocalDateTime date) {
         try {
-            System.out.println(httpRequest.sendPostRequest(DELETE_EVENT_ENDPOINT, "eventId=" + eventId));
+            System.out.println("DELETE: userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate());
+            System.out.println(httpRequest.sendPostRequest(
+                    DELETE_EVENT_ENDPOINT,
+                    "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
+                    true
+            ));
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    public ArrayList<Event> getAllVisibleEvents() {
+    public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) {
         ArrayList<Event> eventList = new ArrayList<>();
-
         try {
-            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=" + USER_ID);
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+                    ALL_EVENTS_ENDPOINT,
+                    "userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
+                    true
+            );
+            String jsonResponse = response.getValue();
             System.out.println(jsonResponse);
 
             ObjectMapper objectMapper = new ObjectMapper();
-            //String json = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }";
+            objectMapper.findAndRegisterModules();
+            eventList = (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>(){});
 
-            for (Object obj : objectMapper.readValue(jsonResponse, Object[].class)) {
-                ArrayList<Object> list = new ArrayList<>();
-                if (obj.getClass().isArray()) {
-                    list = (ArrayList<Object>) Arrays.asList((Object[]) obj);
-                } else if (obj instanceof Collection) {
-                    list = new ArrayList<>((Collection<?>) obj);
-                }
-                eventList.add(new Event(list));
 
-            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -107,7 +125,6 @@ public class DataController {
 
         // Parse JSON
         ObjectMapper objectMapper = new ObjectMapper();
-        //String json = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }";
 
         return objectMapper.readValue(jsonString, Event[].class);
     }

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

@@ -2,9 +2,13 @@ package res;
 
 import com.sun.jdi.event.StepEvent;
 
+import java.io.Serializable;
+import java.nio.charset.StandardCharsets;
+import java.sql.SQLOutput;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
+import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.regex.Matcher;
@@ -42,6 +46,10 @@ public class Event {
     u.name AS uname
      */
 
+    public Event() {
+
+    }
+
     public Event(ArrayList<Object> arr) {
         id = (int) arr.get(0);
         name = (String) arr.get(1);
@@ -58,28 +66,77 @@ public class Event {
         ownerName = arr.get(8) + " " + arr.get(9);
     }
 
+    public Event(
+            int id,
+            String name,
+            int priority,
+            boolean isFullDay,
+            boolean isPrivate,
+            String start,
+            String end,
+            String date,
+            int ownerId,
+            String ownerName
+    ) {
+        this.ownerId = ownerId;
+        this.ownerName = ownerName;
+        this.id = id;
+        this.name = name;
+        this.start = start;
+        this.end = end;
+        this.priority = priority;
+        this.isFullDay = isFullDay;
+
+
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        this.date = LocalDateTime.parse(date + " 00:00", formatter);
+
+    }
+
     public Event(String name,
                  int priority,
                  boolean isFullDay,
                  boolean isPrivate,
-                 String start,
+                 LocalTime start,
-                 String end,
+                 LocalTime end,
                  LocalDateTime date,
                  int ownerId
-    ) throws IllegalArgumentException{
+    ) throws IllegalArgumentException {
-        if(name.length() < 3){
+
+        System.out.println("Create 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()){
+        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){
+        if (priority < 0) {
             throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");
         }
         LocalDateTime today = LocalDateTime.now().toLocalDate().atStartOfDay();
-        if(Duration.between(today, date).isNegative()){
+        if (Duration.between(today, date).isNegative()) {
             throw new IllegalArgumentException("Das Datum muss in der Zukunft liegen.");
         }
 
@@ -87,8 +144,8 @@ public class Event {
         this.priority = priority;
         this.isFullDay = isFullDay;
         this.isPrivate = isPrivate;
-        this.start = start;
+        if (start != null) this.start = start.toString();
-        this.end = end;
+        if (start != null) this.end = end.toString();
         this.date = date;
         this.ownerId = ownerId;
     }
@@ -106,7 +163,7 @@ public class Event {
     }
 
     public void setName(String name) {
-        this.name = name;
+        this.name = convertToASCII(name);
     }
 
     public int getPriority() {
@@ -153,8 +210,9 @@ public class Event {
         return date;
     }
 
-    public void setDate(LocalDateTime date) {
+    public void setDate(String date) {
-        this.date = date;
+        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
+        this.date = LocalDateTime.parse(date + " 00:00", formatter);
     }
 
     public int getOwnerId() {
@@ -188,8 +246,13 @@ public class Event {
                 "&name=" + getName() +
                 "&start=" + getStart() +
                 "&end=" + getEnd() +
-                "&prority=" + getPriority() +
+                "&priority=" + getPriority() +
                 "&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

@@ -1,5 +1,7 @@
 package res;
 
+import helper.Tuple;
+
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.InputStreamReader;
@@ -9,10 +11,25 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 public class HttpRequest {
-    public String sendPostRequest(String urlString, String urlParameters) throws Exception {
+    public static String TOKEN = "";
+
+    public Tuple<Integer, 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,27 +40,35 @@ 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);
         }
 
         int status = con.getResponseCode();
-        if (status == 200) {
+        String inputLine;
-            BufferedReader in = new BufferedReader(
+        StringBuilder content = new StringBuilder();
-                    new InputStreamReader(con.getInputStream()));
+        BufferedReader in;
-            String inputLine;
-            StringBuilder content = new StringBuilder();
-            while ((inputLine = in.readLine()) != null) {
-                content.append(inputLine);
-            }
-            in.close();
 
-            con.disconnect();
+        if (status == 200) {
-            return content.toString();
+             in = new BufferedReader(new InputStreamReader(con.getInputStream()));
         } else {
-            con.disconnect();
+             in = new BufferedReader(new InputStreamReader(con.getErrorStream()));
-            throw new Exception("Status: " + status);
         }
+
+        while ((inputLine = in.readLine()) != null) {
+            content.append(inputLine);
+        }
+        in.close();
+
+        con.disconnect();
+
+        return new Tuple<>(status, content.toString());
     }
 
     public String sendGetRequest(String urlString) throws Exception {