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

@@ -4,7 +4,6 @@ import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import res.DataController;
 
 import java.io.IOException;
 import java.util.Objects;
@@ -18,6 +17,7 @@ public class MainApplication extends Application {
         scene.getStylesheets().add(Objects.requireNonNull(MainApplication.class.getResource("main-view.css")).toExternalForm());
         stage.setTitle("SharePlaner");
         stage.setScene(scene);
+        stage.show();
 
         FXMLLoader fxmlLoaderLogin = new FXMLLoader(MainApplication.class.getResource("../users/login.fxml"));
         Scene sceneLogin = new Scene(fxmlLoaderLogin.load(), 650, 500);
@@ -25,11 +25,8 @@ public class MainApplication extends Application {
         Stage stageLogin = new Stage();
         stageLogin.setTitle("Anmelden");
         stageLogin.setScene(sceneLogin);
-        stageLogin.showAndWait();
+        stageLogin.show();
 
-        if(DataController.USER_ID >= 0){
-            stage.show();
-        }
     }
 
     public static void main(String[] args) {

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

@@ -65,27 +65,6 @@ public class MainController {
         }
     }
 
-    @FXML
-    protected void onBackClick() {
-        weekOffset--;
-        setDates();
-        updateEvents();
-    }
-
-    @FXML
-    protected void onTodayClick(){
-        weekOffset = 0;
-        setDates();
-        updateEvents();
-    }
-
-    @FXML
-    protected void onNextClick() {
-        weekOffset++;
-        setDates();
-        updateEvents();
-    }
-
     @FXML
     protected void onAddBtnClick() {
         try {

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

@@ -0,0 +1,4 @@
+package users;
+
+public class LoginControler {
+}

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

@@ -1,49 +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.stage.Stage;
-import res.DataController;
-
-public class LoginController {
-    @FXML
-    public TextField userField;
-    @FXML
-    public TextField passField;
-    @FXML
-    public Label userErrLabel;
-    @FXML
-    public Label passErrLabel;
-
-    @FXML
-    protected void login(ActionEvent event){
-        if(userField.getText().trim().isEmpty()){
-            userErrLabel.setText("Bitte laginnamen eingeben!");
-            return;
-        }
-        if(passField.getText().trim().isEmpty()){
-            userErrLabel.setText("");
-            passErrLabel.setText("Bitte passwort eingeben!");
-            return;
-        }
-
-        DataController dataController = new DataController();
-        if(!dataController.login(userField.getText(), passField.getText())){
-            userErrLabel.setText("Name und Passwort passen nicht zueinander!");
-            passErrLabel.setText("Name und Passwort passen nicht zueinander!");
-            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/main/main-view.fxml

@@ -30,10 +30,7 @@
     <GridPane prefHeight="200.0" prefWidth="222.0" GridPane.columnIndex="1" GridPane.rowIndex="0">
         <columnConstraints>
         <ColumnConstraints hgrow="ALWAYS" />
-            <ColumnConstraints />
+         <ColumnConstraints />
-            <ColumnConstraints />
-            <ColumnConstraints />
-            <ColumnConstraints />
         </columnConstraints>
         <rowConstraints>
             <RowConstraints />
@@ -45,11 +42,8 @@
                 <Insets left="5" />
             </padding>
         </Label>
-        <Button onAction="#onBackClick" GridPane.columnIndex="1" maxHeight="1.7976931348623157E308">zurück</Button>
-        <Button onAction="#onTodayClick" GridPane.columnIndex="2" maxHeight="1.7976931348623157E308">heute</Button>
-        <Button onAction="#onNextClick" GridPane.columnIndex="3" maxHeight="1.7976931348623157E308">weiter</Button>
 
-        <GridPane fx:id="calendarGrid" gridLinesVisible="true"  styleClass="gridCalendar" GridPane.columnSpan="4" GridPane.columnIndex="0" GridPane.rowIndex="1">
+        <GridPane fx:id="calendarGrid" gridLinesVisible="true"  styleClass="gridCalendar" GridPane.columnIndex="0" GridPane.rowIndex="1">
             <columnConstraints>
                 <ColumnConstraints hgrow="ALWAYS" maxWidth="14.2857142857" minWidth="14.2857142857" percentWidth="14.2857142857" />
                 <ColumnConstraints hgrow="ALWAYS" percentWidth="14.2857142857" />

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

@@ -1,8 +1,12 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="users.LoginController">
+
+<GridPane xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml"  fx:controller="users.LoginControler">
 
     <columnConstraints>
         <ColumnConstraints/>
@@ -19,14 +23,14 @@
     <Label GridPane.columnIndex="1">Anmelden</Label>
 
     <Label GridPane.rowIndex="1">Username</Label>
-    <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField" />
+    <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" fx:id="userField"></TextField>
-    <Label GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel"/>
+    <Label GridPane.columnIndex="2" GridPane.rowIndex="1" fx:id="userErrLabel">Error</Label>
 
     <Label GridPane.rowIndex="2">Paswort</Label>
-    <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField" />
+    <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" fx:id="passField"></PasswordField>
-    <Label GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel"/>
+    <Label GridPane.columnIndex="2" GridPane.rowIndex="2" fx:id="passErrLabel">Error</Label>
 
-    <Button onAction="#abortBtnClick" GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>
+    <Button GridPane.columnIndex="1" GridPane.rowIndex="3">Beenden</Button>
-    <Button onAction="#login" GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button>
+    <Button GridPane.columnIndex="2" GridPane.rowIndex="3">Anmelden</Button>
 
 </GridPane>

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

@@ -14,13 +14,10 @@ import java.util.*;
 
 public class DataController {
 
-    public static long USER_ID = -1;
-
     private static final String ALL_EVENTS_ENDPOINT = "http://localhost:8080/vpr/all-events";
     private static final String ALL_USERS_ENDPOINT = "http://localhost:8080/vpr/all-users";
     private static final String ADD_EVENT_ENDPOINT = "http://localhost:8080/vpr/add-event";
     private static final String DELETE_EVENT_ENDPOINT = "http://localhost:8080/vpr/del-event";
-    private static final String LOGIN_ENDPOINT = "http://localhost:8080/vpr/login";
 
     private final HttpRequest httpRequest;
 
@@ -28,20 +25,6 @@ public class DataController {
         httpRequest = new HttpRequest();
     }
 
-    public boolean login(String username, String password){
-        try {
-            USER_ID = Long.parseLong(httpRequest.sendPostRequest(
-                    LOGIN_ENDPOINT,
-                    "login=" + username
-                    + "&password=" + password
-            ));
-        } catch (Exception e) {
-            e.printStackTrace();
-            return false;
-        }
-        return USER_ID >= 0;
-    }
-
     public void createEvent(Event event){
         try {
             System.out.println(httpRequest.sendPostRequest(ADD_EVENT_ENDPOINT, event.getAsUrlParam()));
@@ -62,7 +45,7 @@ public class DataController {
         ArrayList<Event> eventList = new ArrayList<>();
 
         try {
-            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=" + USER_ID);
+            String jsonResponse = httpRequest.sendPostRequest(ALL_EVENTS_ENDPOINT, "userId=1");
             System.out.println(jsonResponse);
 
             ObjectMapper objectMapper = new ObjectMapper();