Added missing comments

# Conflicts:
#	client/app/src/main/resources/main/main-view.css
#	client/app/src/main/resources/main/main-view.fxml

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

@@ -1,4 +1,4 @@
-package main;
+package events;
 
 import com.jfoenix.controls.*;
 import helper.HttpRequestException;
@@ -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;
+    protected JFXToggleButton toggleBtnIsFullDay;
     @FXML
-    public JFXToggleButton toggleBtnIsPrivate;
+    protected JFXToggleButton toggleBtnIsPrivate;
     @FXML
-    public Label labelError;
+    private Label labelError;
     @FXML
-    public JFXTimePicker timeStart;
+    protected JFXTimePicker timeStart;
     @FXML
-    public JFXTimePicker timeEnd;
+    protected 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);
     }
 
+    //Marco Kühn//
     @FXML
     protected void abortBtnClick(ActionEvent event) {
         Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();

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

@@ -1,9 +1,12 @@
-package main;
+//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;
@@ -17,9 +20,19 @@ 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());
+        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());
     }
 
     @Override

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

@@ -1,66 +0,0 @@
-package helper;
-
-import javafx.geometry.Bounds;
-import javafx.scene.Group;
-import javafx.scene.control.*;
-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();
-
-        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);
-        btn.getStyleClass().add(styleClass);
-        Tooltip tooltip = new Tooltip(toolTip);
-        btn.setTooltip(tooltip);
-
-        return btn;
-    }
-
-    public static SVGPath createPath(String d, String fill, String hoverFill) {
-        SVGPath path = new SVGPath();
-        path.getStyleClass().add("svg");
-        path.setContent(d);
-        path.setStyle("-fill:" + fill + ";-hover-fill:"+hoverFill+';');
-        return path;
-    }
-
-}

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

@@ -1,16 +1,20 @@
+//Marc Beyer//
 package main;
 
 import config.Config;
 import config.ConfigLoader;
+import container.DataController;
+import container.HttpRequest;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 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
@@ -20,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(
@@ -36,6 +42,7 @@ public class MainApplication extends Application {
                 config.setToken(HttpRequest.TOKEN);
                 ConfigLoader.save(config);
             }
+
             // Load main-scene
             loadMainScene(stage);
 
@@ -50,24 +57,60 @@ public class MainApplication extends Application {
         scene.getStylesheets().add(Objects.requireNonNull(
                 MainApplication.class.getResource("main-view.css")).toExternalForm()
         );
-        stage.setTitle("SharePlaner");
+        stage.setTitle("SharePlanner");
         stage.setScene(scene);
         stage.show();
     }
 
-    private void loadLoginScene() throws IOException {
-        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()
+    private void loadLoginScene() {
+        loadScene(
+                "Anmelden",
+                "../users/login.fxml",
+                "../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,
+            String css,
+            int width,
+            int height,
+            Consumer<FXMLLoader> method
+    ) {
+        FXMLLoader fxmlLoader = new FXMLLoader(
+                MainApplication.class.getResource(fxml));
+        try {
+            Scene scene = new Scene(fxmlLoader.load(), width, height);
+            scene.getStylesheets().add(Objects.requireNonNull(
+                    MainApplication.class.getResource(css)).toExternalForm());
+            Stage stage = new Stage();
+            stage.setTitle(title);
+            stage.setScene(scene);
+            stage.initModality(Modality.APPLICATION_MODAL);
+            stage.setResizable(false);
+
+            if(method != null)method.accept(fxmlLoader);
+
+            stage.showAndWait();
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
 }

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

@@ -1,45 +1,42 @@
+// Marco Kühn, Marc Beyer //
 package main;
 
 import config.Config;
 import config.ConfigLoader;
-import helper.SvgBtnCreator;
+import container.DataController;
+import container.Event;
+import container.HttpRequest;
+import events.EditEventController;
 import helper.HttpRequestException;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.geometry.Pos;
-import javafx.scene.Group;
 import javafx.scene.Node;
-import javafx.scene.Scene;
-import javafx.scene.control.*;
+import javafx.scene.control.Alert;
+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 container.Event;
+import ui.DayPane;
+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;
 
@@ -104,41 +101,24 @@ public class MainController {
 
     @FXML
     protected void onAddBtnClick() {
-        try {
-            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);
-            stage.initModality(Modality.APPLICATION_MODAL);
-            stage.setResizable(false);
-            //stage.initStyle(StageStyle.UNDECORATED);
-            stage.showAndWait();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        MainApplication.loadScene(
+                "Termin erstellen",
+                "create-event.fxml",
+                "create-event.css",
+                650,
+                650
+        );
         updateEvents();
     }
 
     protected void onSettingBtnClick(){
-        try{
-            FXMLLoader fxmlLoader = new FXMLLoader(
-                    MainApplication.class.getResource("option-view.fxml"));
-            Scene scene = new Scene(fxmlLoader.load(), 650, 650);
-            scene.getStylesheets().add(Objects.requireNonNull(
-                    MainApplication.class.getResource("option-view.css")).toExternalForm());
-            Stage stage = new Stage();
-            stage.setTitle("Einstellungen");
-            stage.setScene(scene);
-            stage.initModality(Modality.APPLICATION_MODAL);
-            stage.setResizable(false);
-            stage.showAndWait();
-        } catch (IOException e) {
-            e.printStackTrace();
-        }
+        MainApplication.loadScene(
+                "Einstellungen",
+                "option-view.fxml",
+                "option-view.css",
+                650,
+                600
+                );
     }
 
     protected void onLogoutBtnClick(ActionEvent event){
@@ -151,130 +131,50 @@ public class MainController {
 
     private void createWeek() {
         for (int i = 0; i < 7; i++) {
-            Label label = new Label();
-            label.setText(dayNames[i]);
-            label.setMaxHeight(Double.MAX_VALUE);
-            label.setMaxWidth(Double.MAX_VALUE);
-            label.getStyleClass().add("labelDays");
-            dayLabel[i] = label;
-            calendarGrid.add(label, i, 0);
-
-            ScrollPane scrollPane = new ScrollPane();
-
-            VBox vBox = new VBox();
-            vBox.getStyleClass().add("vBoxDays");
-            vBox.setSpacing(10);
-            dayVBoxes[i] = vBox;
-            scrollPane.setContent(vBox);
-
-            scrollPane.setFitToWidth(true);
-            scrollPane.setFitToHeight(true);
-            scrollPane.setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
-            scrollPane.getStyleClass().add("scrollDays");
-
-            calendarGrid.add(scrollPane, i, 1);
+            DayPane dayPane = new DayPane();
+            this.dayLabel[i] = dayPane.getDayLabel();
+            calendarGrid.add(dayPane.getDayLabel(), i, 0);
+            dayVBoxes[i] = dayPane.getDayVBox();
+            calendarGrid.add(dayPane, i, 1);
         }
     }
 
     private void addEvent(Event event) {
-        VBox vBox = new VBox();
-        vBox.getStyleClass().add("event");
-        vBox.setSpacing(5);
+        EventPane eventPane = new EventPane(event);
+        eventPane.getEditBtn().setOnAction(event1 -> {
+            MainApplication.loadScene(
+                    "Termin bearbeiten",
+                    "edit-event.fxml",
+                    "create-event.css",
+                    650,
+                    650,
+                    fxmlLoader -> {
+                        EditEventController editEventController = fxmlLoader.getController();
+                        editEventController.setCurrentEvent(event);
+                    }
+            );
+            updateEvents();
+        });
 
-        HBox btnHBox = new HBox();
-        btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
-
-        Group svgDel = new Group(
-                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                SvgBtnCreator.createPath("M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z",
-                        "white", "gray")
-        );
-        Button deleteBtn = SvgBtnCreator.createBtn(svgDel, 24, "", "Löschen des Termins");
-
-        deleteBtn.getStyleClass().add("deleteEventBtn");
-        deleteBtn.setOnAction(e -> {
+        eventPane.getDeleteBtn().setOnAction(e -> {
             DataController dataController = new DataController();
             try {
                 dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
             } catch (HttpRequestException ex) {
-                ex.printStackTrace();
+                new Alert(Alert.AlertType.ERROR, ex.getMessage()).showAndWait();
             }
             updateEvents();
         });
 
-        Group svgEdit = new Group(
-                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
-                SvgBtnCreator.createPath("M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z",
-                        "white", "gray")
-        );
-        Button editBtn = SvgBtnCreator.createBtn(svgEdit, 24, "", "Bearbeiten des Termins");
-        editBtn.getStyleClass().add("editEventBtn");
-        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);
-                EditEventController editEventController = fxmlLoader.getController();
-                editEventController.setCurrentEvent(event);
-                stage.showAndWait();
-                updateEvents();
-            } catch (IOException e) {
-                e.printStackTrace();
-            }
-        });
-        btnHBox.getChildren().add(editBtn);
-        btnHBox.getChildren().add(deleteBtn);
-        vBox.getChildren().add(btnHBox);
-
-        Label nameLabel = new Label(event.getName());
-        nameLabel.setWrapText(true);
-        vBox.getChildren().add(nameLabel);
-
-        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);
-
-        Label prioLabel = new Label("Priorität: " + event.getPriority());
-        vBox.getChildren().add(prioLabel);
-
-        if (event.isFullDay()) {
-            Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
-            fullDayLabel.setWrapText(true);
-            vBox.getChildren().add(fullDayLabel);
-        }
-
-
         LocalDateTime eventDate = event.getDate();
-
         int day = (int) Duration.between(
                 weekStartDateTime.toLocalDate().atStartOfDay(), eventDate.toLocalDate().atStartOfDay()).toDays();
 
         if (day >= 0 && day < 7) {
-            dayVBoxes[day].getChildren().add(vBox);
+            dayVBoxes[day].getChildren().add(eventPane);
         }
     }
 
-    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");
@@ -294,64 +194,34 @@ public class MainController {
     }
 
     private void createBtns(){
-        Group svgAdd = new Group(
-                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");
+        Button addBtn = SvgBtnCreator.createAddBtn();
         addBtn.setOnAction(e -> onAddBtnClick());
         addBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(addBtn);
 
-        Group svgSettings = new Group(
-                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");
+        Button settingsBtn = SvgBtnCreator.createSettingBtn();
         settingsBtn.setOnAction(e -> onSettingBtnClick());
         settingsBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(settingsBtn);
 
-        Group svgLogout = new Group(
-                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");
+        Button logoutBtn = SvgBtnCreator.createLogoutBtn();
         logoutBtn.setOnAction(this::onLogoutBtnClick);
         logoutBtn.getStyleClass().add("main-btn");
         leftNav.getChildren().add(logoutBtn);
 
-        Group svgBack = new Group(
-                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");
+        Button backBtn = SvgBtnCreator.createBackBtn();
         backBtn.setOnAction(e -> onBackClick());
         backBtn.getStyleClass().add("navBtn");
         GridPane.setColumnIndex(backBtn, 1);
         buttonBox.getChildren().add(backBtn);
 
-        Group svgToday = new Group(
-                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");
+        Button todayBtn = SvgBtnCreator.createTodayBtn();
         todayBtn.setOnAction(e -> onTodayClick());
         todayBtn.getStyleClass().add("navBtn");
         GridPane.setColumnIndex(todayBtn, 2);
         buttonBox.getChildren().add(todayBtn);
 
-        Group svgNext = new Group(
-                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");
+        Button nextBtn = SvgBtnCreator.createNextBtn();
         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.*;
@@ -11,39 +12,33 @@ import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Node;
-import javafx.scene.Scene;
 import javafx.scene.control.Alert;
 import javafx.scene.control.ButtonType;
 import javafx.scene.control.Label;
 import javafx.scene.layout.GridPane;
-import javafx.stage.Modality;
 import javafx.stage.Stage;
 import container.DataController;
 import container.User;
 import users.EditUserController;
 
-import java.awt.*;
-import java.io.IOException;
 import java.util.ArrayList;
 import java.util.List;
-import java.util.Objects;
 import java.util.Optional;
-import java.util.function.Consumer;
 
 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;
@@ -80,7 +75,13 @@ public class OptionController {
     }
 
     public void onCreateBtnClick(ActionEvent actionEvent) {
-        loadUserScene(actionEvent, "User erstellen", "../users/create-user.fxml", null);
+        MainApplication.loadScene(
+                "User erstellen",
+                "../users/create-user.fxml",
+                "../users/create-user.css",
+                800,
+                650
+        );
     }
 
     public void onUpdateBtnClick(ActionEvent actionEvent) {
@@ -88,11 +89,16 @@ public class OptionController {
 
         if(editIndex < 0 || editIndex >= users.size()) return;
 
-        FXMLLoader fxmlLoader = loadUserScene(
-                actionEvent,
+        MainApplication.loadScene(
                 "User bearbeiten",
                 "../users/edit-user.fxml",
-                this::setUserAtController
+                "../users/create-user.css",
+                800,
+                650,
+                fxmlLoader -> {
+                    EditUserController editUserController = fxmlLoader.getController();
+                    editUserController.setCurrentUser(users.get(editIndex));
+                }
         );
     }
 
@@ -113,31 +119,6 @@ public class OptionController {
         }
     }
 
-    private FXMLLoader loadUserScene(ActionEvent actionEvent, String title, String fxml, Consumer<FXMLLoader> method) {
-        FXMLLoader fxmlLoader = new FXMLLoader(
-                MainApplication.class.getResource(fxml));
-        try {
-            Scene scene = new Scene(fxmlLoader.load(), 800, 650);
-            scene.getStylesheets().add(Objects.requireNonNull(
-                    MainApplication.class.getResource("../users/create-user.css")).toExternalForm());
-            Stage stage = new Stage();
-            stage.setTitle(title);
-            stage.setScene(scene);
-            stage.initModality(Modality.APPLICATION_MODAL);
-            stage.setResizable(false);
-
-            if(method != null)method.accept(fxmlLoader);
-
-            stage.showAndWait();
-            Stage stageOld = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
-            stageOld.close();
-        } catch (IOException e) {
-            e.printStackTrace();
-            e.printStackTrace();
-        }
-        return fxmlLoader;
-    }
-
     private void setUserAtController(FXMLLoader fxmlLoader){
         int editIndex = comboBox.getSelectionModel().getSelectedIndex();
         EditUserController editUserController = fxmlLoader.getController();

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

@@ -0,0 +1,39 @@
+//Marc Beyer//
+package ui;
+
+import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.layout.VBox;
+
+public class DayPane extends ScrollPane {
+
+    private final Label dayLabel;
+    private final VBox dayVBox;
+
+    public DayPane() {
+        dayLabel = new Label();
+        dayLabel.setMaxHeight(Double.MAX_VALUE);
+        dayLabel.setMaxWidth(Double.MAX_VALUE);
+        dayLabel.getStyleClass().add("labelDays");
+
+        dayVBox = new VBox();
+
+        dayVBox.getStyleClass().add("vBoxDays");
+        dayVBox.setSpacing(10);
+
+        setContent(dayVBox);
+        setFitToWidth(true);
+        setFitToHeight(true);
+        setHbarPolicy(ScrollPane.ScrollBarPolicy.AS_NEEDED);
+        getStyleClass().add("scrollDays");
+        getStyleClass().add("scrollDays");
+    }
+
+    public Label getDayLabel() {
+        return dayLabel;
+    }
+
+    public VBox getDayVBox() {
+        return dayVBox;
+    }
+}

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

@@ -0,0 +1,84 @@
+//Marc Beyer, Marco Kühn//
+package ui;
+
+import container.Event;
+import javafx.geometry.Pos;
+import javafx.scene.Group;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.VBox;
+
+public class EventPane extends VBox {
+
+    private Button deleteBtn;
+    private Button editBtn;
+
+    public EventPane(Event event) {
+        this.getStyleClass().add("event");
+        this.setSpacing(5);
+
+        HBox btnHBox = new HBox();
+        btnHBox.setAlignment(Pos.BOTTOM_RIGHT);
+
+        Group svgDel = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M6 19c0 1.1.9 2 2 2h8c1.1 0 2-.9 2-2V7H6v12zM19 4h-3.5l-1-1h-5l-1 1H5v2h14V4z",
+                        "white", "gray")
+        );
+        deleteBtn = SvgBtnCreator.createBtn(svgDel, 24, "", "Löschen des Termins");
+        deleteBtn.getStyleClass().add("deleteEventBtn");
+
+        Group svgEdit = new Group(
+                SvgBtnCreator.createPath("M0 0h24v24H0z", "transparent", "transparent"),
+                SvgBtnCreator.createPath("M3 17.25V21h3.75L17.81 9.94l-3.75-3.75L3 17.25zM20.71 7.04c.39-.39.39-1.02 0-1.41l-2.34-2.34c-.39-.39-1.02-.39-1.41 0l-1.83 1.83 3.75 3.75 1.83-1.83z",
+                        "white", "gray")
+        );
+        editBtn = SvgBtnCreator.createBtn(svgEdit, 24, "", "Bearbeiten des Termins");
+        editBtn.getStyleClass().add("editEventBtn");
+
+        btnHBox.getChildren().add(editBtn);
+        btnHBox.getChildren().add(deleteBtn);
+        this.getChildren().add(btnHBox);
+
+        Label nameLabel = new Label(event.getName());
+        nameLabel.setWrapText(true);
+        this.getChildren().add(nameLabel);
+
+        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);
+            this.getChildren().add(timeLabel);
+        }
+
+        Label typeLabel = new Label("Wer: " + event.getOwnerName());
+        this.getChildren().add(typeLabel);
+
+        Label prioLabel = new Label("Priorität: " + event.getPriority());
+        this.getChildren().add(prioLabel);
+
+        if (event.isFullDay()) {
+            Label fullDayLabel = new Label("Dieser Termin bockiert den ganzen Tag!");
+            fullDayLabel.setWrapText(true);
+            this.getChildren().add(fullDayLabel);
+        }
+    }
+
+    public Button getDeleteBtn() {
+        return deleteBtn;
+    }
+
+    public Button getEditBtn() {
+        return editBtn;
+    }
+
+
+    private String formatTime(String time) {
+        String[] timeArr = time.split(":");
+        if (timeArr.length > 2) {
+            return timeArr[0] + ":" + timeArr[1];
+        }
+        return time;
+    }
+}

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

@@ -0,0 +1,92 @@
+//Marco Kühn//
+package ui;
+
+import javafx.geometry.Bounds;
+import javafx.scene.Group;
+import javafx.scene.control.*;
+import javafx.scene.shape.SVGPath;
+
+public class SvgBtnCreator {
+
+
+    public static Button createBtn(Group group, int svgSize, String styleClass, String toolTip) {
+        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);
+        btn.getStyleClass().add(styleClass);
+        Tooltip tooltip = new Tooltip(toolTip);
+        btn.setTooltip(tooltip);
+
+        return btn;
+    }
+
+    public static SVGPath createPath(String d, String fill, String hoverFill) {
+        SVGPath path = new SVGPath();
+        path.getStyleClass().add("svg");
+        path.setContent(d);
+        path.setStyle("-fill:" + fill + ";-hover-fill:"+hoverFill+';');
+        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,13 +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;
@@ -16,40 +17,24 @@ import java.util.Objects;
 
 public class CreateUserController {
 
-    public TextField textName;
-    public PasswordField textPassword;
-    public PasswordField textPasswordSecond;
-    public ToggleButton checkButtonIsAdmin;
-    public TextField textLogin;
-    public TextField textForename;
-    public Label labelError;
+    @FXML
+    protected JFXTextField textName;
+    @FXML
+    protected JFXPasswordField textPassword;
+    @FXML
+    protected JFXPasswordField textPasswordSecond;
+    @FXML
+    protected JFXToggleButton checkButtonIsAdmin;
+    @FXML
+    protected JFXTextField textLogin;
+    @FXML
+    protected JFXTextField textForename;
+    @FXML
+    protected Label labelError;
 
     @FXML
     protected void createUser(ActionEvent event) {
-        if (textLogin.getText().trim().isEmpty()){
-            labelError.setText("Bitte Login Namen angeben");
-            return;
-        }
-        if (textForename.getText().trim().isEmpty()) {
-            labelError.setText("Bitte Vornamen eingeben!");
-            return;
-        }
-        if (textName.getText().trim().isEmpty()) {
-            labelError.setText("Bitte Nachnamen eingeben!");
-            return;
-        }
-        if (textPassword.getText().trim().isEmpty()) {
-            labelError.setText("Bitte Passwort eingeben!");
-            return;
-        }
-        if (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;
-        }
+        if (validateNameAndLogin() || validatePassword()) 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()){
-            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 (validateNameAndLogin()) return;
 
         User user = new User();
 
         if(!textPassword.getText().trim().isEmpty() || !textPasswordSecond.getText().trim().isEmpty()){
-            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;
-            }
+            if (validatePassword()) 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,24 +1,38 @@
+/*Marco Kühn*/
+* {
+   -fx-dark-background-color: #3E415F;
+
+   -fx-darkest-background-color: #2B2D42;
+
+   -fx-bright-background-color: #8D99AE;
+   -fx-brighter-background-color: #ff5555;
+   -fx-brightest-background-color: #ffffff;
+
+   -fx-bright-border-color: #B0B0B0;
+   -fx-brighter-text-color: #ffffff;
+}
+
 GridPane{
-    -fx-background-color: #3E415F;
+    -fx-background-color: -fx-dark-background-color;
     -fx-padding: 20px;
     -fx-font-size: 20px;
     -fx-font-family: Segoe UI;
 
     -fx-border-insets: 1;
-    -fx-border-color: #B0B0B0;
+    -fx-border-color: -fx-bright-border-color;
     -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-text-fill: -fx-brighter-text-color;
     -fx-max-width: 150px;
     -fx-min-width: 150px;
 }
 
 .mainLabel{
-    -fx-background-color: #8D99AE;
+    -fx-background-color: -fx-bright-background-color;
     -fx-padding: 10px;
     -fx-max-width: 200px;
     -fx-min-width: 200px;
@@ -28,22 +42,22 @@ Label{
 
 .inputField{
     -fx-padding: 10px;
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .mainButton{
     -fx-font-weight: bold;
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 JFXButton{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 #labelError{
     -fx-font-weight: bold;
     -fx-max-width: 1000px;
-    -fx-text-fill: #ff5555;
+    -fx-text-fill: -fx-brighter-background-color;
     -fx-padding: 16px;
     -fx-min-height: 140px;
     -fx-max-height: 400px;
@@ -52,13 +66,28 @@ JFXButton{
 }
 
 .inputDate{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .comboBox{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .timePicker{
-    -fx-background-color: white;
-}
+    -fx-background-color: -fx-brightest-background-color;
+}
+
+.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.*?>
 
@@ -8,7 +10,7 @@
 <?import com.jfoenix.controls.*?>
 
 <GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
-          fx:controller="main.CreateEventController">
+          fx:controller="events.CreateEventController">
 
     <columnConstraints>
         <ColumnConstraints/>
@@ -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.*?>
 
@@ -8,7 +10,7 @@
 <?import com.jfoenix.controls.*?>
 
 <GridPane fx:id="mainGrid" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
-          fx:controller="main.EditEventController">
+          fx:controller="events.EditEventController">
 
     <columnConstraints>
         <ColumnConstraints/>
@@ -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,65 +1,70 @@
+/*Alex Rechtin, Marco Kühn*/
 * {
-   -fx-base-background-color: #2B2D42;
-   -fx-base1-background-color: #525E74;
+    -fx-dark-background-color: #525E74;
+    -fx-darkest-background-color: #2B2D42;
 
-   -fx-main-border-color: #B0B0B0;
-   -fx-main-text-color: #ffffff;
+    -fx-bright-background-color: #77859E;
+    -fx-brighter-background-color: #282C34 ;
+    -fx-brightest-background-color: #333333 ;
+
+    -fx-bright-border-color: #B0B0B0;
+    -fx-brighter-text-color: #ffffff;
 }
 
 
 GridPane{
-    -fx-background-color: -fx-base-background-color;
+    -fx-background-color: -fx-darkest-background-color;
 }
 
 .main-panel{
-    -fx-background-color: #282C34;
+    -fx-background-color: -fx-brighter-background-color;
 }
 
 .vbox-main{
-    -fx-background-color: #333333;
+    -fx-background-color: -fx-brightest-background-color;
     -fx-alignment: top-center;
 
 }
 
 .gridCalendar Line{
-    -fx-stroke: -fx-main-border-color;
+    -fx-stroke: -fx-bright-border-color;
 }
 
 .gridCalender{
-        -fx-background-color: -fx-base-background-color;
+        -fx-background-color: -fx-darkest-background-color;
         -fx-min-height: 80px;
         -fx-max-height: 80px;
 }
 
 .labelMonth{
     -fx-padding: 0 0 0 20;
-    -fx-background-color: #77859E;
+    -fx-background-color: -fx-bright-background-color;
     -fx-font-size: 35px;
     -fx-font-weight: bold;
 }
 
 .scrollDays{
-    -fx-background-color: -fx-base-background-color;
-    -fx-border-color: -fx-main-border-color;
+    -fx-background-color: -fx-darkest-background-color;
+    -fx-border-color: -fx-bright-border-color;
 }
 
 .vBoxDays{
-    -fx-background-color: -fx-base-background-color;
+    -fx-background-color: -fx-darkest-background-color;
 }
 
 .labelDays{
     -fx-alignment: center;
-    -fx-background-color: -fx-base1-background-color;
+    -fx-background-color: -fx-dark-background-color;
     -fx-font-size: 25px;
-    -fx-border-color: -fx-main-border-color;
+    -fx-border-color: -fx-bright-border-color;
 }
 
 Label{
-    -fx-text-fill: -fx-main-text-color;
+    -fx-text-fill: -fx-brighter-text-color;
 }
 
 .event{
-    -fx-background-color: -fx-base1-background-color;
+    -fx-background-color: -fx-dark-background-color;
 }
 
 .main-btn{
@@ -76,7 +81,7 @@ Label{
 }
 
 .buttonBox{
-    -fx-background-color: #77859E;
+    -fx-background-color: -fx-bright-background-color;
 }
 
 .navBtn{

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,24 +1,35 @@
+/* Marco Kühn */
+* {
+   -fx-dark-background-color: #3E415F;
+
+   -fx-bright-background-color: #ff5555;
+   -fx-brighter-background-color: #8D99AE;
+   -fx-brightest-background-color: #ffffff;
+
+   -fx-bright-border-color: #B0B0B0;
+   -fx-brighter-text-color: #ffffff;
+}
 GridPane{
-    -fx-background-color: #3E415F;
+    -fx-background-color: -fx-dark-background-color;
     -fx-padding: 20px;
     -fx-font-size: 20px;
     -fx-font-family: Segoe UI;
 
     -fx-border-insets: 1;
-    -fx-border-color: #B0B0B0;
+    -fx-border-color: -fx-bright-border-color;
     -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-text-fill: -fx-brighter-text-color;
     -fx-max-width: 200px;
     -fx-min-width: 200px;
 }
 
 .mainLabel{
-    -fx-background-color: #8D99AE;
+    -fx-background-color: -fx-brighter-background-color;
     -fx-padding: 10px;
     -fx-max-width: 200px;
     -fx-min-width: 200px;
@@ -28,17 +39,17 @@ Label{
 
 .mainButton{
     -fx-font-weight: bold;
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 JFXButton{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 #labelError{
     -fx-font-weight: bold;
     -fx-max-width: 1000px;
-    -fx-text-fill: #ff5555;
+    -fx-text-fill: -fx-bright-background-color;
     -fx-padding: 16px;
     -fx-min-height: 140px;
     -fx-max-height: 400px;
@@ -47,7 +58,7 @@ JFXButton{
 }
 
 .comboBox{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
     -fx-max-width: 200px;
     -fx-min-width: 200px;
 }

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,20 +1,21 @@
+/*Alex Rechtin*/
 * {
-   -fx-base-background-color: #2B2D42;
-   -fx-base1-background-color: #525E74;
-
-   -fx-main-border-color: #B0B0B0;
-   -fx-main-text-color: #ffffff;
+  -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;
 }
 
 
 GridPane{
-    -fx-background-color: #3E415F;
+    -fx-background-color: -fx-dark-background-color;
     -fx-padding: 20px;
     -fx-font-size: 20px;
     -fx-font-family: Segoe UI;
 
     -fx-border-insets: 1;
-    -fx-border-color: #B0B0B0;
+    -fx-border-color: -fx-bright-border-color;
     -fx-border-style: solid;
     -fx-border-width: 2;
     -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
@@ -30,12 +31,13 @@ GridPane{
 
 
 Label{
-    -fx-text-fill: white;
+    -fx-text-fill: -fx-brightest-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;
 }
@@ -43,9 +45,11 @@ Label{
 .errorMessage{
     -fx-max-width: 400px;
     -fx-min-width: 400px;
+    -fx-text-fill: -fx-brighter-text-color;
 }
 
-Button{
+JFXButton{
+    -fx-background-color: -fx-bright-background-color;
     -fx-max-width: 150px;
     -fx-min-width: 150px;
 }

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

@@ -1,9 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.*?>
+<!-- Alex Rechtin -->
+
+<?import javafx.scene.control.Label?>
 <?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">
@@ -31,15 +36,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" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
+    <Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
 
     <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
 
-    <TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-    <TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-    <TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+    <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" />
 
     <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
 
@@ -49,8 +54,8 @@
         <HBox.margin>
             <Insets right="100" left="100"/>
         </HBox.margin>
-        <Button onAction="#abortBtnClick">Abbrechen</Button>
-        <Button onAction="#createUser" styleClass="btnLogin" >Anlegen</Button>
+        <JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
+        <JFXButton onAction="#createUser" styleClass="btnLogin" >Anlegen</JFXButton>
 
     </HBox>
 </GridPane>

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

@@ -1,9 +1,13 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.scene.control.*?>
+<!-- Alex Rechtin-->
 <?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">
@@ -31,15 +35,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" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
+    <Label styleClass="inputLabel" wrapText="true" GridPane.rowIndex="5" GridPane.columnIndex="1">Passwort wiederholen:</Label>
 
     <Label styleClass="inputLabelAdmin" GridPane.rowIndex="6" GridPane.columnIndex="1">Admin:</Label>
 
-    <TextField fx:id="textLogin" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="1" />
-    <TextField fx:id="textForename" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="2" />
-    <TextField fx:id="textName" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="3" />
-    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+    <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" />
 
     <JFXToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
 
@@ -49,8 +53,8 @@
         <HBox.margin>
             <Insets right="100" left="100"/>
         </HBox.margin>
-        <Button onAction="#abortBtnClick">Abbrechen</Button>
-        <Button onAction="#createUser" styleClass="btnLogin" >Bearbeiten</Button>
+        <JFXButton onAction="#abortBtnClick">Abbrechen</JFXButton>
+        <JFXButton onAction="#createUser" styleClass="btnLogin" >Bearbeiten</JFXButton>
 
     </HBox>
 </GridPane>

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

@@ -1,26 +1,30 @@
+/* Marco Kühn*/
 * {
-   -fx-base-background-color: #2B2D42;
-   -fx-base1-background-color: #525E74;
+      -fx-dark-background-color: #3E415F;
 
-   -fx-main-border-color: #B0B0B0;
-   -fx-main-text-color: #ffffff;
+      -fx-brightest-background-color: #ffffff;
+
+      -fx-bright-border-color: #B0B0B0;
+
+      -fx-bright-text-color: #ff5555;
+      -fx-brighter-text-color: #ffffff;
 }
 
 GridPane{
-    -fx-background-color: #3E415F;
+    -fx-background-color: -fx-dark-background-color;
     -fx-padding: 20px;
     -fx-font-size: 20px;
     -fx-font-family: Segoe UI;
 
     -fx-border-insets: 1;
-    -fx-border-color: #B0B0B0;
+    -fx-border-color: -fx-bright-border-color;
     -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-text-fill: -fx-brighter-text-color;
     -fx-max-width: 150px;
     -fx-min-width: 150px;
 }
@@ -28,7 +32,7 @@ Label{
 .errorLbl{
     -fx-font-weight: bold;
         -fx-max-width: 200px;
-        -fx-text-fill: #ff5555;
+        -fx-text-fill: -fx-bright-text-color;
         -fx-padding: 16px;
         -fx-min-height: 140px;
         -fx-max-height: 400px;
@@ -37,17 +41,17 @@ Label{
 }
 
 .userField{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .passField{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .quitBtn{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }
 
 .loginBtn{
-    -fx-background-color: white;
+    -fx-background-color: -fx-brightest-background-color;
 }

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.*?>
@@ -24,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">Paswort</Label>
+    <Label GridPane.rowIndex="2">Passwort</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"/>
 

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(
-                    "config.json"),
+            Files.writeString(
+                    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

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package container;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
@@ -12,20 +13,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 ADD_EVENT_ENDPOINT = "http://localhost:8080/event/add";
-    private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del";
-    private static final String EDIT_EVENT_ENDPOINT = "http://localhost:8080/event/edit";
+    private static final String ALL_EVENTS_ENDPOINT =           "/event/all";
+    private static final String ADD_EVENT_ENDPOINT =            "/event/add";
+    private static final String DELETE_EVENT_ENDPOINT =         "/event/del";
+    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 ADD_USER_ENDPOINT = "http://localhost:8080/user/add";
-    private static final String DELETE_USER_ENDPOINT = "http://localhost:8080/user/del";
-    private static final String EDIT_USER_ENDPOINT = "http://localhost:8080/user/edit";
+    private static final String ALL_USER_ENDPOINT =             "/user/all";
+    private static final String ADD_USER_ENDPOINT =             "/user/add";
+    private static final String DELETE_USER_ENDPOINT =          "/user/del";
+    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_WITH_TOKEN_ENDPOINT = "http://localhost:8080/user/login-with-token";
-    private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";
+    private static final String LOGIN_ENDPOINT =                "/user/login";
+    private static final String LOGIN_WITH_TOKEN_ENDPOINT =     "/user/login-with-token";
+    private static final String HEADER_TEST_ENDPOINT =          "/vpr/header-test";
 
     private final HttpRequest httpRequest;
 
@@ -36,7 +38,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 +59,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 +81,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 +89,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 +97,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 +115,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 +143,7 @@ public class DataController {
 
     public List<User> getAllUser() throws HttpRequestException {
         String userJSON = sendBasicHttpRequest(
-                ALL_USER_ENDPOINT,
+                SERVER_URL + ALL_USER_ENDPOINT,
                 "",
                 true
         );
@@ -164,7 +166,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 +178,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 +194,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

@@ -1,3 +1,4 @@
+//Marco Kühn//
 package container;
 
 import java.time.Duration;
@@ -56,7 +57,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/container/HttpRequest.java

@@ -1,3 +1,4 @@
+//Marc Beyer//
 package container;
 
 import helper.Tuple;

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

@@ -1,3 +1,4 @@
+//Marco Kühn//
 package container;
 
 public class User {

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> {