Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch

src/main/java/com/bib/essensbestellungsverwaltung/HelloApplication.java

@@ -18,7 +18,7 @@ public class HelloApplication extends Application {
     public void start(Stage stage) throws IOException {
         FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("login-view.fxml"));
         Scene scene = new Scene(fxmlLoader.load(), 950,480);
-        //stage = primary;
+        primary = stage;
         stage.setTitle("Essen Bestellung im Kindergarten");
         stage.setScene(scene);
         stage.show();

src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java

@@ -1,4 +1,4 @@
-/*Richard Reiswich*/
+/*Reshad Meher*/
 package com.bib.essensbestellungsverwaltung;
 
 import javafx.beans.NamedArg;
@@ -17,7 +17,6 @@ import java.util.HashMap;
 public class LoginController {
     @FXML
     private TextField tfEmail;
-
     @FXML
     private PasswordField pfPassword;
 
@@ -30,15 +29,11 @@ public class LoginController {
         if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){
             FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("menue-view.fxml"));
             Scene scene = new Scene(fxmlLoader.load(), 950,480);
-            Stage stage = new Stage();
+            HelloApplication.primary.setScene(scene);
-            stage.setTitle("Essen Bestellung im Kindergarten");
-            stage.setScene(scene);
-            stage.show();
         }else {
             Alert alert = new Alert(Alert.AlertType.ERROR,"Email oder Passwort ist falsch");
             alert.showAndWait();
         }
-
         tfEmail.setText("");
         pfPassword.setText("");
     }
@@ -46,10 +41,6 @@ public class LoginController {
     protected void changeToSignUp() throws IOException {
         FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("signUp-view.fxml"));
         Scene scene = new Scene(fxmlLoader.load(), 950,480);
-        Stage stage = new Stage();
+        HelloApplication.primary.setScene(scene);
-        stage.setTitle("Essen Bestellung im Kindergarten");
-        stage.setScene(scene);
-        stage.show();
-
     }
 }