Commit the new Files

# Conflicts:
#	client/app/src/main/java/customUI/Button.java
#	client/app/src/main/java/customUI/Converter.java
#	client/app/src/main/java/customUI/Label.java
#	client/app/src/main/java/customUI/Tooltip.java
#	client/app/src/main/java/events/EditEventController.java
#	client/app/src/main/java/helper/SvgBtnCreator.java
#	client/app/src/main/java/main/MainController.java
#	client/data/src/main/java/container/Event.java
#	client/data/src/main/java/res/DataController.java
#	client/data/src/main/java/res/HttpRequest.java

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

@@ -20,28 +20,29 @@ import java.util.Locale;
 public class CreateEventController {
 
     @FXML
-    public GridPane mainGrid;
+    private GridPane mainGrid;
     @FXML
-    public JFXDatePicker datePickerDate;
+    protected JFXDatePicker datePickerDate;
     @FXML
-    public JFXTextField textName;
+    protected JFXTextField textName;
     @FXML
-    public JFXComboBox<String> ComboBoxPriotity;
+    protected JFXComboBox<String> comboBoxPriority;
     @FXML
-    public JFXToggleButton toggleBtnIsFullDay;
+    private JFXToggleButton toggleBtnIsFullDay;
     @FXML
-    public JFXToggleButton toggleBtnIsPrivate;
+    private JFXToggleButton toggleBtnIsPrivate;
     @FXML
-    public Label labelError;
+    private Label labelError;
     @FXML
-    public JFXTimePicker timeStart;
+    private JFXTimePicker timeStart;
     @FXML
-    public JFXTimePicker timeEnd;
+    private JFXTimePicker timeEnd;
 
 
     public CreateEventController() {
     }
 
+    //Marco Kühn//
     @FXML
     public void initialize() {
         StringConverter<LocalTime> defaultConverter = new LocalTimeStringConverter(FormatStyle.SHORT, Locale.GERMANY);
@@ -52,7 +53,7 @@ public class CreateEventController {
         timeEnd.setConverter(defaultConverter);
     }
 
-
+    //Marc Beyer//
     @FXML
     protected void createBtnClick(ActionEvent actionEvent) {
         try {
@@ -64,7 +65,7 @@ public class CreateEventController {
 
             Event event = new Event(
                     textName.getText(),
-                    ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
+                    comboBoxPriority.getSelectionModel().getSelectedIndex(),
                     toggleBtnIsFullDay.isSelected(),
                     toggleBtnIsPrivate.isSelected(),
                     timeStart.getValue(),
@@ -84,11 +85,13 @@ public class CreateEventController {
         }
     }
 
+    //Marc Beyer//
     protected void sendHttpRequest(Event event) throws HttpRequestException {
         DataController dataController = new DataController();
         dataController.createEvent(event);
     }
 
+    //Marc Beyer//
     @FXML
     protected void abortBtnClick(ActionEvent event) {
         Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

client/app/src/main/java/events/EditEventController.java

@@ -17,7 +17,7 @@ public class EditEventController extends CreateEventController{
 
         textName.setText(currentEvent.getName());
         datePickerDate.setValue(currentEvent.getDate().toLocalDate());
-        ComboBoxPriotity.getSelectionModel().select(currentEvent.getPriority());
+        comboBoxPriority.getSelectionModel().select(currentEvent.getPriority());
 
         //timeEnd.setValue(currentEvent.getEnd());
     }

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

@@ -1,22 +1,21 @@
+//Marc Beyer//
 package main;
 
 import config.Config;
 import config.ConfigLoader;
-import helper.Tuple;
+import container.DataController;
+import container.HttpRequest;
 import javafx.application.Application;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
 import javafx.scene.Scene;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
-import container.DataController;
-import container.HttpRequest;
 
 import java.io.IOException;
 import java.util.Objects;
 import java.util.function.Consumer;
 
+
 public class MainApplication extends Application {
     @Override
     public void start(Stage stage) throws IOException {
@@ -25,6 +24,8 @@ public class MainApplication extends Application {
             config = new Config(false, -1, "");
         }
 
+        DataController.SERVER_URL = config.toServerUrl();
+
         System.out.println("Ignore 'Illegal reflective access operation'-Warning. See https://github.com/sshahine/JFoenix/issues/1170");
 
         if(
@@ -41,6 +42,7 @@ public class MainApplication extends Application {
                 config.setToken(HttpRequest.TOKEN);
                 ConfigLoader.save(config);
             }
+
             // Load main-scene
             loadMainScene(stage);
 
@@ -60,22 +62,30 @@ public class MainApplication extends Application {
         stage.show();
     }
 
-    private void loadLoginScene() throws IOException {
+    private void loadLoginScene() {
-        FXMLLoader fxmlLoaderLogin = new FXMLLoader(MainApplication.class.getResource("../users/login.fxml"));
+        loadScene(
-        Scene sceneLogin = new Scene(fxmlLoaderLogin.load(), 650, 500);
+                "Anmelden",
-        sceneLogin.getStylesheets().add(Objects.requireNonNull(
+                "../users/login.fxml",
-                MainApplication.class.getResource("../users/login.css")).toExternalForm()
+                "../users/login.css",
+                650,
+                500
         );
-        Stage stageLogin = new Stage();
-        stageLogin.setTitle("Anmelden");
-        stageLogin.setScene(sceneLogin);
-        stageLogin.showAndWait();
     }
 
     public static void main(String[] args) {
         launch();
     }
 
+    public static void loadScene(
+            String title,
+            String fxml,
+            String css,
+            int width,
+            int height
+    ) {
+        loadScene(title, fxml, css, width, height, null);
+    }
+
     public static void loadScene(
             String title,
             String fxml,

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

@@ -1,47 +1,42 @@
+/* Marco Kühn, Marc Beyer */
 package main;
 
 import config.Config;
 import config.ConfigLoader;
+import container.DataController;
+import container.Event;
+import container.HttpRequest;
 import events.EditEventController;
-import ui.DayPane;
-import ui.EventPane;
-import ui.SvgBtnCreator;
 import helper.HttpRequestException;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Group;
 import javafx.scene.Node;
-import javafx.scene.Scene;
+import javafx.scene.control.Alert;
-import javafx.scene.control.*;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-import javafx.stage.Modality;
 import javafx.stage.Stage;
-import container.DataController;
+import ui.DayPane;
-import container.Event;
+import ui.EventPane;
+import ui.SvgBtnCreator;
 
-import javafx.event.ActionEvent;
-import container.HttpRequest;
-
-import java.io.IOException;
 import java.time.Duration;
 import java.time.LocalDateTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
-import java.util.Objects;
 
 public class MainController {
 
     @FXML
-    public VBox leftNav;
+    private VBox leftNav;
     @FXML
-    public GridPane mainGridPane;
+    private GridPane mainGridPane;
     @FXML
-    public HBox buttonBox;
+    private HBox buttonBox;
     @FXML
     private GridPane calendarGrid;
-
     @FXML
     private javafx.scene.control.Label LabelMonth;
 
@@ -106,22 +101,13 @@ public class MainController {
 
     @FXML
     protected void onAddBtnClick() {
-        try {
+        MainApplication.loadScene(
-            FXMLLoader fxmlLoader = new FXMLLoader(
+                "Termin erstellen",
-                    MainApplication.class.getResource("create-event.fxml"));
+                "create-event.fxml",
-            Scene scene = new Scene(fxmlLoader.load(), 650, 650);
+                "create-event.css",
-            scene.getStylesheets().add(Objects.requireNonNull(
+                650,
-                    MainApplication.class.getResource("create-event.css")).toExternalForm());
+                650
-            Stage stage = new Stage();
+        );
-            stage.setTitle("Termin erstellen");
-            stage.setScene(scene);
-            stage.initModality(Modality.APPLICATION_MODAL);
-            stage.setResizable(false);
-            //stage.initStyle(StageStyle.UNDECORATED);
-            stage.showAndWait();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
         updateEvents();
     }
 
@@ -131,8 +117,7 @@ public class MainController {
                 "option-view.fxml",
                 "option-view.css",
                 650,
-                600,
+                600
-                null
                 );
     }
 
@@ -146,27 +131,30 @@ public class MainController {
 
     private void createWeek() {
         for (int i = 0; i < 7; i++) {
-            DayPane dayPane = new DayPane(dayNames[i]);
+            DayPane dayPane = new DayPane();
             this.dayLabel[i] = dayPane.getDayLabel();
             calendarGrid.add(dayPane.getDayLabel(), i, 0);
             dayVBoxes[i] = dayPane.getDayVBox();
-            calendarGrid.add(dayPane.getScrollPane(), i, 1);
+            calendarGrid.add(dayPane, i, 1);
         }
     }
 
     private void addEvent(Event event) {
         EventPane eventPane = new EventPane(event);
-        eventPane.getEditBtn().setOnAction(event1 -> MainApplication.loadScene(
+        eventPane.getEditBtn().setOnAction(event1 -> {
-                "edit-event.fxml",
+            MainApplication.loadScene(
-                "create-event.css",
+                    "Termin bearbeiten",
-                "Termin bearbeiten",
+                    "edit-event.fxml",
-                600,
+                    "create-event.css",
-                600,
+                    650,
-                fxmlLoader -> {
+                    650,
-                    EditEventController editEventController = fxmlLoader.getController();
+                    fxmlLoader -> {
-                    editEventController.setCurrentEvent(event);
+                        EditEventController editEventController = fxmlLoader.getController();
-                }
+                        editEventController.setCurrentEvent(event);
-        ));
+                    }
+            );
+            updateEvents();
+        });
 
         eventPane.getDeleteBtn().setOnAction(e -> {
             DataController dataController = new DataController();
@@ -206,64 +194,34 @@ public class MainController {
     }
 
     private void createBtns(){
-        Group svgAdd = new Group(
+        Button addBtn = SvgBtnCreator.createAddBtn();
-                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                SvgBtnCreator.createPath("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z",
-                        "white", "gray")
-        );
-        Button addBtn = SvgBtnCreator.createBtn(svgAdd, 40, "main-btn", "Erstellt einen neuen Termin");
         addBtn.setOnAction(e -> onAddBtnClick());
         addBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(addBtn);
 
-        Group svgSettings = new Group(
+        Button settingsBtn = SvgBtnCreator.createSettingBtn();
-                SvgBtnCreator.createPath("M0 0h24v24H0V0z", "transparent", "transparent"),
-                SvgBtnCreator.createPath("M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z",
-                        "white", "gray")
-        );
-        Button settingsBtn = SvgBtnCreator.createBtn(svgSettings, 40, "main-btn", "Öffnet die Einstellungen");
         settingsBtn.setOnAction(e -> onSettingBtnClick());
         settingsBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(settingsBtn);
 
-        Group svgLogout = new Group(
+        Button logoutBtn = SvgBtnCreator.createLogoutBtn();
-                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                SvgBtnCreator.createPath("M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z",
-                        "white", "gray")
-        );
-        Button logoutBtn = SvgBtnCreator.createBtn(svgLogout, 40, "main-btn", "Abmelden");
         logoutBtn.setOnAction(this::onLogoutBtnClick);
         logoutBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(logoutBtn);
 
-        Group svgBack = new Group(
+        Button backBtn = SvgBtnCreator.createBackBtn();
-                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                SvgBtnCreator.createPath("M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z",
-                        "white", "lightgray")
-        );
-        Button backBtn = SvgBtnCreator.createBtn(svgBack, 40, "navBtn", "Zeigt die vorherige Woche");
         backBtn.setOnAction(e -> onBackClick());
         backBtn.getStyleClass().add("navBtn");
         GridPane.setColumnIndex(backBtn, 1);
         buttonBox.getChildren().add(backBtn);
 
-        Group svgToday = new Group(
+        Button todayBtn = SvgBtnCreator.createTodayBtn();
-                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                SvgBtnCreator.createPath("M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V8h16v13z",
-                        "white", "lightgray")
-        );
-        Button todayBtn = SvgBtnCreator.createBtn(svgToday, 40, "navBtn", "Zeigt die aktuelle Woche");
         todayBtn.setOnAction(e -> onTodayClick());
         todayBtn.getStyleClass().add("navBtn");
         GridPane.setColumnIndex(todayBtn, 2);
         buttonBox.getChildren().add(todayBtn);
 
-        Group svgNext = new Group(
+        Button nextBtn = SvgBtnCreator.createNextBtn();
-                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                SvgBtnCreator.createPath("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z",
-                        "white", "lightgray")
-        );
-        Button nextBtn = SvgBtnCreator.createBtn(svgNext, 40, "navBtn", "Zeigt die nächste Woche");
         nextBtn.setOnAction(e -> onNextClick());
         nextBtn.getStyleClass().add("navBtn");
         GridPane.setColumnIndex(nextBtn, 3);

client/app/src/main/java/main/OptionController.java

@@ -1,3 +1,4 @@
+/* Marco Kühn */
 package main;
 
 import com.jfoenix.controls.*;
@@ -27,17 +28,17 @@ import java.util.Optional;
 public class OptionController {
 
     @FXML
-    public JFXButton updateUserBtn;
+    private JFXButton updateUserBtn;
     @FXML
-    public JFXButton deleteUserBtn;
+    private JFXButton deleteUserBtn;
     @FXML
-    public JFXButton createUserBtn;
+    private JFXButton createUserBtn;
     @FXML
-    public JFXToggleButton saveLoginTBtn;
+    private JFXToggleButton saveLoginTBtn;
     @FXML
-    public Label labelError;
+    private Label labelError;
     @FXML
-    public GridPane mainGrid;
+    private GridPane mainGrid;
 
     private JFXComboBox<String> comboBox;
     private DataController dataController;
@@ -79,8 +80,7 @@ public class OptionController {
                 "../users/create-user.fxml",
                 "../users/create-user.css",
                 800,
-                650,
+                650
-                null
         );
     }
 

client/app/src/main/java/ui/DayPane.java

@@ -4,30 +4,28 @@ import javafx.scene.control.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.VBox;
 
-public class DayPane {
+public class DayPane extends ScrollPane {
 
-    private Label dayLabel;
+    private final Label dayLabel;
-    private VBox dayVBox;
+    private final VBox dayVBox;
-    private ScrollPane scrollPane;
 
-    public DayPane(String name) {
+    public DayPane() {
         dayLabel = new Label();
-        dayLabel.setText(name);
         dayLabel.setMaxHeight(Double.MAX_VALUE);
         dayLabel.setMaxWidth(Double.MAX_VALUE);
         dayLabel.getStyleClass().add("labelDays");
 
-        scrollPane = new ScrollPane();
-
         dayVBox = new VBox();
+
         dayVBox.getStyleClass().add("vBoxDays");
         dayVBox.setSpacing(10);
-        scrollPane.setContent(dayVBox);
 
-        scrollPane.setFitToWidth(true);
+        setContent(dayVBox);
-        scrollPane.setFitToHeight(true);
+        setFitToWidth(true);
-        scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        setFitToHeight(true);
-        scrollPane.getStyleClass().add("scrollDays");
+        setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        getStyleClass().add("scrollDays");
+        getStyleClass().add("scrollDays");
     }
 
     public Label getDayLabel() {
@@ -37,8 +35,4 @@ public class DayPane {
     public VBox getDayVBox() {
         return dayVBox;
     }
-
-    public ScrollPane getScrollPane() {
-        return scrollPane;
-    }
 }

client/app/src/main/java/ui/EventPane.java

@@ -1,26 +1,12 @@
 package ui;
 
-import container.DataController;
 import container.Event;
-import events.EditEventController;
-import helper.HttpRequestException;
-import javafx.fxml.FXMLLoader;
 import javafx.geometry.Pos;
 import javafx.scene.Group;
-import javafx.scene.Scene;
-import javafx.scene.control.Alert;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import javafx.scene.layout.VBox;
-import javafx.stage.Modality;
-import javafx.stage.Stage;
-import main.MainApplication;
-
-import java.io.IOException;
-import java.time.Duration;
-import java.time.LocalDateTime;
-import java.util.Objects;
 
 public class EventPane extends VBox {
 

client/app/src/main/java/ui/SvgBtnCreator.java

@@ -7,35 +7,6 @@ import javafx.scene.shape.SVGPath;
 
 public class SvgBtnCreator {
 
-    public static Button createBtn(Group group, int svgSize) {
-        Button btn = new Button();
-
-        Bounds boundsDel = group.getBoundsInParent();
-        double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
-        group.setScaleX(scaleDel);
-        group.setScaleY(scaleDel);
-        btn.setGraphic(group);
-        btn.setMaxSize(svgSize, svgSize);
-        btn.setMinSize(svgSize, svgSize);
-        btn.setContentDisplay(ContentDisplay.GRAPHIC_ONLY);
-
-        return btn;
-    }
-
-    public static Button createBtn(Group group, int svgSize, String styleClass) {
-        Button btn = new Button();
-
-        Bounds boundsDel = group.getBoundsInParent();
-        double scaleDel = Math.min(svgSize / boundsDel.getWidth(), svgSize / boundsDel.getHeight());
-        group.setScaleX(scaleDel);
-        group.setScaleY(scaleDel);
-        btn.setGraphic(group);
-        btn.setMaxSize(svgSize, svgSize);
-        btn.setMinSize(svgSize, svgSize);
-        btn.getStyleClass().add(styleClass);
-
-        return btn;
-    }
 
     public static Button createBtn(Group group, int svgSize, String styleClass, String toolTip) {
         Button btn = new Button();
@@ -63,4 +34,58 @@ public class SvgBtnCreator {
         return path;
     }
 
+    public static Button createAddBtn(){
+        Group svgAdd = new Group(
+                createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                createPath("M19 13h-6v6h-2v-6H5v-2h6V5h2v6h6v2z",
+                        "white", "gray")
+        );
+        return createBtn(svgAdd, 40, "main-btn", "Erstellt einen neuen Termin");
+    }
+
+    public static Button createSettingBtn(){
+        Group svgSettings = new Group(
+                createPath("M0 0h24v24H0V0z", "transparent", "transparent"),
+                createPath("M19.14,12.94c0.04-0.3,0.06-0.61,0.06-0.94c0-0.32-0.02-0.64-0.07-0.94l2.03-1.58c0.18-0.14,0.23-0.41,0.12-0.61 l-1.92-3.32c-0.12-0.22-0.37-0.29-0.59-0.22l-2.39,0.96c-0.5-0.38-1.03-0.7-1.62-0.94L14.4,2.81c-0.04-0.24-0.24-0.41-0.48-0.41 h-3.84c-0.24,0-0.43,0.17-0.47,0.41L9.25,5.35C8.66,5.59,8.12,5.92,7.63,6.29L5.24,5.33c-0.22-0.08-0.47,0-0.59,0.22L2.74,8.87 C2.62,9.08,2.66,9.34,2.86,9.48l2.03,1.58C4.84,11.36,4.8,11.69,4.8,12s0.02,0.64,0.07,0.94l-2.03,1.58 c-0.18,0.14-0.23,0.41-0.12,0.61l1.92,3.32c0.12,0.22,0.37,0.29,0.59,0.22l2.39-0.96c0.5,0.38,1.03,0.7,1.62,0.94l0.36,2.54 c0.05,0.24,0.24,0.41,0.48,0.41h3.84c0.24,0,0.44-0.17,0.47-0.41l0.36-2.54c0.59-0.24,1.13-0.56,1.62-0.94l2.39,0.96 c0.22,0.08,0.47,0,0.59-0.22l1.92-3.32c0.12-0.22,0.07-0.47-0.12-0.61L19.14,12.94z M12,15.6c-1.98,0-3.6-1.62-3.6-3.6 s1.62-3.6,3.6-3.6s3.6,1.62,3.6,3.6S13.98,15.6,12,15.6z",
+                        "white", "gray")
+        );
+        return createBtn(svgSettings, 40, "main-btn", "Öffnet die Einstellungen");
+    }
+
+    public static Button createLogoutBtn(){
+        Group svgLogout = new Group(
+                createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                createPath("M17 7l-1.41 1.41L18.17 11H8v2h10.17l-2.58 2.58L17 17l5-5zM4 5h8V3H4c-1.1 0-2 .9-2 2v14c0 1.1.9 2 2 2h8v-2H4V5z",
+                        "white", "gray")
+        );
+        return createBtn(svgLogout, 40, "main-btn", "Abmelden");
+    }
+
+    public static Button createBackBtn(){
+        Group svgBack = new Group(
+                createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                createPath("M20 11H7.83l5.59-5.59L12 4l-8 8 8 8 1.41-1.41L7.83 13H20v-2z",
+                        "white", "lightgray")
+        );
+        return createBtn(svgBack, 40, "navBtn", "Zeigt die vorherige Woche");
+    }
+
+    public static Button createTodayBtn(){
+        Group svgToday = new Group(
+                createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                createPath("M20 3h-1V1h-2v2H7V1H5v2H4c-1.1 0-2 .9-2 2v16c0 1.1.9 2 2 2h16c1.1 0 2-.9 2-2V5c0-1.1-.9-2-2-2zm0 18H4V8h16v13z",
+                        "white", "lightgray")
+        );
+        return createBtn(svgToday, 40, "navBtn", "Zeigt die aktuelle Woche");
+    }
+
+    public static Button createNextBtn(){
+        Group svgNext = new Group(
+                createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                createPath("M12 4l-1.41 1.41L16.17 11H4v2h12.17l-5.58 5.59L12 20l8-8z",
+                        "white", "lightgray")
+        );
+        return createBtn(svgNext, 40, "navBtn", "Zeigt die nächste Woche");
+    }
+
 }

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

@@ -1,3 +1,4 @@
+//Alex Rechtin//
 package users;
 
 import helper.HttpRequestException;
@@ -16,40 +17,24 @@ import java.util.Objects;
 
 public class CreateUserController {
 
-    public TextField textName;
+    @FXML
-    public PasswordField textPassword;
+    protected TextField textName;
-    public PasswordField textPasswordSecond;
+    @FXML
-    public ToggleButton checkButtonIsAdmin;
+    protected PasswordField textPassword;
-    public TextField textLogin;
+    @FXML
-    public TextField textForename;
+    protected PasswordField textPasswordSecond;
-    public Label labelError;
+    @FXML
+    protected ToggleButton checkButtonIsAdmin;
+    @FXML
+    protected TextField textLogin;
+    @FXML
+    protected TextField textForename;
+    @FXML
+    protected Label labelError;
 
     @FXML
     protected void createUser(ActionEvent event) {
-        if (textLogin.getText().trim().isEmpty()){
+        if (validateNameAndLogin() || validatePassword()) return;
-            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 (textPassword.getText().trim().length() < 8) {
-            labelError.setText("Das Passwort muss mindestens 8 Zeichen lang sein!");
-            return;
-        }
-        if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
-            labelError.setText("Passwörter stimmen nicht überein!");
-            return;
-        }
 
         User user = new User();
         user.setLogin(textLogin.getText().trim());
@@ -69,6 +54,38 @@ public class CreateUserController {
         stage.close();
     }
 
+    protected boolean validatePassword() {
+        if (textPassword.getText().trim().isEmpty()) {
+            labelError.setText("Bitte Passwort eingeben!");
+            return true;
+        }
+        if (textPassword.getText().trim().length() < 8) {
+            labelError.setText("Das Passwort muss mindestens 8 Zeichen lang sein!");
+            return true;
+        }
+        if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
+            labelError.setText("Passwörter stimmen nicht überein!");
+            return true;
+        }
+        return false;
+    }
+
+    protected boolean validateNameAndLogin() {
+        if (textLogin.getText().trim().isEmpty()){
+            labelError.setText("Bitte Login Namen angeben");
+            return true;
+        }
+        if (textForename.getText().trim().isEmpty()) {
+            labelError.setText("Bitte Vornamen eingeben!");
+            return true;
+        }
+        if (textName.getText().trim().isEmpty()) {
+            labelError.setText("Bitte Nachnamen eingeben!");
+            return true;
+        }
+        return false;
+    }
+
     protected void sendHttpRequest(User user) throws HttpRequestException {
         DataController dataController = new DataController();
         dataController.createUser(user);

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

@@ -1,3 +1,4 @@
+/* Marc Beyer */
 package users;
 
 import container.DataController;
@@ -8,8 +9,6 @@ import javafx.scene.Node;
 import javafx.scene.control.Alert;
 import javafx.stage.Stage;
 
-import java.util.Objects;
-
 public class EditUserController extends CreateUserController{
     private User currentUser;
 
@@ -28,34 +27,12 @@ public class EditUserController extends CreateUserController{
 
     @Override
     protected void createUser(ActionEvent event){
-        if (textLogin.getText().trim().isEmpty()){
+        if (validateNameAndLogin()) return;
-            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;
-        }
 
         User user = new User();
 
         if(!textPassword.getText().trim().isEmpty() || !textPasswordSecond.getText().trim().isEmpty()){
-            if (textPassword.getText().trim().isEmpty()) {
+            if (validatePassword()) return;
-                labelError.setText("Bitte Passwort eingeben!");
-                return;
-            }
-            if (textPassword.getText().trim().length() < 8) {
-                labelError.setText("Das Passwort muss mindestens 8 Zeichen lang sein!");
-                return;
-            }
-            if (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
-                labelError.setText("Passwörter stimmen nicht überein!");
-                return;
-            }
             user.setPassword(textPassword.getText().trim());
         }
 

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

@@ -1,3 +1,4 @@
+//Alex Rechtin//
 package users;
 
 import com.jfoenix.controls.*;
@@ -10,13 +11,13 @@ import container.DataController;
 
 public class LoginController {
     @FXML
-    public JFXTextField userField;
+    private JFXTextField userField;
     @FXML
-    public JFXPasswordField passField;
+    private JFXPasswordField passField;
     @FXML
-    public Label userErrLabel;
+    private Label userErrLabel;
     @FXML
-    public Label passErrLabel;
+    private Label passErrLabel;
 
     @FXML
     protected void login(ActionEvent event) {

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

@@ -1,3 +1,4 @@
+/*Marco Kühn*/
 GridPane{
     -fx-background-color: #3E415F;
     -fx-padding: 20px;
@@ -61,4 +62,19 @@ JFXButton{
 
 .timePicker{
     -fx-background-color: white;
-}
+}
+
+.jfx-time-picker .date-picker-popup{
+    -fx-max-width: 230px;
+    -fx-min-width: 230px;
+}
+
+.jfx-time-picker .date-picker-popup > * > .spinner > .label {
+    -fx-max-width: 55px;
+    -fx-min-width: 55px;
+}
+
+.jfx-date-picker .date-picker-popup > * > .spinner > .label {
+     -fx-max-width: 300px;
+     -fx-min-width: 300px;
+ }

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
@@ -43,7 +45,7 @@
     <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">
+    <JFXComboBox fx:id="comboBoxPriority" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
             <FXCollections fx:factory="observableArrayList">
                 <String fx:value="gering"/>

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 
@@ -43,7 +45,7 @@
     <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">
+    <JFXComboBox fx:id="comboBoxPriority" styleClass="comboBox" GridPane.columnIndex="1" GridPane.rowIndex="5" maxWidth="200" minWidth="200">
         <items>
             <FXCollections fx:factory="observableArrayList">
                 <String fx:value="gering"/>

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

@@ -1,3 +1,4 @@
+/*Alex Rechtin, Marco Kühn*/
 * {
    -fx-base-background-color: #2B2D42;
    -fx-base1-background-color: #525E74;

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Alex Rechtin, Marco Kühn -->
+
 <?import javafx.geometry.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>

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

@@ -1,3 +1,4 @@
+/* Marco Kühn */
 GridPane{
     -fx-background-color: #3E415F;
     -fx-padding: 20px;

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

@@ -1,4 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
+<!-- Marco Kühn -->
 
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>

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

@@ -1,3 +1,4 @@
+/*Alex Rechtin*/
 * {
    -fx-base-background-color: #2B2D42;
    -fx-base1-background-color: #525E74;

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Alex Rechtin -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import javafx.geometry.Insets?>

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

@@ -1,3 +1,4 @@
+/* Marco Kühn*/
 * {
    -fx-base-background-color: #2B2D42;
    -fx-base1-background-color: #525E74;

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

@@ -1,5 +1,7 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<!-- Marco Kühn -->
+
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
 <?import com.jfoenix.controls.*?>

client/data/src/main/java/config/Config.java

@@ -1,18 +1,30 @@
+//Marc Beyer//
 package config;
 
 public class Config {
     private boolean saveLogin;
     private long id;
     private String token;
+    private String connectionMethod;
+    private String hostAddress;
+    private int port;
 
     public Config(){
-
+        saveLogin = false;
+        id = -1;
+        token = "";
+        connectionMethod = "http";
+        hostAddress = "localhost";
+        port = 8080;
     }
 
     public Config(boolean saveLogin, long id, String token) {
         this.saveLogin = saveLogin;
         this.id = id;
         this.token = token;
+        connectionMethod = "http";
+        hostAddress = "localhost";
+        port = 8080;
     }
 
     public boolean isSaveLogin() {
@@ -38,4 +50,32 @@ public class Config {
     public void setToken(String token) {
         this.token = token;
     }
+
+    public String getConnectionMethod() {
+        return connectionMethod;
+    }
+
+    public void setConnectionMethod(String connectionMethod) {
+        this.connectionMethod = connectionMethod;
+    }
+
+    public String getHostAddress() {
+        return hostAddress;
+    }
+
+    public void setHostAddress(String hostAddress) {
+        this.hostAddress = hostAddress;
+    }
+
+    public int getPort() {
+        return port;
+    }
+
+    public void setPort(int port) {
+        this.port = port;
+    }
+
+    public String toServerUrl(){
+        return getConnectionMethod() + "://" + getHostAddress() + ":" + getPort();
+    }
 }

client/data/src/main/java/config/ConfigLoader.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package config;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
@@ -28,9 +29,12 @@ public class ConfigLoader {
         objectMapper.findAndRegisterModules();
 
         try {
-            Files.writeString(Paths.get(
+            Files.writeString(
-                    "config.json"),
+                    Paths.get("config.json"),
                     objectMapper.writeValueAsString(config)
+                            .replace(",", ",\n\t")
+                            .replace("{", "{\n\t")
+                            .replace("}", "\n}")
             );
         } catch (IOException e) {
             e.printStackTrace();

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

@@ -12,20 +12,21 @@ import java.util.*;
 public class DataController {
 
     public static long USER_ID = -1;
+    public static String SERVER_URL = "http://localhost:8080";
 
-    private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/event/all";
+    private static final String ALL_EVENTS_ENDPOINT =           "/event/all";
-    private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/event/add";
+    private static final String ADD_EVENT_ENDPOINT =            "/event/add";
-    private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del";
+    private static final String DELETE_EVENT_ENDPOINT =         "/event/del";
-    private static final String EDIT_EVENT_ENDPOINT = "http://localhost:8080/event/edit";
+    private static final String EDIT_EVENT_ENDPOINT =           "/event/edit";
 
-    private static final String ALL_USER_ENDPOINT = "http://localhost:8080/user/all";
+    private static final String ALL_USER_ENDPOINT =             "/user/all";
-    private static final String ADD_USER_ENDPOINT = "http://localhost:8080/user/add";
+    private static final String ADD_USER_ENDPOINT =             "/user/add";
-    private static final String DELETE_USER_ENDPOINT = "http://localhost:8080/user/del";
+    private static final String DELETE_USER_ENDPOINT =          "/user/del";
-    private static final String EDIT_USER_ENDPOINT = "http://localhost:8080/user/edit";
+    private static final String EDIT_USER_ENDPOINT =            "/user/edit";
 
-    private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login";
+    private static final String LOGIN_ENDPOINT =                "/user/login";
-    private static final String LOGIN_WITH_TOKEN_ENDPOINT = "http://localhost:8080/user/login-with-token";
+    private static final String LOGIN_WITH_TOKEN_ENDPOINT =     "/user/login-with-token";
-    private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";
+    private static final String HEADER_TEST_ENDPOINT =          "/vpr/header-test";
 
     private final HttpRequest httpRequest;
 
@@ -36,7 +37,7 @@ public class DataController {
     public boolean login(String username, String password) {
         try {
             Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    LOGIN_ENDPOINT,
+                    SERVER_URL + LOGIN_ENDPOINT,
                     "login=" + username
                             + "&password=" + password,
                     false
@@ -57,7 +58,7 @@ public class DataController {
         try {
             HttpRequest.TOKEN = token;
             Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    LOGIN_WITH_TOKEN_ENDPOINT,
+                    SERVER_URL + LOGIN_WITH_TOKEN_ENDPOINT,
                     "userId=" + userId,
                     true
             );
@@ -79,7 +80,7 @@ public class DataController {
      *********/
     public void createEvent(Event event) throws HttpRequestException {
         sendBasicHttpRequest(
-                ADD_EVENT_ENDPOINT,
+                SERVER_URL + ADD_EVENT_ENDPOINT,
                 event.getAsUrlParam(),
                 true
         );
@@ -87,7 +88,7 @@ public class DataController {
 
     public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
         sendBasicHttpRequest(
-                DELETE_EVENT_ENDPOINT,
+                SERVER_URL + DELETE_EVENT_ENDPOINT,
                 "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
                 true
         );
@@ -95,7 +96,7 @@ public class DataController {
 
     public void editEvent(Event oldEvent, Event event) throws HttpRequestException {
         sendBasicHttpRequest(
-                EDIT_EVENT_ENDPOINT,
+                SERVER_URL + EDIT_EVENT_ENDPOINT,
                 "eventId=" + oldEvent.getId() +
                         "&userId=" + oldEvent.getOwnerId() +
                         "&date=" + oldEvent.getDate().toLocalDate() +
@@ -113,7 +114,7 @@ public class DataController {
     public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) throws HttpRequestException {
         try {
             Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    ALL_EVENTS_ENDPOINT,
+                    SERVER_URL + ALL_EVENTS_ENDPOINT,
                     "userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
                     true
             );
@@ -141,7 +142,7 @@ public class DataController {
 
     public List<User> getAllUser() throws HttpRequestException {
         String userJSON = sendBasicHttpRequest(
-                ALL_USER_ENDPOINT,
+                SERVER_URL + ALL_USER_ENDPOINT,
                 "",
                 true
         );
@@ -164,7 +165,7 @@ public class DataController {
 
     public void createUser(User user) throws HttpRequestException {
         sendBasicHttpRequest(
-                ADD_USER_ENDPOINT,
+                SERVER_URL + ADD_USER_ENDPOINT,
                 "name=" + user.getName() +
                         "&forename=" + user.getForename() +
                         "&login=" + user.getLogin() +
@@ -176,7 +177,7 @@ public class DataController {
 
     public void deleteUser(User user) throws HttpRequestException {
         sendBasicHttpRequest(
-                DELETE_USER_ENDPOINT,
+                SERVER_URL + DELETE_USER_ENDPOINT,
                 "userId=" + user.getUserId(),
                 true
         );
@@ -192,7 +193,7 @@ public class DataController {
 
         System.out.println(urlParam);
         sendBasicHttpRequest(
-                EDIT_USER_ENDPOINT,
+                SERVER_URL + EDIT_USER_ENDPOINT,
                 urlParam,
                 true
         );

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

@@ -56,7 +56,7 @@ public class Event {
         this.isFullDay = isFullDay;
         this.isPrivate = isPrivate;
         if (start != null) this.start = start.toString();
-        if (start != null) this.end = end.toString();
+        if (end != null) this.end = end.toString();
         this.date = date;
         this.ownerId = ownerId;
     }

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

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package helper;
 
 public class HttpRequestException extends Exception{

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

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package helper;
 
 public class Tuple<X, Y> {