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

@@ -3,7 +3,10 @@ package main;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
-import javafx.scene.control.*;
+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;
@@ -26,24 +29,16 @@ public class CreateEventController {
     public CheckBox checkBoxIsFullDay;
     @FXML
     public CheckBox checkBoxIsPrivate;
-    @FXML
-    public Label labelError;
 
 
-    public CreateEventController() {
+    public CreateEventController(){}
-    }
 
     @FXML
-    public void initialize() {
+    public void initialize(){}
-    }
 
 
     @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(),
@@ -53,7 +48,7 @@ public class CreateEventController {
                 textStart.getText(),
                 textEnd.getText(),
                 datePickerDate.getValue().atStartOfDay(),
-                    (int) DataController.USER_ID
+                1
         );
 
         System.out.println(event.getAsUrlParam());
@@ -63,9 +58,6 @@ public class CreateEventController {
 
         Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
         stage.close();
-        } catch (RuntimeException e) {
-            labelError.setText(e.getMessage());
-        }
     }
 
     @FXML

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

@@ -4,7 +4,6 @@ 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;
@@ -12,30 +11,22 @@ import java.util.Objects;
 public class MainApplication extends Application {
     @Override
     public void start(Stage stage) throws IOException {
-                                                                                    //wieder ändern zu main-view.fxml
+        FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
-        FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("../users/create-user.fxml"));
 
         Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
-        scene.getStylesheets().add(Objects.requireNonNull(
+        scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm());
-                                                    //wieder ändern zu main-view.css
-                MainApplication.class.getResource("../users/create-user.css")).toExternalForm());
         stage.setTitle("SharePlaner");
         stage.setScene(scene);
-        //wieder löschen
         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(
+        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();
+        stageLogin.show();
 
-        if (DataController.USER_ID >= 0) {
-            stage.show();
-        }
     }
 
     public static void main(String[] args) {

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

@@ -65,35 +65,12 @@ 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(
+            FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("create-event.fxml"));
-                    MainApplication.class.getResource("create-event.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 650, 500);
-            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);
@@ -184,8 +161,7 @@ public class MainController {
 
         LocalDateTime eventDate = event.getDate();
 
-        int day = (int) Duration.between(
+        int day = (int) Duration.between(weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
-                weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
 
         if (day >= 0 && day < 7) {
             dayVBoxes[day].getChildren().add(vBox);

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

@@ -1,13 +1,7 @@
 package users;
 
-import javafx.event.ActionEvent;
-import javafx.scene.Node;
 import javafx.scene.control.CheckBox;
-import javafx.scene.control.Label;
 import javafx.scene.control.TextField;
-import javafx.stage.Stage;
-
-import java.util.Objects;
 
 public class CreateUserController {
 
@@ -15,27 +9,4 @@ public class CreateUserController {
     public TextField textPassword;
     public TextField textPasswordSecond;
     public CheckBox checkBoxIsAdmin;
-    public Label labelErrorName;
-    public Label labelErrorPw;
-
-    protected void createUser(ActionEvent event) {
-        if (textName.getText().trim().isEmpty()) {
-            labelErrorName.setText("Bitte Usernamen eingeben!");
-            labelErrorPw.setText("");
-            return;
-        }
-        if (textPassword.getText().trim().isEmpty()) {
-            labelErrorName.setText("");
-            labelErrorPw.setText("Bitte Passwort eingeben!");
-            return;
-        }
-        if (Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
-            labelErrorName.setText("");
-            labelErrorPw.setText("Passwörter stimmen nicht überein!");
-            return;
-        }
-
-        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
-        stage.close();
-    }
 }

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

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

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

@@ -1,50 +0,0 @@
-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,14 +33,3 @@ 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;
-}

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

@@ -5,8 +5,7 @@
 
 <?import javafx.collections.FXCollections?>
 <?import java.lang.String?>
-<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
+<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.CreateEventController">
-          fx:controller="main.CreateEventController">
 
     <columnConstraints>
         <ColumnConstraints/>
@@ -23,7 +22,6 @@
         <RowConstraints vgrow="ALWAYS" />
         <RowConstraints vgrow="ALWAYS" />
         <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS"/>
     </rowConstraints>
 
     <Label styleClass="mainLabel">Termin anlegen</Label>
@@ -53,9 +51,8 @@
     </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">
+    <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/main-view.fxml

@@ -5,8 +5,7 @@
 <?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"
+<GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1" fx:controller="main.MainController">
-          fx:controller="main.MainController">
     <columnConstraints>
         <ColumnConstraints hgrow="NEVER" maxWidth="60.0" minWidth="60.0" />
         <ColumnConstraints hgrow="ALWAYS" />
@@ -14,8 +13,7 @@
     <rowConstraints>
         <RowConstraints vgrow="SOMETIMES" />
     </rowConstraints>
-    <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
+    <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0" style="-fx-background-color: #525E74;">
-          style="-fx-background-color: #525E74;">
         <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">
 
         </ImageView>
@@ -33,30 +31,21 @@
         <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"
+        <Label fx:id="LabelMonth" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="labelMonth" textFill="WHITE" GridPane.columnIndex="0" GridPane.rowIndex="0">
-               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.columnSpan="4"
+        <GridPane fx:id="calendarGrid" gridLinesVisible="true"  styleClass="gridCalendar" GridPane.columnIndex="0" GridPane.rowIndex="1">
-                  GridPane.columnIndex="0" GridPane.rowIndex="1">
             <columnConstraints>
-                <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857"
+                <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857" percentWidth="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/create-user.fxml

@@ -9,7 +9,6 @@
         <ColumnConstraints/>
         <ColumnConstraints/>
         <ColumnConstraints/>
-        <ColumnConstraints/>
     </columnConstraints>
     <rowConstraints>
         <RowConstraints vgrow="ALWAYS" />
@@ -18,23 +17,19 @@
         <RowConstraints vgrow="ALWAYS" />
         <RowConstraints vgrow="ALWAYS" />
         <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
     </rowConstraints>
 
-    <Label styleClass="mainLabel" GridPane.columnIndex="2" GridPane.columnSpan="2" >User anlegen</Label>
+    <Label styleClass="mainLabel">User anlegen</Label>
 
-    <Label styleClass="inputLabel" GridPane.rowIndex="1" GridPane.columnIndex="1">Name:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="1">Name:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Passwort:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="3">Passwort:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort wiederholen:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="4">Passwort wiederholen:</Label>
-    <Label styleClass="inputLabel" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="6">Admin:</Label>
 
     <TextField fx:id="textName" GridPane.columnIndex="2" GridPane.rowIndex="1" maxWidth="400" minWidth="400"/>
     <TextField fx:id="textPassword" GridPane.columnIndex="2" GridPane.rowIndex="3" maxWidth="400" minWidth="400"/>
     <TextField fx:id="textPasswordSecond" GridPane.columnIndex="2" GridPane.rowIndex="4" maxWidth="400" minWidth="400"/>
 
     <CheckBox fx:id="checkBoxIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
-
-    <Label fx:id="labelErrorName" GridPane.columnIndex="3" GridPane.rowIndex="1"/>
-    <Label fx:id="labelErrorPw" GridPane.columnIndex="3" GridPane.rowIndex="3"/>
 </GridPane>
 

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

@@ -1,37 +0,0 @@
-* {
-   -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,32 +1,11 @@
 <?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.LoginController">
 
-    <columnConstraints>
+<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"  fx:controller="users.LoginControler">
-        <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,13 +14,10 @@ import java.util.*;
 
 public class DataController {
 
-    public static long USER_ID = -1;
-
     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";
-    private static final String LOGIN_ENDPOINT = "http://localhost:8080/vpr/login";
 
     private final HttpRequest httpRequest;
 
@@ -28,25 +25,11 @@ 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) {
-            throw new RuntimeException("Es konnte keine Verbindung mit dem Server hergestellt werden.");
+            e.printStackTrace();
         }
     }
 
@@ -62,7 +45,7 @@ public class DataController {
         ArrayList<Event> eventList = new ArrayList<>();
 
         try {
-            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=" + USER_ID);
+            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=1");
             System.out.println(jsonResponse);
 
             ObjectMapper objectMapper = new ObjectMapper();

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

@@ -2,14 +2,9 @@ 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 {
 
@@ -66,24 +61,7 @@ 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;