Merge branch 'main' into WIP_Objects

This commit is contained in:
Malte Schulze Hobeling 2023-01-30 14:13:50 +01:00
commit 5447d7f238
4 changed files with 6 additions and 8 deletions

View File

@ -69,7 +69,7 @@
<id>default-cli</id>
<configuration>
<mainClass>
com.bib.essensbestellungsverwaltung/com.bib.essensbestellungsverwaltung.HelloApplication
com.bib.essensbestellungsverwaltung/com.bib.essensbestellungsverwaltung.StartViewApplication
</mainClass>
<launcher>app</launcher>
<jlinkZipName>app</jlinkZipName>

View File

@ -1,12 +1,10 @@
/*Richard Reiswich*/
package com.bib.essensbestellungsverwaltung;
import javafx.beans.NamedArg;
import javafx.fxml.FXML;
import javafx.fxml.FXMLLoader;
import javafx.scene.Scene;
import javafx.scene.control.Alert;
import javafx.scene.control.Button;
import javafx.scene.control.PasswordField;
import javafx.scene.control.TextField;
import javafx.stage.Stage;
@ -28,7 +26,7 @@ public class LoginController {
String email = tfEmail.getText();
String password = pfPassword.getText();
if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){
FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("menue-view.fxml"));
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("menue-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 950,480);
Stage stage = new Stage();
stage.setTitle("Essen Bestellung im Kindergarten");
@ -44,7 +42,7 @@ public class LoginController {
}
@FXML
protected void changeToSignUp() throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("signUp-view.fxml"));
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("signUp-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 950,480);
Stage stage = new Stage();
stage.setTitle("Essen Bestellung im Kindergarten");

View File

@ -12,11 +12,11 @@ import javafx.stage.Stage;
import java.io.IOException;
public class HelloApplication extends Application {
public class StartViewApplication extends Application {
public static Stage primary;
@Override
public void start(Stage stage) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("login-view.fxml"));
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 950,480);
//stage = primary;
stage.setTitle("Essen Bestellung im Kindergarten");

View File

@ -5,7 +5,7 @@ public class SuperMain {
if(args.length > 0){
ConsoleMain.main(args);
}else {
HelloApplication.main(args);
StartViewApplication.main(args);
}
}
}