19 changed files with 42 additions and 74 deletions
--- a/client/app/src/main/java/events/CreateEventController.java
+++ b/client/app/src/main/java/events/CreateEventController.java
@ -28,15 +28,15 @@ public class CreateEventController {
    @FXML
    protected JFXComboBox<String> comboBoxPriority;
    @FXML
-    protected JFXToggleButton toggleBtnIsFullDay;
+    private JFXToggleButton toggleBtnIsFullDay;
    @FXML
-    protected JFXToggleButton toggleBtnIsPrivate;
+    private JFXToggleButton toggleBtnIsPrivate;
    @FXML
    private Label labelError;
    @FXML
-    protected JFXTimePicker timeStart;
+    private JFXTimePicker timeStart;
    @FXML
-    protected JFXTimePicker timeEnd;
+    private JFXTimePicker timeEnd;


    public CreateEventController() {
@ -91,7 +91,7 @@ public class CreateEventController {
        dataController.createEvent(event);
    }

-    //Marco Kühn//
+    //Marc Beyer//
    @FXML
    protected void abortBtnClick(ActionEvent event) {
        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
--- a/client/app/src/main/java/events/EditEventController.java
+++ b/client/app/src/main/java/events/EditEventController.java
@ -1,12 +1,9 @@
-//Marc Beyer//
 package events;

 import helper.HttpRequestException;
 import container.DataController;
 import container.Event;

-import java.time.LocalTime;
-
 public class EditEventController extends CreateEventController{

    private Event currentEvent;
@ -22,17 +19,7 @@ public class EditEventController extends CreateEventController{
        datePickerDate.setValue(currentEvent.getDate().toLocalDate());
        comboBoxPriority.getSelectionModel().select(currentEvent.getPriority());

-        try{
-            timeStart.setValue(LocalTime.parse(currentEvent.getStart()));
-        }catch (Exception e){}
-
-
-        try{
-            timeEnd.setValue(LocalTime.parse(currentEvent.getEnd()));
-        }catch (Exception e){}
-
-        toggleBtnIsFullDay.setSelected(currentEvent.isFullDay());
-        toggleBtnIsPrivate.setSelected(currentEvent.isPrivate());
+        //timeEnd.setValue(currentEvent.getEnd());
    }

    @Override
--- a/client/app/src/main/java/main/MainApplication.java
+++ b/client/app/src/main/java/main/MainApplication.java
@ -57,7 +57,7 @@ public class MainApplication extends Application {
        scene.getStylesheets().add(Objects.requireNonNull(
                MainApplication.class.getResource("main-view.css")).toExternalForm()
        );
-        stage.setTitle("SharePlanner");
+        stage.setTitle("SharePlaner");
        stage.setScene(scene);
        stage.show();
    }
--- a/client/app/src/main/java/main/MainController.java
+++ b/client/app/src/main/java/main/MainController.java
@ -1,4 +1,4 @@
-// Marco Kühn, Marc Beyer //
+/* Marco Kühn, Marc Beyer */
 package main;

 import config.Config;
--- a/client/app/src/main/java/main/OptionController.java
+++ b/client/app/src/main/java/main/OptionController.java
@ -1,4 +1,4 @@
-// Marco Kühn //
+/* Marco Kühn */
 package main;

 import com.jfoenix.controls.*;
--- a/client/app/src/main/java/ui/DayPane.java
+++ b/client/app/src/main/java/ui/DayPane.java
@ -1,4 +1,3 @@
-//Marc Beyer//
 package ui;

 import javafx.scene.control.Label;
--- a/client/app/src/main/java/ui/EventPane.java
+++ b/client/app/src/main/java/ui/EventPane.java
@ -1,4 +1,3 @@
-//Marc Beyer, Marco Kühn//
 package ui;

 import container.Event;
--- a/client/app/src/main/java/ui/SvgBtnCreator.java
+++ b/client/app/src/main/java/ui/SvgBtnCreator.java
@ -1,4 +1,3 @@
-//Marco Kühn//
 package ui;

 import javafx.geometry.Bounds;
--- a/client/app/src/main/java/users/CreateUserController.java
+++ b/client/app/src/main/java/users/CreateUserController.java
@ -1,14 +1,14 @@
 //Alex Rechtin//
 package users;

-import com.jfoenix.controls.JFXPasswordField;
-import com.jfoenix.controls.JFXTextField;
-import com.jfoenix.controls.JFXToggleButton;
 import helper.HttpRequestException;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+import javafx.scene.control.ToggleButton;
 import javafx.stage.Stage;
 import container.DataController;
 import container.User;
@ -18,17 +18,17 @@ import java.util.Objects;
 public class CreateUserController {

    @FXML
-    protected JFXTextField textName;
+    protected TextField textName;
    @FXML
-    protected JFXPasswordField textPassword;
+    protected PasswordField textPassword;
    @FXML
-    protected JFXPasswordField textPasswordSecond;
+    protected PasswordField textPasswordSecond;
    @FXML
-    protected JFXToggleButton checkButtonIsAdmin;
+    protected ToggleButton checkButtonIsAdmin;
    @FXML
-    protected JFXTextField textLogin;
+    protected TextField textLogin;
    @FXML
-    protected JFXTextField textForename;
+    protected TextField textForename;
    @FXML
    protected Label labelError;

--- a/client/app/src/main/java/users/EditUserController.java
+++ b/client/app/src/main/java/users/EditUserController.java
@ -1,4 +1,4 @@
-// Marc Beyer //
+/* Marc Beyer */
 package users;

 import container.DataController;
--- a/client/app/src/main/resources/users/create-user.css
+++ b/client/app/src/main/resources/users/create-user.css
@ -1,10 +1,8 @@
 /*Alex Rechtin*/
 * {
  -fx-dark-background-color: #3E415F;
-  -fx-bright-background-color: #ffffff;
  -fx-bright-border-color: #B0B0B0;
-  -fx-brighter-text-color: #ff5555;
-  -fx-brightest-text-color: #ffffff;
+  -fx-brighter-text-color: #ffffff;
 }


@ -31,13 +29,12 @@ GridPane{


 Label{
-    -fx-text-fill: -fx-brightest-text-color;
+    -fx-text-fill: -fx-brighter-text-color;
    -fx-max-width: 150px;
    -fx-min-width: 150px;
 }

 .textField{
-    -fx-background-color: -fx-bright-background-color;
    -fx-max-width: 400px;
    -fx-min-width: 400px;
 }
@ -45,11 +42,9 @@ Label{
 .errorMessage{
    -fx-max-width: 400px;
    -fx-min-width: 400px;
-    -fx-text-fill: -fx-brighter-text-color;
 }

-JFXButton{
-    -fx-background-color: -fx-bright-background-color;
+Button{
    -fx-max-width: 150px;
    -fx-min-width: 150px;
 }
--- a/client/app/src/main/resources/users/create-user.fxml
+++ b/client/app/src/main/resources/users/create-user.fxml
@ -2,13 +2,10 @@

 <!-- Alex Rechtin -->

-<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import com.jfoenix.controls.JFXToggleButton?>
-<?import com.jfoenix.controls.JFXButton?>
-<?import com.jfoenix.controls.JFXPasswordField?>
-<?import com.jfoenix.controls.JFXTextField?>
 <GridPane xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
          fx:controller="users.CreateUserController">
@ -36,15 +33,15 @@
    <Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
    <Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
    <Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
-    <Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>

    <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>

-    <JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-    <JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-    <JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-    <JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+    <TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+    <TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+    <TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />

    <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>

@ -54,8 +51,8 @@
        <HBox.margin>
            <Insets right="100" left="100"/>
        </HBox.margin>
-        <JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
-        <JFXButton onAction="#createUser" styleClass="btnLogin" >Anlegen</JFXButton>
+        <Button onAction="#abortBtnClick">Abbrechen</Button>
+        <Button onAction="#createUser" styleClass="btnLogin" >Anlegen</Button>

    </HBox>
 </GridPane>
--- a/client/app/src/main/resources/users/edit-user.fxml
+++ b/client/app/src/main/resources/users/edit-user.fxml
@ -1,13 +1,9 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<!-- Alex Rechtin-->
+<?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>
 <?import com.jfoenix.controls.JFXToggleButton?>
-<?import com.jfoenix.controls.JFXTextField?>
-<?import com.jfoenix.controls.JFXPasswordField?>
-<?import com.jfoenix.controls.JFXButton?>
-<?import javafx.scene.control.Label?>
 <GridPane xmlns="http://javafx.com/javafx"
          xmlns:fx="http://javafx.com/fxml"
          fx:controller="users.EditUserController">
@ -35,15 +31,15 @@
    <Label styleClass="inputLabel" GridPane.rowIndex="2" GridPane.columnIndex="1">Vorname:</Label>
    <Label styleClass="inputLabel" GridPane.rowIndex="3" GridPane.columnIndex="1">Nachname:</Label>
    <Label styleClass="inputLabel" GridPane.rowIndex="4" GridPane.columnIndex="1">Passwort:</Label>
-    <Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
+    <Label styleClass="inputLabel" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>

    <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>

-    <JFXTextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-    <JFXTextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-    <JFXTextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-    <JFXPasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <JFXPasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+    <TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
+    <TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
+    <TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
+    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />

    <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>

@ -53,8 +49,8 @@
        <HBox.margin>
            <Insets right="100" left="100"/>
        </HBox.margin>
-        <JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
-        <JFXButton onAction="#createUser" styleClass="btnLogin" >Bearbeiten</JFXButton>
+        <Button onAction="#abortBtnClick">Abbrechen</Button>
+        <Button onAction="#createUser" styleClass="btnLogin" >Bearbeiten</Button>

    </HBox>
 </GridPane>
--- a/client/app/src/main/resources/users/login.css
+++ b/client/app/src/main/resources/users/login.css
@ -6,7 +6,7 @@

      -fx-bright-border-color: #B0B0B0;

-      -fx-bright-text-color: #ff5555;
+      -fx-bright-text-color: ##ff5555;
      -fx-brighter-text-color: #ffffff;
 }

--- a/client/app/src/main/resources/users/login.fxml
+++ b/client/app/src/main/resources/users/login.fxml
@ -26,7 +26,7 @@
    <JFXTextField styleClass="userField" GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"/>
    <Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel"/>

-    <Label GridPane.rowIndex="2">Passwort</Label>
+    <Label GridPane.rowIndex="2">Paswort</Label>
    <JFXPasswordField styleClass="passField" GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"/>
    <Label styleClass="errorLbl" GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>

--- a/client/data/src/main/java/container/DataController.java
+++ b/client/data/src/main/java/container/DataController.java
@ -1,4 +1,3 @@
-//Marc Beyer//
 package container;

 import com.fasterxml.jackson.core.JsonProcessingException;
--- a/client/data/src/main/java/container/Event.java
+++ b/client/data/src/main/java/container/Event.java
@ -1,4 +1,3 @@
-//Marco Kühn//
 package container;

 import java.time.Duration;
--- a/client/data/src/main/java/container/HttpRequest.java
+++ b/client/data/src/main/java/container/HttpRequest.java
@ -1,4 +1,3 @@
-//Marc Beyer//
 package container;

 import helper.Tuple;
--- a/client/data/src/main/java/container/User.java
+++ b/client/data/src/main/java/container/User.java
@ -1,4 +1,3 @@
-//Marco Kühn//
 package container;

 public class User {