Added save login

use camelCase for static methods
Added Config
2022-01-23 21:21:16 +01:00 · 2022-01-23 17:41:40 +01:00 · 2022-01-23 17:40:49 +01:00 · 2022-01-23 17:33:26 +01:00 · 2022-01-20 13:33:49 +01:00
18 changed files with 285 additions and 275 deletions
--- a/client/app/src/main/java/customUI/Button.java
+++ b/client/app/src/main/java/customUI/Button.java
@@ -3,6 +3,6 @@ package customUI;
 public class Button extends javafx.scene.control.Button {

    public void setTextValue(String text){
-        super.setText(Converter.CONVERT_STR(text));
+        super.setText(Converter.convertString(text));
    }
 }
--- a/client/app/src/main/java/customUI/Converter.java
+++ b/client/app/src/main/java/customUI/Converter.java
@@ -8,7 +8,7 @@ public class Converter {
    ß 		    \u00df
     */
    @SuppressWarnings("all")
-    public static String CONVERT_STR(String str){
+    public static String convertString(String str){
        return str
                .replace("ä", "\u00e4")
                .replace("Ä", "\u00c4")
--- a/client/app/src/main/java/customUI/Label.java
+++ b/client/app/src/main/java/customUI/Label.java
@@ -2,7 +2,7 @@ package customUI;

 public class Label extends javafx.scene.control.Label {
    public Label(String content){
-        super(Converter.CONVERT_STR(content));
+        super(Converter.convertString(content));
    }

    public Label(){
@@ -10,6 +10,6 @@ public class Label extends javafx.scene.control.Label {
    }

    public void setTextValue(String text){
-        super.setText(Converter.CONVERT_STR(text));
+        super.setText(Converter.convertString(text));
    }
 }
--- a/client/app/src/main/java/customUI/Tooltip.java
+++ b/client/app/src/main/java/customUI/Tooltip.java
@@ -1,9 +0,0 @@
-package customUI;
-
-public class Tooltip extends javafx.scene.control.Tooltip {
-
-    public Tooltip(String tollTipText){
-        super(Converter.CONVERT_STR(tollTipText));
-    }
-
-}
--- a/client/app/src/main/java/helper/SvgBtnCreator.java
+++ b/client/app/src/main/java/helper/SvgBtnCreator.java
@@ -1,68 +0,0 @@
-package helper;
-
-import javafx.geometry.Bounds;
-import javafx.scene.Group;
-import customUI.Button;
-import javafx.scene.control.ContentDisplay;
-import customUI.Tooltip;
-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;
-    }
-
-}
--- a/client/app/src/main/java/main/CreateEventController.java
+++ b/client/app/src/main/java/main/CreateEventController.java
@@ -1,6 +1,7 @@
 package main;

 import com.jfoenix.controls.*;
+import helper.HttpRequestException;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.scene.Node;
@@ -12,6 +13,7 @@ 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;
@@ -73,16 +75,20 @@ public class CreateEventController {

            System.out.println(event.getAsUrlParam());

-            DataController dataController = new DataController();
-            dataController.createEvent(event);
+            sendHttpRequest(event);

            Stage stage = (Stage) ((Node) actionEvent.getSource()).getScene().getWindow();
            stage.close();
-        } catch (RuntimeException e) {
+        } catch (HttpRequestException e) {
            labelError.setText(e.getMessage());
        }
    }

+    protected void sendHttpRequest(Event event) throws HttpRequestException {
+        DataController dataController = new DataController();
+        dataController.createEvent(event);
+    }
+
    @FXML
    protected void abortBtnClick(ActionEvent event) {
        Stage stage = (Stage) ((Node) event.getSource()).getScene().getWindow();
--- a/client/app/src/main/java/main/EditEventController.java
+++ b/client/app/src/main/java/main/EditEventController.java
@@ -0,0 +1,25 @@
+package main;
+
+import helper.HttpRequestException;
+import res.DataController;
+import res.Event;
+
+public class EditEventController extends CreateEventController{
+
+    private Event currentEvent;
+
+    public Event getCurrentEvent() {
+        return currentEvent;
+    }
+
+    public void setCurrentEvent(Event currentEvent) {
+        this.currentEvent = currentEvent;
+    }
+
+    @Override
+    protected void sendHttpRequest(Event event) throws HttpRequestException {
+        DataController dataController = new DataController();
+        dataController.deleteEvent(currentEvent.getOwnerId(), currentEvent.getId(), currentEvent.getDate());
+        dataController.createEvent(event);
+    }
+}
--- a/client/app/src/main/java/main/MainApplication.java
+++ b/client/app/src/main/java/main/MainApplication.java
@@ -1,10 +1,13 @@
 package main;

+import config.Config;
+import config.ConfigLoader;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 import res.DataController;
+import res.HttpRequest;

 import java.io.IOException;
 import java.util.Objects;
@@ -12,10 +15,47 @@ import java.util.Objects;
 public class MainApplication extends Application {
    @Override
    public void start(Stage stage) throws IOException {
+        Config config = ConfigLoader.load();
+        if(config == null){
+            config = new Config(false, -1, "");
+        }

        System.out.println("Ignore 'Illegal reflective access operation'-Warning. See https://github.com/sshahine/JFoenix/issues/1170");

-        // Load login-scene
+        if(
+            !config.isSaveLogin()
+            || !new DataController().loginWithToken(config.getId(), config.getToken())
+        ){
+            // Load login-scene
+            loadLoginScene();
+        }
+
+        if (DataController.USER_ID >= 0) {
+            if(config.isSaveLogin()){
+                config.setId(DataController.USER_ID);
+                config.setToken(HttpRequest.TOKEN);
+                ConfigLoader.save(config);
+            }
+            // Load main-scene
+            loadMainScene(stage);
+
+            System.out.println("Logged in...");
+        }
+    }
+
+    private void loadMainScene(Stage stage) throws IOException {
+        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();
+    }
+
+    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(
@@ -25,21 +65,6 @@ public class MainApplication extends Application {
        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...");
-        }
    }

    public static void main(String[] args) {
--- a/client/app/src/main/java/main/MainController.java
+++ b/client/app/src/main/java/main/MainController.java
@@ -1,13 +1,12 @@
 package main;

-import customUI.Button;
-import customUI.Label;
-import helper.SvgBtnCreator;
+import helper.HttpRequestException;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.geometry.Pos;
-import javafx.scene.Group;
 import javafx.scene.Scene;
+import customUI.Button;
+import customUI.Label;
 import javafx.scene.control.ScrollPane;
 import javafx.scene.layout.GridPane;
 import javafx.scene.layout.HBox;
@@ -26,12 +25,6 @@ import java.util.Objects;

 public class MainController {

-    @FXML
-    public VBox leftNav;
-    @FXML
-    public GridPane mainGridPane;
-    @FXML
-    public HBox buttonBox;
    @FXML
    private GridPane calendarGrid;

@@ -54,9 +47,8 @@ public class MainController {
    public void initialize() {
        createWeek();
        setDates();
+
        updateEvents();
-        createBtns();
-        leftNav.setSpacing(40);
    }

    private void updateEvents() {
@@ -65,11 +57,17 @@ public class MainController {
        }

        DataController dataController = new DataController();
-        ArrayList<Event> eventList = dataController.getAllVisibleEvents(weekStartDateTime, weekStartDateTime.plusDays(7));
+        try {
+            ArrayList<Event> eventList = dataController.getAllVisibleEvents(weekStartDateTime, weekStartDateTime.plusDays(7));

-        for (Event event : eventList) {
-            addEvent(event);
+            for (Event event : eventList) {
+                addEvent(event);
+            }
+        } catch (HttpRequestException e) {
+            e.printStackTrace();
        }
+
+
    }

    @FXML
@@ -106,6 +104,7 @@ public class MainController {
            stage.setScene(scene);
            stage.initModality(Modality.APPLICATION_MODAL);
            stage.setResizable(false);
+            //stage.initStyle(StageStyle.UNDECORATED);
            stage.showAndWait();
        } catch (IOException e) {
            e.printStackTrace();
@@ -113,14 +112,6 @@ public class MainController {
        updateEvents();
    }

-    protected void onSettingBtnClick(){
-
-    }
-
-    protected void onLogoutBtnClick(){
-
-    }
-
    private void createWeek() {
        for (int i = 0; i < 7; i++) {
            Label label = new Label();
@@ -155,28 +146,19 @@ public class MainController {

        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");
+        Button deleteBtn = new Button();
+        deleteBtn.setTextValue(" X ");
        deleteBtn.setOnAction(e -> {
            DataController dataController = new DataController();
-            dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
+            try {
+                dataController.deleteEvent(event.getOwnerId(), event.getId(), event.getDate());
+            } catch (HttpRequestException ex) {
+                ex.printStackTrace();
+            }
            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");
+        Button editBtn = new Button();
+        editBtn.setTextValue("edit");
        editBtn.setOnAction(event1 -> {
            try {
                FXMLLoader fxmlLoader = new FXMLLoader(
@@ -189,7 +171,10 @@ public class MainController {
                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();
            }
@@ -255,71 +240,4 @@ public class MainController {
        LabelMonth.setText(dateFormatter.format(weekStartDateTime));

    }
-
-    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");
-        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");
-        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");
-        logoutBtn.setOnAction(e -> 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");
-        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");
-        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");
-        nextBtn.setOnAction(e -> onNextClick());
-        nextBtn.getStyleClass().add("navBtn");
-        GridPane.setColumnIndex(nextBtn, 3);
-        buttonBox.getChildren().add(nextBtn);
-    }
-
-
 }
--- a/client/app/src/main/java/users/CreateUserController.java
+++ b/client/app/src/main/java/users/CreateUserController.java
@@ -4,6 +4,7 @@ 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;
@@ -13,8 +14,8 @@ import java.util.Objects;
 public class CreateUserController {

    public TextField textName;
-    public TextField textPassword;
-    public TextField textPasswordSecond;
+    public PasswordField textPassword;
+    public PasswordField textPasswordSecond;
    public ToggleButton checkButtonIsAdmin;
    public TextField textLogin;
    public TextField textForename;
--- a/client/app/src/main/resources/main/edit-event.fxml
+++ b/client/app/src/main/resources/main/edit-event.fxml
@@ -8,7 +8,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="main.EditEventController">

    <columnConstraints>
        <ColumnConstraints/>
--- a/client/app/src/main/resources/main/main-view.css
+++ b/client/app/src/main/resources/main/main-view.css
@@ -63,33 +63,17 @@ Label{
 }

 .main-btn{
-    -fx-background-color: transparent;
-    -fx-border-color: transparent;
-}
-
-.main-btn .svg {
-    -fx-fill: -fill;
-}
-
-.main-btn:hover .svg {
-    -fx-fill: -hover-fill;
-}
-
-.buttonBox{
-    -fx-background-color: #77859E;
+    -fx-background-color: #ffffff;
+    -fx-text-fill: -fx-main-text-color;
+    -fx-background-radius: 5em;
+    -fx-min-width: 40px;
+    -fx-min-height: 40px;
+    -fx-max-width: 40px;
+    -fx-max-height: 40px;
 }

 .navBtn{
-    -fx-background-color: transparent;
-    -fx-border-color: transparent;
-}
-
-.navBtn .svg {
-    -fx-fill: -fill;
-}
-
-.navBtn:hover .svg {
-    -fx-fill: -hover-fill;
+    -fx-background-color: white;
 }

 .editEventBtn{
--- a/client/app/src/main/resources/main/main-view.fxml
+++ b/client/app/src/main/resources/main/main-view.fxml
@@ -4,6 +4,7 @@
 <?import javafx.scene.control.*?>
 <?import javafx.scene.image.*?>
 <?import javafx.scene.layout.*?>
+<?import com.jfoenix.controls.*?>

 <GridPane style="-fx-background-color: #424242;" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/1"
          fx:controller="main.MainController">
@@ -14,13 +15,22 @@
    <rowConstraints>
        <RowConstraints vgrow="SOMETIMES"/>
    </rowConstraints>
-    <VBox fx:id="leftNav" alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
+    <VBox alignment="TOP_CENTER" prefHeight="200.0" prefWidth="100.0" spacing="5.0"
          style="-fx-background-color: #525E74;">
        <ImageView fitHeight="50.0" fitWidth="50.0" pickOnBounds="true" preserveRatio="true">

        </ImageView>
+        <JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
+            ADD
+        </JFXButton>
+        <JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
+            ADD
+        </JFXButton>
+        <JFXButton onAction="#onAddBtnClick" styleClass="main-btn">
+            ADD
+        </JFXButton>
    </VBox>
-    <GridPane fx:id="mainGridPane" prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
+    <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
        <columnConstraints>
            <ColumnConstraints hgrow="ALWAYS"/>
            <ColumnConstraints/>
@@ -39,8 +49,9 @@
                <Insets left="5"/>
            </padding>
        </Label>
-
-        <HBox fx:id="buttonBox" styleClass="buttonBox" GridPane.columnIndex="1" alignment="CENTER"/>
+        <JFXButton styleClass="navBtn" onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</JFXButton>
+        <JFXButton styleClass="navBtn" onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</JFXButton>
+        <JFXButton styleClass="navBtn" onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</JFXButton>

        <GridPane fx:id="calendarGrid" gridLinesVisible="true" styleClass="gridCalendar" GridPane.columnSpan="4"
                  GridPane.columnIndex="0" GridPane.rowIndex="1">
--- a/client/app/src/main/resources/users/create-user.fxml
+++ b/client/app/src/main/resources/users/create-user.fxml
@@ -37,8 +37,8 @@
    <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" />
+    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />

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

--- a/client/data/src/main/java/config/Config.java
+++ b/client/data/src/main/java/config/Config.java
@@ -0,0 +1,41 @@
+package config;
+
+public class Config {
+    private boolean saveLogin;
+    private long id;
+    private String token;
+
+    public Config(){
+
+    }
+
+    public Config(boolean saveLogin, long id, String token) {
+        this.saveLogin = saveLogin;
+        this.id = id;
+        this.token = token;
+    }
+
+    public boolean isSaveLogin() {
+        return saveLogin;
+    }
+
+    public void setSaveLogin(boolean saveLogin) {
+        this.saveLogin = saveLogin;
+    }
+
+    public long getId() {
+        return id;
+    }
+
+    public void setId(long id) {
+        this.id = id;
+    }
+
+    public String getToken() {
+        return token;
+    }
+
+    public void setToken(String token) {
+        this.token = token;
+    }
+}
--- a/client/data/src/main/java/config/ConfigLoader.java
+++ b/client/data/src/main/java/config/ConfigLoader.java
@@ -0,0 +1,38 @@
+package config;
+
+import com.fasterxml.jackson.databind.ObjectMapper;
+import res.DataController;
+
+import java.io.IOException;
+import java.nio.file.Files;
+import java.nio.file.Paths;
+
+public class ConfigLoader {
+
+    public static Config load(){
+        try {
+            String jsonString = Files.readString(Paths.get("config.json"));
+
+            ObjectMapper objectMapper = new ObjectMapper();
+            objectMapper.findAndRegisterModules();
+            return objectMapper.readValue(jsonString, Config.class);
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+        return null;
+    }
+
+    public static void save(Config config){
+        ObjectMapper objectMapper = new ObjectMapper();
+        objectMapper.findAndRegisterModules();
+
+        try {
+            Files.writeString(Paths.get(
+                    "config.json"),
+                    objectMapper.writeValueAsString(config)
+            );
+        } catch (IOException e) {
+            e.printStackTrace();
+        }
+    }
+}
--- a/client/data/src/main/java/helper/HttpRequestException.java
+++ b/client/data/src/main/java/helper/HttpRequestException.java
@@ -0,0 +1,23 @@
+package helper;
+
+public class HttpRequestException extends Exception{
+    private int status;
+
+    public HttpRequestException(String message, int status) {
+        super(message);
+        this.status = status;
+    }
+
+    public HttpRequestException(Tuple<Integer, String> response) {
+        super(response.getValue());
+        this.status = response.getKey();
+    }
+
+    public int getStatus() {
+        return status;
+    }
+
+    public void setStatus(int status) {
+        this.status = status;
+    }
+}
--- a/client/data/src/main/java/res/DataController.java
+++ b/client/data/src/main/java/res/DataController.java
@@ -3,6 +3,7 @@ package res;
 import com.fasterxml.jackson.core.JsonProcessingException;
 import com.fasterxml.jackson.core.type.TypeReference;
 import com.fasterxml.jackson.databind.ObjectMapper;
+import helper.HttpRequestException;
 import helper.Tuple;

 import java.io.BufferedReader;
@@ -24,6 +25,7 @@ public class DataController {
    private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/event/del";

    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 ALL_USERS_ENDPOINT = "http://localhost:8080/user/all";
    private static final String HEADER_TEST_ENDPOINT = "http://localhost:8080/vpr/header-test";

@@ -60,28 +62,59 @@ public class DataController {
        return USER_ID >= 0;
    }

-    public void createEvent(Event event) {
+    public boolean loginWithToken(long userId, String token) {
        try {
-            System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true));
+            HttpRequest.TOKEN = token;
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(
+                    LOGIN_WITH_TOKEN_ENDPOINT,
+                    "userId=" + userId,
+                    true
+            );
+
+            System.out.println(response.getKey() + " " + response.getValue());
+
+            if(response.getKey() != 200) return false;
        } catch (Exception e) {
-            throw new RuntimeException("Es konnte keine Verbindung mit dem Server hergestellt werden.");
+            e.printStackTrace();
+            return false;
+        }
+        USER_ID = userId;
+        HttpRequest.TOKEN = token;
+        return USER_ID >= 0;
+    }
+
+    public void createEvent(Event event) throws HttpRequestException {
+        try {
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam(), true);
+            if(response.getKey() != 200){
+                throw new HttpRequestException(response);
+            }
+        }catch (HttpRequestException e){
+            throw e;
+        }catch (Exception e) {
+            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
        }
    }

-    public void deleteEvent(int userId, int eventId, LocalDateTime date) {
+    public void deleteEvent(int userId, int eventId, LocalDateTime date) throws HttpRequestException {
        try {
            System.out.println("DELETE: userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate());
-            System.out.println(httpRequest.sendPostRequest(
+            Tuple<Integer, String> response = httpRequest.sendPostRequest(
                    DELETE_EVENT_ENDPOINT,
                    "userId=" + userId + "&eventId=" + eventId + "&date=" + date.toLocalDate(),
                    true
-            ));
-        } catch (Exception e) {
-            e.printStackTrace();
+            );
+            if(response.getKey() != 200){
+                throw new HttpRequestException(response);
+            }
+        }catch (HttpRequestException e){
+            throw e;
+        }catch (Exception e) {
+            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
        }
    }

-    public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) {
+    public ArrayList<Event> getAllVisibleEvents(LocalDateTime startDate, LocalDateTime endDate) throws HttpRequestException {
        ArrayList<Event> eventList = new ArrayList<>();
        try {
            Tuple<Integer, String> response = httpRequest.sendPostRequest(
@@ -89,6 +122,9 @@ public class DataController {
                    "userId=" + USER_ID + "&startDate=" + startDate.toLocalDate() + "&endDate=" + endDate.toLocalDate(),
                    true
            );
+            if(response.getKey() != 200){
+                throw new HttpRequestException(response);
+            }
            String jsonResponse = response.getValue();
            System.out.println(jsonResponse);

@@ -97,35 +133,14 @@ public class DataController {
            eventList = (ArrayList<Event>) objectMapper.readValue(jsonResponse, new TypeReference<List<Event>>(){});


-        } catch (Exception e) {
-            e.printStackTrace();
+        }catch (HttpRequestException e){
+            throw e;
+        }catch (Exception e) {
+            throw new HttpRequestException("Es konnte keine Verbindung mit dem Server hergestellt werden.", 600);
        }

        return eventList;
    }

-    public Event[] getAllEvents() {
-        Event[] eventList = null;

-        try {
-            String jsonResponse = httpRequest.sendGetRequest("http://localhost:8080/vpr/all-events-test");
-            eventList = parseJsonToEventList(jsonResponse);
-            for (Event e : eventList) {
-                System.out.println(e);
-            }
-        } catch (Exception e) {
-            e.printStackTrace();
-        }
-
-        return eventList;
-    }
-
-    private Event[] parseJsonToEventList(String jsonString) throws JsonProcessingException {
-        ArrayList<Event> eventList;
-
-        // Parse JSON
-        ObjectMapper objectMapper = new ObjectMapper();
-
-        return objectMapper.readValue(jsonString, Event[].class);
-    }
 }
Author	SHA1	Message	Date
Marc Beyer	2c3d646c47	Added save login	2022-01-23 21:21:16 +01:00
Marc Beyer	e021809fd7	use camelCase for static methods	2022-01-23 17:41:40 +01:00
Marc Beyer	c040e54fb8	Added Config	2022-01-23 17:40:49 +01:00
Marc Beyer	4020d59284	Added a passwordField	2022-01-23 17:33:26 +01:00
Marc Beyer	2f0c4b2a4c	Added edit-function	2022-01-20 13:33:49 +01:00