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.convertString(text));
+        super.setText(Converter.CONVERT_STR(text));
     }
 }

client/app/src/main/java/customUI/Converter.java

@@ -8,7 +8,7 @@ public class Converter {
     ß 		    \u00df
      */
     @SuppressWarnings("all")
-    public static String convertString(String str){
+    public static String CONVERT_STR(String str){
         return str
                 .replace("ä", "\u00e4")
                 .replace("Ä", "\u00c4")

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.convertString(content));
+        super(Converter.CONVERT_STR(content));
     }
 
     public Label(){
@@ -10,6 +10,6 @@ public class Label extends javafx.scene.control.Label {
     }
 
     public void setTextValue(String text){
-        super.setText(Converter.convertString(text));
+        super.setText(Converter.CONVERT_STR(text));
     }
 }

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

@@ -1,13 +1,10 @@
 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;
@@ -15,47 +12,10 @@ 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");
 
-        if(
+        // Load login-scene
-            !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(
@@ -65,6 +25,21 @@ 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) {

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

@@ -4,7 +4,6 @@ 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;
@@ -14,8 +13,8 @@ import java.util.Objects;
 public class CreateUserController {
 
     public TextField textName;
-    public PasswordField textPassword;
+    public TextField textPassword;
-    public PasswordField textPasswordSecond;
+    public TextField textPasswordSecond;
     public ToggleButton checkButtonIsAdmin;
     public TextField textLogin;
     public TextField textForename;

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

@@ -76,29 +76,3 @@ Label{
     -fx-background-color: white;
 }
 
-.editEventBtn{
-    -fx-background-color: transparent;
-    -fx-border-color: transparent;
-}
-
-.editEventBtn .svg {
-    -fx-fill: -fill;
-}
-
-.editEventBtn:hover .svg {
-    -fx-fill: -hover-fill;
-}
-
-.deleteEventBtn{
-    -fx-background-color: transparent;
-    -fx-border-color: transparent;
-}
-
-.deleteEventBtn .svg {
-    -fx-fill: -fill;
-}
-
-.deleteEventBtn:hover .svg {
-    -fx-fill: -hover-fill;
-}
-

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" />
-    <PasswordField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
+    <TextField fx:id="textPassword" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="4" />
-    <PasswordField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
+    <TextField fx:id="textPasswordSecond" styleClass="textField" GridPane.columnIndex="2" GridPane.rowIndex="5" />
 
     <ToggleButton fx:id="checkButtonIsAdmin" GridPane.columnIndex="2" GridPane.rowIndex="6"/>
 

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

@@ -1,41 +0,0 @@
-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;
-    }
-}

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

@@ -1,38 +0,0 @@
-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();
-        }
-    }
-}

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

@@ -62,24 +62,17 @@ public class DataController {
         return USER_ID >= 0;
     }
 
-    public boolean loginWithToken(long userId, String token) {
+    public boolean loginWIthToken(String username, String password) {
         try {
-            HttpRequest.TOKEN = token;
             Tuple<Integer, String> response = httpRequest.sendPostRequest(
                     LOGIN_WITH_TOKEN_ENDPOINT,
-                    "userId=" + userId,
+                    "userId=" + USER_ID,
                     true
             );
-
-            System.out.println(response.getKey() + " " + response.getValue());
-
-            if(response.getKey() != 200) return false;
         } catch (Exception e) {
             e.printStackTrace();
             return false;
         }
-        USER_ID = userId;
-        HttpRequest.TOKEN = token;
         return USER_ID >= 0;
     }