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

@@ -12,7 +12,6 @@ import javafx.util.converter.LocalTimeStringConverter;
 import res.DataController;
 import res.Event;
 
-import java.time.LocalDateTime;
 import java.time.LocalTime;
 import java.time.format.FormatStyle;
 import java.util.Locale;
@@ -66,8 +65,8 @@ public class CreateEventController {
                     ComboBoxPriotity.getSelectionModel().getSelectedIndex(),
                     toggleBtnIsFullDay.isSelected(),
                     toggleBtnIsPrivate.isSelected(),
-                    timeStart.getValue(),
-                    timeEnd.getValue(),
+                    timeStart.getValue().toString(),
+                    timeEnd.getValue().toString(),
                     datePickerDate.getValue().atStartOfDay(),
                     (int) DataController.USER_ID
             );

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

@@ -12,33 +12,25 @@ import java.util.Objects;
 public class MainApplication extends Application {
     @Override
     public void start(Stage stage) throws IOException {
+        FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
 
-        System.out.println("Ignore 'Illegal reflective access operation'-Warning. See https://github.com/sshahine/JFoenix/issues/1170");
+        Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
+        scene.getStylesheets().add(Objects.requireNonNull(
+                MainApplication.class.getResource("main-view.css")).toExternalForm());
+        stage.setTitle("SharePlaner");
+        stage.setScene(scene);
 
-        // Load login-scene
         FXMLLoader fxmlLoaderLogin = new FXMLLoader(MainApplication.class.getResource("../users/login.fxml"));
         Scene sceneLogin = new Scene(fxmlLoaderLogin.load(), 650, 500);
         sceneLogin.getStylesheets().add(Objects.requireNonNull(
-                MainApplication.class.getResource("../users/login.css")).toExternalForm()
-        );
+                MainApplication.class.getResource("../users/login.css")).toExternalForm());
         Stage stageLogin = new Stage();
         stageLogin.setTitle("Anmelden");
         stageLogin.setScene(sceneLogin);
         stageLogin.showAndWait();
 
         if (DataController.USER_ID >= 0) {
-            // Load main-scene
-            FXMLLoader fxmlLoader = new FXMLLoader(MainApplication.class.getResource("main-view.fxml"));
-
-            Scene scene = new Scene(fxmlLoader.load(), 1200, 700);
-            scene.getStylesheets().add(Objects.requireNonNull(
-                    MainApplication.class.getResource("main-view.css")).toExternalForm()
-            );
-            stage.setTitle("SharePlaner");
-            stage.setScene(scene);
             stage.show();
-
-            System.out.println("Logged in...");
         }
     }
 

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

@@ -65,7 +65,7 @@ public class MainController {
         }
 
         DataController dataController = new DataController();
-        ArrayList<Event> eventList = dataController.getAllVisibleEvents(weekStartDateTime, weekStartDateTime.plusDays(7));
+        ArrayList<Event> eventList = dataController.getAllVisibleEvents();
 
         for (Event event : eventList) {
             addEvent(event);
@@ -166,7 +166,7 @@ public class MainController {
         deleteBtn.getStyleClass().add("deleteEventBtn");
         deleteBtn.setOnAction(e -> {
             DataController dataController = new DataController();
-            dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
+            dataController.deleteEvent(event.getId());
             updateEvents();
         });
 

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

@@ -1,55 +0,0 @@
-package users;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.Node;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import javafx.scene.control.ToggleButton;
-import javafx.stage.Stage;
-
-import java.util.Objects;
-
-public class CreateUserController {
-
-    public TextField textName;
-    public TextField textPassword;
-    public TextField textPasswordSecond;
-    public ToggleButton checkButtonIsAdmin;
-    public TextField textLogin;
-    public TextField textForename;
-    public 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 (!Objects.equals(textPassword.getText(), textPasswordSecond.getText())){
-            labelError.setText("Passwörter stimmen nicht überein!");
-            return;
-        }
-
-        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
-        stage.close();
-    }
-
-    @FXML
-    protected void abortBtnClick(ActionEvent event) {
-        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
-        stage.close();
-    }
-}

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

@@ -1,56 +0,0 @@
-* {
-   -fx-base-background-color: #2B2D42;
-   -fx-base1-background-color: #525E74;
-
-   -fx-main-border-color: #B0B0B0;
-   -fx-main-text-color: #ffffff;
-}
-
-
-GridPane{
-    -fx-background-color: #3E415F;
-    -fx-padding: 20px;
-    -fx-font-size: 20px;
-    -fx-font-family: Segoe UI;
-
-    -fx-border-insets: 1;
-    -fx-border-color: #B0B0B0;
-    -fx-border-style: solid;
-    -fx-border-width: 2;
-    -fx-effect: dropshadow(three-pass-box, rgba(100, 100, 100, 1), 24, 0.5, 0, 0);
-}
-
-.mainLabel{
-    -fx-padding: 10px;
-    -fx-max-width: 400px;
-    -fx-min-width: 400px;
-    -fx-font-weight: bold;
-    -fx-alignment: top-center;
-}
-
-
-Label{
-    -fx-text-fill: white;
-    -fx-max-width: 150px;
-    -fx-min-width: 150px;
-}
-
-.textField{
-    -fx-max-width: 400px;
-    -fx-min-width: 400px;
-}
-
-.errorMessage{
-    -fx-max-width: 400px;
-    -fx-min-width: 400px;
-}
-
-Button{
-    -fx-max-width: 150px;
-    -fx-min-width: 150px;
-}
-
-.btnLogin{
-    -fx-font-weight: bold;
-}
-

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

@@ -1,56 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.geometry.Insets?>
-<GridPane xmlns="http://javafx.com/javafx"
-          xmlns:fx="http://javafx.com/fxml"
-          fx:controller="users.CreateUserController">
-    <columnConstraints>
-        <ColumnConstraints minWidth="100"/>
-        <ColumnConstraints minWidth="100"/>
-        <ColumnConstraints minWidth="100"/>
-    </columnConstraints>
-    <rowConstraints>
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-        <RowConstraints vgrow="ALWAYS" />
-    </rowConstraints>
-
-    <Label styleClass="mainLabel" GridPane.columnIndex="2" >User anlegen</Label>
-
-    <Label styleClass="inputLabel" GridPane.rowIndex="1" GridPane.columnIndex="1">Login:</Label>
-    <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="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" />
-    <TextField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <TextField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
-
-    <ToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
-
-    <Label fx:id="labelError" styleClass="errorMessage" GridPane.columnIndex="2" GridPane.rowIndex="7"/>
-
-    <HBox GridPane.columnIndex="2" GridPane.rowIndex="8" alignment="CENTER_RIGHT">
-        <HBox.margin>
-            <Insets right="100" left="100"/>
-        </HBox.margin>
-        <Button onAction="#abortBtnClick">Abbrechen</Button>
-        <Button onAction="#createUser" styleClass="btnLogin" >Anmelden</Button>
-
-    </HBox>
-</GridPane>
-

client/data/build.gradle.kts

@@ -7,5 +7,4 @@ dependencies {
     implementation("com.fasterxml.jackson.core:jackson-databind:$jacksonVersion")
     implementation("com.fasterxml.jackson.core:jackson-core:$jacksonVersion")
     implementation("com.fasterxml.jackson.core:jackson-annotations:$jacksonVersion")
-    implementation("com.fasterxml.jackson.datatype:jackson-datatype-jsr310:$jacksonVersion")
 }

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

@@ -1,27 +0,0 @@
-package helper;
-
-public class Tuple<X, Y> {
-    public final X key;
-    public final Y value;
-
-    public Tuple(X key, Y value) {
-        this.key = key;
-        this.value = value;
-    }
-
-    public X getKey() {
-        return key;
-    }
-
-    public Y getValue() {
-        return value;
-    }
-
-    @Override
-    public String toString() {
-        return "Tuple{" +
-                "key=" + key +
-                ", value=" + value +
-                '}';
-    }
-}

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

@@ -1,9 +1,7 @@
 package res;
 
 import com.fasterxml.jackson.core.JsonProcessingException;
-import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
-import helper.Tuple;
 
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
@@ -12,7 +10,6 @@ import java.io.OutputStream;
 import java.net.HttpURLConnection;
 import java.net.URL;
 import java.nio.charset.StandardCharsets;
-import java.time.LocalDateTime;
 import java.util.*;
 
 public class DataController {
@@ -25,7 +22,6 @@ public class DataController {
 
     private static final String LOGIN_ENDPOINT = "http://localhost:8080/user/login";
     private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
-    private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";
 
     private final HttpRequest httpRequest;
 
@@ -35,28 +31,16 @@ public class DataController {
 
     public boolean login(String username, String password) {
         try {
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+            USER_ID = Long.parseLong(httpRequest.sendPostRequest(
                     LOGIN_ENDPOINT,
                     "login=" + username
                             + "&password=" + password,
                     false
-            );
-            String[] data = response.getValue().split("\\s+");
-
-            USER_ID = Long.parseLong(data[1]);
-            HttpRequest.TOKEN = data[0];
-
-            Tuple<Integer, String> auth = httpRequest.sendPostRequest(
-                    HEADER_TEST_ENDPOINT,
-                    "",
-                    true
-            );
-            System.out.println("auth " + auth);
+            ));
         } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
-
         return USER_ID >= 0;
     }
 
@@ -68,35 +52,34 @@ public class DataController {
         }
     }
 
-    public void deleteEvent(int userId, int eventId, LocalDateTime date) {
+    public void deleteEvent(int eventId) {
         try {
-            System.out.println("DELETE: userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate());
-            System.out.println(httpRequest.sendPostRequest(
-                    DELETE_EVENT_ENDPOINT,
-                    "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
-                    true
-            ));
+            System.out.println(httpRequest.sendPostRequest(DELETE_EVENT_ENDPOINT, "eventId=" + eventId, true));
         } catch (Exception e) {
             e.printStackTrace();
         }
     }
 
-    public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) {
+    public ArrayList<Event> getAllVisibleEvents() {
         ArrayList<Event> eventList = new ArrayList<>();
+
         try {
-            Tuple<Integer, String> response = httpRequest.sendPostRequest(
-                    ALL_EVENTS_ENDPOINT,
-                    "userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
-                    true
-            );
-            String jsonResponse = response.getValue();
+            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=" + USER_ID, true);
             System.out.println(jsonResponse);
 
             ObjectMapper objectMapper = new ObjectMapper();
-            objectMapper.findAndRegisterModules();
-            eventList = (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>(){});
+            //String json = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }";
 
+            for (Object obj : objectMapper.readValue(jsonResponse, Object[].class)) {
+                ArrayList<Object> list = new ArrayList<>();
+                if (obj.getClass().isArray()) {
+                    list = (ArrayList<Object>) Arrays.asList((Object[]) obj);
+                } else if (obj instanceof Collection) {
+                    list = new ArrayList<>((Collection<?>) obj);
+                }
+                eventList.add(new Event(list));
 
+            }
         } catch (Exception e) {
             e.printStackTrace();
         }
@@ -125,6 +108,7 @@ public class DataController {
 
         // Parse JSON
         ObjectMapper objectMapper = new ObjectMapper();
+        //String json = "{ \"color\" : \"Black\", \"type\" : \"BMW\" }";
 
         return objectMapper.readValue(jsonString, Event[].class);
     }

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

@@ -2,13 +2,10 @@ package res;
 
 import com.sun.jdi.event.StepEvent;
 
-import java.io.Serializable;
 import java.nio.charset.StandardCharsets;
-import java.sql.SQLOutput;
 import java.time.Duration;
 import java.time.LocalDate;
 import java.time.LocalDateTime;
-import java.time.LocalTime;
 import java.time.format.DateTimeFormatter;
 import java.util.ArrayList;
 import java.util.regex.Matcher;
@@ -46,10 +43,6 @@ public class Event {
     u.name AS uname
      */
 
-    public Event() {
-
-    }
-
     public Event(ArrayList<Object> arr) {
         id = (int) arr.get(0);
         name = (String) arr.get(1);
@@ -66,50 +59,21 @@ public class Event {
         ownerName = arr.get(8) + " " + arr.get(9);
     }
 
-    public Event(
-            int id,
-            String name,
+    public Event(String name,
                  int priority,
                  boolean isFullDay,
                  boolean isPrivate,
                  String start,
                  String end,
-            String date,
-            int ownerId,
-            String ownerName
-    ) {
-        this.ownerId = ownerId;
-        this.ownerName = ownerName;
-        this.id = id;
-        this.name = name;
-        this.start = start;
-        this.end = end;
-        this.priority = priority;
-        this.isFullDay = isFullDay;
-
-
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-        this.date = LocalDateTime.parse(date + " 00:00", formatter);
-
-    }
-
-    public Event(String name,
-                 int priority,
-                 boolean isFullDay,
-                 boolean isPrivate,
-                 LocalTime start,
-                 LocalTime end,
                  LocalDateTime date,
                  int ownerId
-    ) throws IllegalArgumentException {
-
-        System.out.println("Create Event");
-        if (name.length() < 3) {
+    ) throws IllegalArgumentException{
+        if(name.length() < 3){
             throw new IllegalArgumentException("Der Name muss eine L\u00e4nge von 3 haben.");
         }
         Pattern pattern = Pattern.compile("[A-Za-z\u00e4\u00f6\u00fc\u00c4\u00d6\u00dc\u00df0-9 =!?+*/$.:,;_<>()-]*");
         Matcher matcher = pattern.matcher(name);
-        if (!matcher.matches()) {
+        if(!matcher.matches()){
             System.out.println(name);
 
             byte[] bytes = name.getBytes(StandardCharsets.UTF_16);
@@ -118,25 +82,25 @@ public class Event {
             System.out.println(utf8EncodedString);
 
             for (char c : (name).toCharArray()) {
-                System.out.print(c + " " + (int) c + ", ");
+                System.out.print(c + " " + (int)c + ", ");
             }
             System.out.println();
             for (char c : (name).toCharArray()) {
-                System.out.print(c + " " + (int) c + ", ");
+                System.out.print(c + " " + (int)c + ", ");
             }
             System.out.println();
             for (char c : ("TäöüÄÖÜ").toCharArray()) {
-                System.out.print(c + " " + (int) c + ", ");
+                System.out.print(c + " " + (int)c + ", ");
             }
             System.out.println();
 
             throw new IllegalArgumentException("Der Name darf nur aus Zahlen, Buchstaben und folgenden Sonderzeichen bestehen: \u00e4\u00f6\u00fc \u00c4\u00d6\u00dc \u00df =!?+*/$.:,;_ <>()-");
         }
-        if (priority < 0) {
+        if(priority < 0){
             throw new IllegalArgumentException("Bitte eine Priorit\u00e4t w\u00e4hlen.");
         }
         LocalDateTime today = LocalDateTime.now().toLocalDate().atStartOfDay();
-        if (Duration.between(today, date).isNegative()) {
+        if(Duration.between(today, date).isNegative()){
             throw new IllegalArgumentException("Das Datum muss in der Zukunft liegen.");
         }
 
@@ -144,8 +108,8 @@ public class Event {
         this.priority = priority;
         this.isFullDay = isFullDay;
         this.isPrivate = isPrivate;
-        if (start != null) this.start = start.toString();
-        if (start != null) this.end = end.toString();
+        this.start = start;
+        this.end = end;
         this.date = date;
         this.ownerId = ownerId;
     }
@@ -210,9 +174,8 @@ public class Event {
         return date;
     }
 
-    public void setDate(String date) {
-        DateTimeFormatter formatter = DateTimeFormatter.ofPattern("yyyy-MM-dd HH:mm");
-        this.date = LocalDateTime.parse(date + " 00:00", formatter);
+    public void setDate(LocalDateTime date) {
+        this.date = date;
     }
 
     public int getOwnerId() {
@@ -246,12 +209,12 @@ public class Event {
                 "&name=" + getName() +
                 "&start=" + getStart() +
                 "&end=" + getEnd() +
-                "&priority=" + getPriority() +
+                "&prority=" + getPriority() +
                 "&isFullDay=" + isFullDay() +
                 "&isPrivate=" + isPrivate();
     }
 
-    private String convertToASCII(String s) {
+    private String convertToASCII(String s){
         byte[] germanBytes = s.getBytes();
         return new String(germanBytes, StandardCharsets.US_ASCII);
     }

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

@@ -1,7 +1,5 @@
 package res;
 
-import helper.Tuple;
-
 import java.io.BufferedReader;
 import java.io.DataOutputStream;
 import java.io.InputStreamReader;
@@ -11,9 +9,7 @@ import java.nio.charset.StandardCharsets;
 import java.util.Arrays;
 
 public class HttpRequest {
-    public static String TOKEN = "";
-
-    public Tuple<Integer, String> sendPostRequest(String urlString, String urlParameters, boolean sendAuth) throws Exception {
+    public String sendPostRequest(String urlString, String urlParameters, boolean sendAuth) throws Exception {
         byte[] postData = urlParameters.getBytes(StandardCharsets.UTF_8);
         int postDataLength = postData.length;
 
@@ -43,7 +39,7 @@ public class HttpRequest {
 
         if(sendAuth){
             con.setRequestProperty("Accept", "application/json");
-            con.setRequestProperty("Authorization", "Bearer " + TOKEN);
+            con.setRequestProperty("Authorization", "Bearer {token}");
         }
 
         try (DataOutputStream wr = new DataOutputStream(con.getOutputStream())) {
@@ -51,24 +47,22 @@ public class HttpRequest {
         }
 
         int status = con.getResponseCode();
+        if (status == 200) {
+            BufferedReader in = new BufferedReader(
+                    new InputStreamReader(con.getInputStream()));
             String inputLine;
             StringBuilder content = new StringBuilder();
-        BufferedReader in;
-
-        if (status == 200) {
-             in = new BufferedReader(new InputStreamReader(con.getInputStream()));
-        } else {
-             in = new BufferedReader(new InputStreamReader(con.getErrorStream()));
-        }
-
             while ((inputLine = in.readLine()) != null) {
                 content.append(inputLine);
             }
             in.close();
 
             con.disconnect();
-
-        return new Tuple<>(status, content.toString());
+            return content.toString();
+        } else {
+            con.disconnect();
+            throw new Exception("Status: " + status);
+        }
     }
 
     public String sendGetRequest(String urlString) throws Exception {