TimPicker now uses 24h time format

# Conflicts:
#	client/data/src/main/java/res/Event.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/main/CreateEventController.java

@@ -0,0 +1,102 @@
+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 ComboBox<String> ComboBoxTyp;
+    @FXML
+    public ComboBox<String> ComboBoxPriotity;
+    @FXML
+    public CheckBox checkBoxIsFullDay;
+    @FXML
+    public CheckBox checkBoxIsPrivate;
+    @FXML
+    public Label labelError;
+    @FXML
+    public JFXTimePicker timeStart;
+    @FXML
+    public JFXTimePicker timeEnd;
+
+
+    public 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) {
+                throw new IllegalArgumentException("Bitte w\u00e4hle ein Datum aus");
+            }
+
+            Event event = new Event(
+                    textName.getText(),
+                    ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
+                    checkBoxIsFullDay.isSelected(),
+                    checkBoxIsPrivate.isSelected(),
+                    timeStart.getValue().toString(),
+                    timeEnd.getValue().toString(),
+                    datePickerDate.getValue().atStartOfDay(),
+                    (int) DataController.USER_ID
+            );
+
+            System.out.println(event.getAsUrlParam());
+
+            DataController dataController = new DataController();
+            dataController.createEvent(event);
+
+            Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
+            stage.close();
+        } catch (RuntimeException e) {
+            labelError.setText(e.getMessage());
+        }
+    }
+
+    @FXML
+    protected void abortBtnClick(ActionEvent event) {
+        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
+        stage.close();
+    }
+}

client/app/src/main/java/main/Launcher.java

@@ -1,4 +1,4 @@
-package client;
+package main;
 
 public class Launcher {
 

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

@@ -0,0 +1,40 @@
+package main;
+
+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;
+
+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);
+        scene.getStylesheets().add(Objects.requireNonNull(
+                MainApplication.class.getResource("main-view.css")).toExternalForm());
+        stage.setTitle("SharePlaner");
+        stage.setScene(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());
+        Stage stageLogin = new Stage();
+        stageLogin.setTitle("Anmelden");
+        stageLogin.setScene(sceneLogin);
+        stageLogin.showAndWait();
+
+        if (DataController.USER_ID >= 0) {
+            stage.show();
+        }
+    }
+
+    public static void main(String[] args) {
+        launch();
+    }
+}

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

@@ -1,7 +1,5 @@
-package client;
+package main;
 
-import javafx.event.ActionEvent;
-import javafx.event.EventHandler;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Pos;
@@ -65,12 +63,35 @@ public class MainController {
         }
     }
 
+    @FXML
+    protected void onBackClick() {
+        weekOffset--;
+        setDates();
+        updateEvents();
+    }
+
+    @FXML
+    protected void onTodayClick() {
+        weekOffset = 0;
+        setDates();
+        updateEvents();
+    }
+
+    @FXML
+    protected void onNextClick() {
+        weekOffset++;
+        setDates();
+        updateEvents();
+    }
+
     @FXML
     protected void onAddBtnClick() {
         try {
-            FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("create-event.fxml"));
-            Scene scene = new Scene(fxmlLoader.load(), 650, 500);
-            scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("create-event.css")).toExternalForm());
+            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());
             Stage stage = new Stage();
             stage.setTitle("Termin erstellen");
             stage.setScene(scene);
@@ -78,8 +99,7 @@ public class MainController {
             stage.setResizable(false);
             //stage.initStyle(StageStyle.UNDECORATED);
             stage.showAndWait();
-        }
-        catch (IOException e){
+        } catch (IOException e) {
             e.printStackTrace();
         }
         updateEvents();
@@ -128,6 +148,23 @@ public class MainController {
         });
         Button editBtn = new Button();
         editBtn.setText("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);
@@ -135,8 +172,12 @@ public class MainController {
         Label nameLabel = new Label(event.getName());
         vBox.getChildren().add(nameLabel);
 
-        Label timeLabel = new Label(event.getStart() + "-" + event.getEnd());
+        if (event.getStart() != null || event.getEnd() != null) {
+            String timeStr = (event.getStart() != null ? formatTime(event.getStart()) : "")
+                    + (event.getEnd() != null ? " - " + formatTime(event.getEnd()) : "");
+            Label timeLabel = new Label(timeStr);
             vBox.getChildren().add(timeLabel);
+        }
 
         Label typeLabel = new Label("Wer: " + event.getOwnerName());
         vBox.getChildren().add(typeLabel);
@@ -158,13 +199,22 @@ 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);
         }
     }
 
+    private String formatTime(String time) {
+        String[] timeArr = time.split(":");
+        if (timeArr.length > 2) {
+            return timeArr[0] + ":" + timeArr[1];
+        }
+        return time;
+    }
+
     private void setDates() {
         DateTimeFormatter dateFormatter = DateTimeFormatter.ofPattern("LLLL yyyy");
         DateTimeFormatter dayFormatter = DateTimeFormatter.ofPattern("E dd.MM");
@@ -173,7 +223,7 @@ public class MainController {
         LocalDateTime now = LocalDateTime.now();
         int dayOfWeek = Integer.parseInt(dayOfWeekFormatter.format(now));
 
-        weekStartDateTime = now.minusDays(weekOffset * 7L + dayOfWeek - 1);
+        weekStartDateTime = now.plusDays(weekOffset * 7L - dayOfWeek + 1);
 
         for (int i = 0; i < 7; i++) {
             dayLabel[i].setText(dayFormatter.format(weekStartDateTime.plusDays(i)));

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

@@ -33,3 +33,19 @@ Label{
 .mainButton{
     -fx-font-weight: bold;
 }
+
+#labelError{
+    -fx-font-weight: bold;
+    -fx-max-width: 1000px;
+    -fx-text-fill: #ff5555;
+    -fx-padding: 16px;
+    -fx-min-height: 140px;
+    -fx-max-height: 400px;
+    -fx-wrap-text: true;
+    -fx-font-size: 16px;
+}
+
+.timePicker{
+    -fx-background-color: white;
+    -fx-max-width: 150px;
+}

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="client.CreateEventController">
+<GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
+          fx:controller="main.CreateEventController">
 
     <columnConstraints>
         <ColumnConstraints/>
@@ -22,6 +23,7 @@
         <RowConstraints vgrow="ALWAYS"/>
         <RowConstraints vgrow="ALWAYS"/>
         <RowConstraints vgrow="ALWAYS"/>
+        <RowConstraints vgrow="ALWAYS"/>
     </rowConstraints>
 
     <Label styleClass="mainLabel">Termin anlegen</Label>
@@ -37,8 +39,6 @@
 
     <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">
         <items>
@@ -51,8 +51,9 @@
     </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"/>
 
-    <HBox GridPane.columnIndex="1" GridPane.rowIndex="9" GridPane.columnSpan="2"  alignment="CENTER_RIGHT">
+    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" 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,61 @@
+<?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 vgrow="ALWAYS"/>
+    </rowConstraints>
+
+    <Label styleClass="mainLabel">Termin bearbeiten</Label>
+
+    <Label styleClass="inputLabel" GridPane.rowIndex="1">Datum:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="2">Titel:</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"/>
+    <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">
+        <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="7"/>
+    <CheckBox fx:id="checkBoxIsPrivate" GridPane.columnIndex="1" GridPane.rowIndex="8"/>
+    <Label fx:id="labelError" GridPane.columnIndex="1" GridPane.rowIndex="9"/>
+
+    <HBox GridPane.columnIndex="1" GridPane.rowIndex="10" 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,7 +5,8 @@
 <?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="client.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"/>
@@ -13,7 +14,8 @@
     <rowConstraints>
         <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>
@@ -31,21 +33,30 @@
         <columnConstraints>
             <ColumnConstraints hgrow="ALWAYS"/>
             <ColumnConstraints/>
+            <ColumnConstraints/>
+            <ColumnConstraints/>
+            <ColumnConstraints/>
         </columnConstraints>
         <rowConstraints>
             <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"/>
             </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.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" 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"/>

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

@@ -0,0 +1,32 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="users.LoginController">
+
+    <columnConstraints>
+        <ColumnConstraints/>
+        <ColumnConstraints/>
+        <ColumnConstraints/>
+    </columnConstraints>
+    <rowConstraints>
+        <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"/>
+    <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"/>
+    <Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
+
+    <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,10 +14,14 @@ 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;
 
@@ -25,11 +29,25 @@ public class DataController {
         httpRequest = new HttpRequest();
     }
 
+    public boolean login(String username, String password) {
+        try {
+            USER_ID = Long.parseLong(httpRequest.sendPostRequest(
+                    LOGIN_ENDPOINT,
+                    "login=" + username
+                            + "&password=" + password
+            ));
+        } 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()));
         } catch (Exception e) {
-            e.printStackTrace();
+            throw new RuntimeException("Es konnte keine Verbindung mit dem Server hergestellt werden.");
         }
     }
 
@@ -45,7 +63,7 @@ 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);
             System.out.println(jsonResponse);
 
             ObjectMapper objectMapper = new ObjectMapper();

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

@@ -2,9 +2,14 @@ package res;
 
 import com.sun.jdi.event.StepEvent;
 
+import java.time.Duration;
+import java.time.LocalDate;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
+import java.util.regex.Matcher;
+import java.util.regex.Pattern;
+import java.util.regex.PatternSyntaxException;
 
 public class Event {
 
@@ -61,7 +66,23 @@ public class Event {
                  String end,
                  LocalDateTime date,
                  int ownerId
-    ) {
+    ) throws IllegalArgumentException{
+        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 =!?+*/$%€.:,;_<>()-]*");
+        Matcher matcher = pattern.matcher(name);
+        if(!matcher.matches()){
+            throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: =!?+*/$%€.:,;_ <>()-");
+        }
+        if(priority < 0){
+            throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");
+        }
+        LocalDateTime today = LocalDateTime.now().toLocalDate().atStartOfDay();
+        if(Duration.between(today, date).isNegative()){
+            throw new IllegalArgumentException("Das Datum muss in der Zukunft liegen.");
+        }
+
         this.name = name;
         this.priority = priority;
         this.isFullDay = isFullDay;

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

@@ -1,68 +0,0 @@
-package client;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.CheckBox;
-import javafx.scene.control.ComboBox;
-import javafx.scene.control.DatePicker;
-import javafx.scene.control.TextField;
-import javafx.stage.Stage;
-import res.DataController;
-import res.Event;
-
-public class CreateEventController {
-
-    @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;
-    @FXML
-    public CheckBox checkBoxIsPrivate;
-
-
-    public CreateEventController(){}
-
-    @FXML
-    public void initialize(){}
-
-
-    @FXML
-    protected void createBtnClick(ActionEvent actionEvent){
-
-        Event event = new Event(
-                textName.getText(),
-                ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
-                checkBoxIsFullDay.isSelected(),
-                checkBoxIsPrivate.isSelected(),
-                textStart.getText(),
-                textEnd.getText(),
-                datePickerDate.getValue().atStartOfDay(),
-                1
-        );
-
-        System.out.println(event.getAsUrlParam());
-
-        DataController dataController = new DataController();
-        dataController.createEvent(event);
-
-        Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
-        stage.close();
-    }
-
-    @FXML
-    protected void abortBtnClick(ActionEvent event){
-        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
-        stage.close();
-    }
-}

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

@@ -1,28 +0,0 @@
-package client;
-
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-
-import java.io.IOException;
-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);
-        scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm());
-        stage.setTitle("Hello!");
-        stage.setScene(scene);
-        stage.show();
-
-    }
-
-    public static void main(String[] args) {
-        launch();
-    }
-}

hellofx/data/src/main/java/kaka/Dings.java

@@ -1,8 +0,0 @@
-package kaka;
-
-public class Dings {
-
-    public static int a() {
-        return 5;
-    }
-}