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

# Conflicts: # src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml
Admin Controller bearbeitet
2023-01-31 12:27:59 +01:00 · 2023-01-31 12:27:14 +01:00 · 2023-01-31 10:22:48 +01:00 · 2023-01-30 15:03:54 +01:00 · 2023-01-30 14:58:43 +01:00 · 2023-01-30 14:57:57 +01:00
33 changed files with 947 additions and 1267 deletions
--- a/.gitignore
+++ b/.gitignore
@@ -35,6 +35,4 @@ build/
 .vscode/

 ### Mac OS ###
-.DS_Store
-
-/database.db
+.DS_Store
--- a/src/main/java/com/bib/essensbestellungsverwaltung/AdminController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/AdminController.java
@@ -1,5 +1,3 @@
-/*Schulte*/
-
 package com.bib.essensbestellungsverwaltung;

 import javafx.fxml.FXML;
@@ -31,6 +29,9 @@ public class AdminController {
    @FXML
    protected void onBtSignUp(){

+
+
+
        String ln = lastname.getText();
        String fn = firstname.getText();
        String st = street.getText();
@@ -40,21 +41,6 @@ public class AdminController {
        String emailString = email.getText();
        String pw = password.getText();

-        boolean userData = false;
-        boolean pwCorrect = false;
-        boolean emailCorrect = false;
-
-
-        if(ln.isEmpty() || fn.isEmpty() || st.isEmpty() ||nr.isEmpty() || cityString.isEmpty() || plzString.isEmpty()){
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Felder");
-            alert.setHeaderText("Felder nicht ausgefüllt");
-            alert.setContentText("Bitte füllen sie alle Felder aus");
-            alert.showAndWait();
-        }
-        else {
-            userData = true;
-        }


        if(!pw.matches("^(?=.*[0-9])(?=.*[a-z])(?=.*[A-Z])(?=.*[@#$%^&+=])(?=\\S+$).{8,}$")){
@@ -64,57 +50,32 @@ public class AdminController {
            alert.setHeaderText("Ungültiges Passwort");
            alert.setContentText("Das Passwort benötigt mindestens: \n-8 Zeichen\n-einen Kleinbuchstaben\n-einen Großbuchstaben\n-ein Sonderzeichen\n-kein Leerzeichen");
            password.setText("");
-            alert.showAndWait();
-        }
-        else {
-            pwCorrect = true;
        }

-        if(!emailString.matches("^(.+)@(\\S+)$")){
+        if(!emailString.matches("^(?=.{1,64}@)[A-Za-z0-9_-]+(\\\\.[A-Za-z0-9_-]+)*@[^-][A-Za-z0-9-]+(\\\\.[A-Za-z0-9-]+)*(\\\\.[A-Za-z]{2,})$")){
            Alert alert = new Alert(Alert.AlertType.ERROR);
            alert.setTitle("E-Mail");
            alert.setHeaderText("Ungültige E-Mail Adresse");
            alert.setContentText("Bitte geben sie eine gültige E-Mail Adresse an");
            email.setText("");
-            alert.showAndWait();
-        }
-        else{
-            emailCorrect = true;
        }

        //String[] userData = new String[]{ln,fn,pw,emailString};
        //String[] addressData = new String[]{st,nr,plzString,cityString};

+        Address address = new Address(st,nr,plzString,cityString);

-        if(emailCorrect && pwCorrect && userData) {
-            Address address = new Address(st, nr, plzString, cityString);
-            Worker worker = new Worker(ln, fn, pw, emailString, address);
+        Worker worker = new Worker(ln,fn,pw,emailString,address);

-
-            System.out.println(AccountMgr.createWorker(worker));
-
-            Alert alert = new Alert(Alert.AlertType.INFORMATION);
-            alert.setTitle("Bestätigung");
-            alert.setHeaderText("Bestätigung");
-            alert.setContentText("Mitarbeiter " + fn + " " + ln + " wurde Erfolgreich angelegt");
-            alert.showAndWait();
-        }
+        AccountMgr.createWorker(worker);

    }

    @FXML
    protected void onBtCancel(){

-        lastname.setText("");
-        firstname.setText("");
-        street.setText("");
-        number.setText("");
-        city.setText("");
-        plz.setText("");
-        email.setText("");
-        password.setText("");
-
    }


-}
+}
+
--- a/src/main/java/com/bib/essensbestellungsverwaltung/CreateFoodController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/CreateFoodController.java
@@ -1,71 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.RadioButton;
-import javafx.scene.control.TextArea;
-import javafx.scene.control.TextField;
-import javafx.scene.text.Text;
-
-import java.util.ArrayList;
-import java.util.Arrays;
-import java.util.List;
-
-public class CreateFoodController {
-    @FXML
-    public TextField name;
-    @FXML
-    public TextArea description;
-    @FXML
-    public RadioButton isHauptgerichtRadio;
-    @FXML
-    public RadioButton isDessertRadio;
-    @FXML
-    public RadioButton isVegetarischRadio;
-    @FXML
-    public RadioButton isVeganRadio;
-    @FXML
-    public RadioButton isFleischRadio;
-    @FXML
-    public TextArea allergienTextBox;
-    @FXML
-    public Text responseText;
-
-    @FXML
-    public void onAbbrechen(ActionEvent actionEvent) {
-        clearInputs();
-    }
-
-    @FXML
-    public void onHinzufügen(ActionEvent actionEvent) {
-        String gerichtName = name.getText();
-        String beschreibung = description.getText();
-        if(!isHauptgerichtRadio.isSelected() && !isDessertRadio.isSelected()){
-            // art auswähelen
-        }
-        boolean isNachtisch = !isHauptgerichtRadio.isSelected();
-        if(!isVegetarischRadio.isSelected() && !isVeganRadio.isSelected() && isFleischRadio.isSelected()){
-            // Typ auswählen
-        }
-        int ft = isVeganRadio.isSelected() ? 1 : isVeganRadio.isSelected() ? 2 : 3;
-        FoodType foodType = new FoodType(ft, "Vegan");
-        List<Allergy> allergies = new ArrayList<>();
-        // TODO: allergien hinzufügen
-
-        long id = FoodMgr.createFood(new Food(gerichtName, beschreibung, isNachtisch, foodType, allergies));
-        System.out.println("Food created with id: " + id);
-        responseText.setText("New Food Created");
-        clearInputs();
-    }
-
-    private void clearInputs(){
-        name.setText("");
-        description.setText("");
-        isHauptgerichtRadio.setSelected(false);
-        isDessertRadio.setSelected(false);
-        isVeganRadio.setSelected(false);
-        isVegetarischRadio.setSelected(false);
-        isFleischRadio.setSelected(false);
-        allergienTextBox.setText("");
-    }
-}
--- a/src/main/java/com/bib/essensbestellungsverwaltung/CreateFoodplanController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/CreateFoodplanController.java
@@ -1,119 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.collections.FXCollections;
-import javafx.collections.ObservableList;
-import javafx.event.ActionEvent;
-import javafx.fxml.FXML;
-import javafx.scene.control.Alert;
-import javafx.scene.control.Button;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.DatePicker;
-
-import java.time.LocalDate;
-import java.util.List;
-
-public class CreateFoodplanController {
-    @FXML
-    Button erstellenButton;
-    @FXML
-    DatePicker date;
-
-    @FXML
-    ChoiceBox firstMeal;
-
-    @FXML
-    ChoiceBox secondMeal;
-
-    @FXML
-    ChoiceBox firstDessert;
-
-    @FXML
-    ChoiceBox secondDessert;
-
-    private List<Food> foods;
-    private List<Food> desserts;
-    private FoodPlan currentPlan;
-
-
-    @FXML
-    public void initialize() {
-        foods = FoodMgr.getFood(false);
-        desserts = FoodMgr.getFood(true);
-        ObservableList<Object> foodOptions = FXCollections.observableArrayList(foods.stream().map(food -> food.getId() + ": " + food.getName()).toList().toArray(new String[0]));
-        firstMeal.setItems(foodOptions);
-        secondMeal.setItems(foodOptions);
-
-        ObservableList<Object> dessertOptions = FXCollections.observableArrayList(desserts.stream().map(dessert -> dessert.getId() + ": " + dessert.getName()).toList().toArray(new String[0]));
-        firstDessert.setItems(dessertOptions);
-        secondDessert.setItems(dessertOptions);
-
-        date.setValue(LocalDate.now());
-        onDateChange(null);
-    }
-
-    @FXML
-    public void onPlanErstellen(ActionEvent actionEvent) {
-        if (date.getValue() == null ||
-                firstMeal.getValue().toString().isBlank() ||
-                secondMeal.getValue().toString().isBlank() ||
-                firstDessert.getValue().toString().isBlank() ||
-                secondDessert.getValue().toString().isBlank()
-        ) {
-            Alert alert = new Alert(Alert.AlertType.ERROR);
-            alert.setTitle("Ungültige Eingabe");
-            alert.setHeaderText("Es wurden nicht alle Felder ausgefüllt");
-            alert.setContentText("Es kann sein, dass Sie erst Gerichte erstellen müssen, um alle Felder auszufüllen");
-            alert.showAndWait();
-            return;
-        }
-
-
-        int firstMealId = Integer.parseInt(firstMeal.getValue().toString().split(":")[0]);
-        int secondMealId = Integer.parseInt(secondMeal.getValue().toString().split(":")[0]);
-        int firstDessertId = Integer.parseInt(firstDessert.getValue().toString().split(":")[0]);
-        int secondDessertId = Integer.parseInt(secondDessert.getValue().toString().split(":")[0]);
-
-
-
-        Food f1 = foods.stream().filter(food -> food.getId() == firstMealId).findFirst().get();
-        Food f2 = foods.stream().filter(food -> food.getId() == secondMealId).findFirst().get();
-        Food d1 = desserts.stream().filter(dessert -> dessert.getId() == firstDessertId).findFirst().get();
-        Food d2 = desserts.stream().filter(dessert -> dessert.getId() == secondDessertId).findFirst().get();
-
-        String d = date.getValue().toString();
-
-        if (currentPlan != null) { // update Foodplan
-            long id = currentPlan.getId();
-            FoodPlan plan = new FoodPlan(id, d, f1, f2, d1, d2, false);
-            long i = FoodMgr.updateFood_plan(plan);
-            System.out.println("Foodplan updated: " + i);
-        } else { // create new Foodplan
-            FoodPlan plan = new FoodPlan(d, f1, f2, d1, d2);
-            long id = FoodMgr.createFood_plan(plan);
-            System.out.println("Foodplan created with id: " + id);
-        }
-    }
-
-    @FXML
-    public void onAbbrechen(ActionEvent actionEvent) {
-    }
-
-    @FXML
-    public void onDateChange(ActionEvent actionEvent) {
-        currentPlan = FoodMgr.getFoodPlan(date.getValue().toString());
-        if (currentPlan != null) {  // current FoodPlan already exists and can be edited
-            firstMeal.setValue(currentPlan.getFoodVegan().getId() + ": " + currentPlan.getFoodVegan().getName());
-            secondMeal.setValue(currentPlan.getFoodSecond().getId() + ": " + currentPlan.getFoodSecond().getName());
-            firstDessert.setValue(currentPlan.getDessertVegan().getId() + ": " + currentPlan.getDessertVegan().getName());
-            secondDessert.setValue(currentPlan.getDessertSecond().getId() + ": " + currentPlan.getDessertSecond().getName());
-            erstellenButton.setText("Plan updaten");
-        } else { // current Foodplan does not exist
-            erstellenButton.setText("Plan erstellen");
-            firstMeal.setValue(null);
-            secondMeal.setValue(null);
-            firstDessert.setValue(null);
-            secondDessert.setValue(null);
-        }
-
-    }
-}
--- a/src/main/java/com/bib/essensbestellungsverwaltung/FoodMgr.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/FoodMgr.java
@@ -41,20 +41,6 @@ public class FoodMgr {
        return Database.insert("food_plan",food_planH,food_planD);
    }

-    /**
-     * updates a food_plan into the database
-     * @return number of rows affected or -1 on error
-     */
-    public static long updateFood_plan(FoodPlan foodPlan){
-        String[] food_planH = {"id","food1","food2","dessert1","dessert2"};
-        String[] food_planD = {String.valueOf(foodPlan.getId()),
-                String.valueOf(foodPlan.getFoodVegan().getId()),
-                String.valueOf(foodPlan.getFoodSecond().getId()),
-                String.valueOf(foodPlan.getDessertVegan().getId()),
-                String.valueOf(foodPlan.getDessertSecond().getId())};
-        return Database.update("food_plan",food_planH,food_planD);
-    }
-
    /**
     * returns all non desserts or all desserts
     * @param isDessert true for only desserts false for non desserts
@@ -98,9 +84,6 @@ public class FoodMgr {
        String[] food_planH = {"date"};
        String[] food_planD = {date};
        List<String> entry = Database.select("food_plan",food_planH,food_planD);
-        if(entry.size() < 1){
-            return null;
-        }
        String[] parts = entry.get(0).split(":");
        Food foodVegan = getFoodById(Long.parseLong(parts[2]));
        Food foodSecond = getFoodById(Long.parseLong(parts[3]));
--- a/src/main/java/com/bib/essensbestellungsverwaltung/InvoiceController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/InvoiceController.java
@@ -1,67 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.fxml.FXML;
-import javafx.scene.control.ChoiceBox;
-import javafx.scene.control.Spinner;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.text.Text;
-
-import java.util.Calendar;
-
-public class InvoiceController {
-    @FXML
-    Text responseText;
-    @FXML
-    ChoiceBox monatChoiceBox;
-
-    @FXML
-    Spinner jahrSpinner;
-
-    @FXML
-    public void initialize() {
-        monatChoiceBox.setValue(intToMonth(Calendar.getInstance().get(Calendar.MONTH) + 1));
-        jahrSpinner.getValueFactory().setValue(Calendar.getInstance().get(Calendar.YEAR));
-    }
-
-    @FXML
-    void onRechnungErstellenClick(MouseEvent mouseEvent) {
-        responseText.setText(monatChoiceBox.getValue().toString() + jahrSpinner.getValue());
-        // hier rechnung erstellen
-    }
-
-    private int monthToInt(String month) {
-        return switch (month) {
-            case "Januar" -> 1;
-            case "Februar" -> 2;
-            case "März" -> 3;
-            case "April" -> 4;
-            case "Mai" -> 5;
-            case "Juni" -> 6;
-            case "Juli" -> 7;
-            case "August" -> 8;
-            case "September" -> 9;
-            case "Oktober" -> 10;
-            case "November" -> 11;
-            case "Dezember" -> 12;
-            default -> -1;
-        };
-    }
-
-    private String intToMonth(int month) {
-        return switch (month) {
-            case 1 -> "Januar";
-            case 2 -> "Februar";
-            case 3 -> "März";
-            case 4 -> "April";
-            case 5 -> "Mai";
-            case 6 -> "Juni";
-            case 7 -> "Juli";
-            case 8 -> "August";
-            case 9 -> "September";
-            case 10 -> "Oktober";
-            case 11 -> "November";
-            case 12 -> "Dezember";
-            default -> "";
-        };
-    }
-}
--- a/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/LoginController.java
@@ -1,4 +1,4 @@
-/*Richard Reiswich*/
+/*Reshad Meher*/
 package com.bib.essensbestellungsverwaltung;

 import javafx.fxml.FXML;
@@ -15,7 +15,6 @@ import java.util.HashMap;
 public class LoginController {
    @FXML
    private TextField tfEmail;
-
    @FXML
    private PasswordField pfPassword;

@@ -26,18 +25,20 @@ public class LoginController {
        String email = tfEmail.getText();
        String password = pfPassword.getText();
        if(benutzerMap.containsKey(email) && benutzerMap.containsValue(password)){
-            // if user is worker: StartViewApplication.changeScene("workerMenu-view.fxml");
-            StartViewApplication.changeScene("parentMenu-view.fxml");
+            FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("menue-view.fxml"));
+            Scene scene = new Scene(fxmlLoader.load(), 950,480);
+            HelloApplication.primary.setScene(scene);
        }else {
            Alert alert = new Alert(Alert.AlertType.ERROR,"Email oder Passwort ist falsch");
            alert.showAndWait();
        }
-
        tfEmail.setText("");
        pfPassword.setText("");
    }
    @FXML
    protected void changeToSignUp() throws IOException {
-        StartViewApplication.changeScene("signUp-view.fxml");
+        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("signUp-view.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), 950,480);
+        HelloApplication.primary.setScene(scene);
    }
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/MenueController.java
@@ -17,8 +17,9 @@ import java.io.IOException;

 public class MenueController {

-
-    private void setButtonActive(){
-
+    @FXML
+    private void onBtLoginClick(){
+        Alert alert = new Alert(Alert.AlertType.ERROR, "Hi");
+        alert.showAndWait();
    }
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/ParentController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/ParentController.java
@@ -1,4 +1,6 @@
 package com.bib.essensbestellungsverwaltung;

 public class ParentController{
+
+
        }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/ParentMenuController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/ParentMenuController.java
@@ -1,77 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.control.Button;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.BorderPane;
-
-import java.io.IOException;
-
-public class ParentMenuController {
-
-    @FXML
-    BorderPane contentView;
-    @FXML
-    Button essensplanButton;
-    @FXML
-    Button kinderButton;
-    @FXML
-    Button bestellungButton;
-    @FXML
-    Button einstellungenButton;
-
-    @FXML
-    public void initialize() {
-        changePage("menue-view.fxml");
-        setButtonActive(essensplanButton);
-    }
-
-
-    @FXML
-    public void onEssensplanClick(MouseEvent mouseEvent) {
-        setButtonActive(essensplanButton);
-        changePage("menue-view.fxml");
-    }
-
-    @FXML
-    public void onKinderClick(MouseEvent mouseEvent) {
-        setButtonActive(kinderButton);
-        changePage("child-view.fxml");
-    }
-
-    @FXML
-    public void onBestellungClick(MouseEvent mouseEvent) {
-        setButtonActive(bestellungButton);
-        changePage("dailyOrder-view.fxml");
-    }
-
-    @FXML
-    public void onEinstellungenClick(MouseEvent mouseEvent) {
-        setButtonActive(einstellungenButton);
-        changePage("menue-view.fxml");
-    }
-
-    @FXML
-    public void onAusloggenClick(MouseEvent mouseEvent) throws IOException {
-        StartViewApplication.changeScene("workerMenu-view.fxml");
-    }
-
-    private void changePage(String page) {
-        try {
-            Parent root = FXMLLoader.load(getClass().getResource(page));
-            contentView.setCenter(root);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private void setButtonActive(Button b) {
-        einstellungenButton.getStyleClass().remove("active");
-        kinderButton.getStyleClass().remove("active");
-        bestellungButton.getStyleClass().remove("active");
-        essensplanButton.getStyleClass().remove("active");
-        b.getStyleClass().add("active");
-    }
-}
--- a/src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/SettingsController.java
@@ -0,0 +1,4 @@
+package com.bib.essensbestellungsverwaltung;
+
+public class SettingsController {
+}
--- a/src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/SingUpController.java
@@ -1,11 +1,65 @@
+/** Reshad Meher*/
 package com.bib.essensbestellungsverwaltung;

-import javafx.event.ActionEvent;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.scene.control.Alert;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+import java.util.HashMap;

 public class SingUpController {
-    public void onKontoErstellenBtClick(ActionEvent actionEvent) {
+    @FXML
+    private TextField tfEmail;
+    @FXML
+    private TextField tfBestätigungEmail;
+    @FXML
+    private PasswordField pfPasswort;
+    @FXML
+    private PasswordField pfBestätigungPassowrt;
+
+    private HashMap<String, String> benutzermap = new HashMap<>();
+    @FXML
+    private void onKontoErstellenBtClick(){
+        String email = tfEmail.getText();
+        String bestätigungEmail = tfBestätigungEmail.getText();
+        String passwort = pfPasswort.getText();
+        String bestätigungPasswort = pfBestätigungPassowrt.getText();
+        if(!(email.isEmpty() || bestätigungEmail.isEmpty() || passwort.isEmpty() && bestätigungEmail.isEmpty() || bestätigungPasswort.isEmpty())){
+
+            Alert alert;
+            if(bestätigungEmail.equals(email) && bestätigungPasswort.equals(passwort)){
+                 alert = new Alert(Alert.AlertType.CONFIRMATION,"okay");
+                alert.showAndWait();
+                benutzermap.put(email,passwort);
+                System.out.println(benutzermap);
+            }else {
+                 alert = new Alert(Alert.AlertType.ERROR,"Die Eingabe passt nicht.");
+                alert.showAndWait();
+            }
+            tfEmail.setText("");
+            tfBestätigungEmail.setText("");
+            pfPasswort.setText("");
+            pfBestätigungPassowrt.setText("");
+        }
+        else {
+            Alert alert = new Alert(Alert.AlertType.ERROR,"Eingabefield sind leer");
+            alert.showAndWait();
+        }
    }

-    public void onAnmeldenBtClick(ActionEvent actionEvent) {
+    @FXML
+    private void onAnmeldenBtClick() throws IOException {
+        FXMLLoader fxmlLoader = new FXMLLoader(HelloApplication.class.getResource("login-view.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), 950,480);
+        HelloApplication.primary.setScene(scene);
    }
+    public HashMap<String, String> getBenutzermap() {
+        return benutzermap;
+    }
+
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
@@ -7,7 +7,6 @@ package com.bib.essensbestellungsverwaltung;

 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;

@@ -15,12 +14,11 @@ import java.io.IOException;

 public class StartViewApplication extends Application {
    public static Stage primary;
-
    @Override
    public void start(Stage stage) throws IOException {
        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
-        Scene scene = new Scene(fxmlLoader.load(), 1300, 750);
-        primary = stage;
+        Scene scene = new Scene(fxmlLoader.load(), 950,480);
+        //stage = primary;
        stage.setTitle("Essen Bestellung im Kindergarten");
        stage.setScene(scene);
        stage.show();
@@ -36,9 +34,4 @@ public class StartViewApplication extends Application {
        //Database.deleteSample();
        launch();
    }
-
-    public static void changeScene(String scene) throws IOException {
-        Parent p = FXMLLoader.load(StartViewApplication.class.getResource(scene));
-        primary.getScene().setRoot(p);
-    }
 }
--- a/src/main/java/com/bib/essensbestellungsverwaltung/WorkerMenuController.java
+++ b/src/main/java/com/bib/essensbestellungsverwaltung/WorkerMenuController.java
@@ -1,95 +0,0 @@
-package com.bib.essensbestellungsverwaltung;
-
-import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.scene.control.Button;
-import javafx.scene.input.MouseEvent;
-import javafx.scene.layout.BorderPane;
-
-import java.io.IOException;
-
-public class WorkerMenuController {
-    @FXML
-    public BorderPane contentView;
-
-    @FXML
-    Button tagesbestellungButton;
-    @FXML
-    Button wochenplanButton;
-    @FXML
-    Button monatsabrechnungButton;
-    @FXML
-    Button mitarbeiterButton;
-    @FXML
-    Button mahlzeitButton;
-    @FXML
-    Button einstellungenButton;
-
-    @FXML
-    public void initialize() {
-        changePage("menue-view.fxml");
-        setButtonActive(tagesbestellungButton);
-    }
-
-    @FXML
-    public void onTagesbestellungenClick(MouseEvent mouseEvent) {
-        changePage("menue-view.fxml");
-        setButtonActive(tagesbestellungButton);
-    }
-
-    @FXML
-    public void onWochenplanClick(MouseEvent mouseEvent) {
-        changePage("createFoodplan-view.fxml");
-        setButtonActive(wochenplanButton);
-    }
-
-    @FXML
-    public void onMonatsabrechnungClick(MouseEvent mouseEvent) {
-        changePage("invoice-view.fxml");
-        setButtonActive(monatsabrechnungButton);
-    }
-
-
-    @FXML
-    public void onMitarbeiterClick(MouseEvent mouseEvent) {
-        changePage("createCoworker-view.fxml");
-        setButtonActive(mitarbeiterButton);
-    }
-
-
-    @FXML
-    public void onMahlzeitClick(MouseEvent mouseEvent) {
-        changePage("createFood-view.fxml");
-        setButtonActive(mahlzeitButton);
-    }
-
-
-    public void onEinstellungenClick(MouseEvent mouseEvent) {
-        setButtonActive(einstellungenButton);
-    }
-
-    @FXML
-    public void onAusloggenClick(MouseEvent mouseEvent) throws IOException {
-        StartViewApplication.changeScene("parentMenu-view.fxml");
-    }
-
-    private void changePage(String page) {
-        try {
-            Parent root = FXMLLoader.load(getClass().getResource(page));
-            contentView.setCenter(root);
-        } catch (IOException e) {
-            throw new RuntimeException(e);
-        }
-    }
-
-    private void setButtonActive(Button b) {
-        tagesbestellungButton.getStyleClass().remove("active");
-        monatsabrechnungButton.getStyleClass().remove("active");
-        wochenplanButton.getStyleClass().remove("active");
-        mahlzeitButton.getStyleClass().remove("active");
-        mitarbeiterButton.getStyleClass().remove("active");
-        einstellungenButton.getStyleClass().remove("active");
-        b.getStyleClass().add("active");
-    }
-}
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/Neues
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/Neues
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/Neues
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/Neues
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/adminMenue-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/adminMenue-view.fxml
@@ -0,0 +1,109 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane prefHeight="625.0" prefWidth="600.0" stylesheets="@adminMenue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.AdminController">
+   <children>
+      <VBox id="optionsContainer" layoutY="25.0" prefHeight="600.0" prefWidth="300.0" stylesheets="@adminMenue.css">
+         <children>
+            <HBox alignment="CENTER_LEFT" prefHeight="40.0" prefWidth="179.0">
+               <children>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@pics/to-do-list.png" />
+                     </image>
+                  </ImageView>
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Tagesbestellungen" textFill="WHITE">
+                     <font>
+                        <Font size="23.0" />
+                     </font>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" prefHeight="35.0" prefWidth="175.0">
+               <children>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@pics/spreadsheet.png" />
+                     </image>
+                  </ImageView>
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Monatsabrechnung" textFill="WHITE">
+                     <font>
+                        <Font size="23.0" />
+                     </font>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" prefHeight="23.0" prefWidth="175.0">
+               <children>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@pics/calendar.png" />
+                     </image>
+                  </ImageView>
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Wochenplan" textFill="WHITE">
+                     <font>
+                        <Font size="23.0" />
+                     </font>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" prefHeight="0.0" prefWidth="175.0">
+               <children>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@pics/lunch.png" />
+                     </image>
+                  </ImageView>
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Mahlzeit" textFill="WHITE">
+                     <font>
+                        <Font size="23.0" />
+                     </font>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </HBox>
+            <HBox alignment="CENTER_LEFT" prefHeight="26.0" prefWidth="175.0">
+               <children>
+                  <ImageView fitHeight="25.0" fitWidth="25.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@pics/teamwork.png" />
+                     </image>
+                  </ImageView>
+                  <Button id="buttons" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="300.0" style="-fx-background-color: transparent;" text="Mitarbeiter" textFill="WHITE">
+                     <font>
+                        <Font size="23.0" />
+                     </font>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="5.0" left="5.0" right="5.0" top="5.0" />
+               </padding>
+            </HBox>
+         </children>
+      </VBox>
+      <HBox id="optionsContainer" alignment="TOP_RIGHT" prefHeight="25.0" prefWidth="1200.0" style="-fx-background-color: lightblue;">
+         <children>
+            <Button mnemonicParsing="false" style="-fx-background-color: transparent;" text="Hallo, [Nutzername]" textFill="WHITE" />
+         </children>
+      </HBox>
+   </children>
+</AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/adminMenue.css
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/adminMenue.css
@@ -0,0 +1,12 @@
+#buttons:hover{
+    -fx-underline: true;
+    -fx-background-color: rgba(85, 103, 136, 0.64);
+}
+
+#buttons:pressed{
+    -fx-background-color: #748d96;
+}
+
+#optionsContainer{
+    -fx-background-color: lightblue;
+}
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml
@@ -12,14 +12,14 @@
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>

-<AnchorPane prefHeight="700.0" prefWidth="950.0" stylesheets="@child.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.ParentController">
+<AnchorPane prefHeight="760.0" prefWidth="867.0" stylesheets="@child.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.ParentController">
   <children>
      <Text layoutX="51.0" layoutY="90.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Kinder">
         <font>
            <Font size="58.0" />
         </font>
      </Text>
-      <HBox id="contentContainer" alignment="CENTER" layoutX="8.0" layoutY="165.0" prefHeight="331.0" prefWidth="937.0">
+      <HBox id="contentContainer" alignment="CENTER" layoutX="48.0" layoutY="244.0" prefHeight="250.0" prefWidth="770.0">
         <children>
            <VBox id="contentContainer" prefHeight="250.0" prefWidth="256.0">
               <children>
@@ -95,6 +95,6 @@
            </VBox>
         </children>
      </HBox>
-      <Button id="btAddChild" layoutX="419.0" layoutY="502.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="125.0" text="Kind hinzufügen" />
+      <Button id="btAddChild" layoutX="360.0" layoutY="592.0" mnemonicParsing="false" prefHeight="26.0" prefWidth="146.0" text="Kind hinzufügen" />
   </children>
 </AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml
@@ -11,147 +11,147 @@
 <?import javafx.scene.text.Font?>

 <AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="860.0" prefWidth="850.0" stylesheets="@createCoworker.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.AdminController">
-    <children>
-        <Label layoutX="301.0" layoutY="49.0" />
-        <Label layoutX="223.0" layoutY="76.0" prefHeight="28.0" prefWidth="220.0" text="Mitarbeiter hinzufügen">
-            <font>
-                <Font size="18.0" />
-            </font>
-        </Label>
-        <VBox layoutX="223.0" layoutY="149.0" prefHeight="317.0" prefWidth="514.0">
-            <children>
-                <HBox prefHeight="43.0" prefWidth="331.0">
-                    <children>
-                        <Label prefHeight="17.0" prefWidth="116.0" text="Nachname">
-                            <font>
-                                <Font size="16.0" />
-                            </font>
-                        </Label>
-                        <TextField fx:id="lastname" prefHeight="25.0" prefWidth="194.0" />
-                    </children>
-                </HBox>
-                <HBox prefHeight="60.0" prefWidth="331.0">
-                    <children>
-                        <Label prefHeight="35.0" prefWidth="118.0" text="Vorname">
-                            <padding>
-                                <Insets top="10.0" />
-                            </padding>
-                            <font>
-                                <Font size="16.0" />
-                            </font>
-                        </Label>
-                        <TextField fx:id="firstname" prefHeight="25.0" prefWidth="193.0">
-                            <HBox.margin>
-                                <Insets top="10.0" />
-                            </HBox.margin>
-                        </TextField>
-                    </children>
-                </HBox>
-                <HBox prefHeight="100.0" prefWidth="200.0">
-                    <children>
-                        <Label prefHeight="35.0" prefWidth="116.0" text="Straße">
-                            <font>
-                                <Font size="16.0" />
-                            </font>
-                            <padding>
-                                <Insets top="10.0" />
-                            </padding>
-                        </Label>
-                        <TextField fx:id="street" prefHeight="25.0" prefWidth="195.0">
-                            <HBox.margin>
-                                <Insets top="10.0" />
-                            </HBox.margin>
-                        </TextField>
-                    </children>
-                </HBox>
-                <HBox prefHeight="100.0" prefWidth="200.0">
-                    <children>
-                        <Label prefHeight="25.0" prefWidth="118.0" text="Hausnummer">
-                            <font>
-                                <Font size="16.0" />
-                            </font>
-                            <padding>
-                                <Insets top="10.0" />
-                            </padding>
-                        </Label>
-                        <TextField fx:id="number" prefHeight="25.0" prefWidth="87.0">
-                            <HBox.margin>
-                                <Insets top="10.0" />
-                            </HBox.margin>
-                        </TextField>
-                    </children>
-                </HBox>
-                <HBox prefHeight="24.0" prefWidth="331.0">
-                    <children>
-                        <Label prefHeight="25.0" prefWidth="118.0" text="PLZ">
-                            <font>
-                                <Font size="16.0" />
-                            </font>
-                        </Label>
-                        <TextField fx:id="plz" prefHeight="25.0" prefWidth="87.0">
-                            <HBox.margin>
-                                <Insets />
-                            </HBox.margin>
-                        </TextField>
-                    </children>
-                    <padding>
+   <children>
+      <Label layoutX="301.0" layoutY="49.0" />
+      <Label layoutX="223.0" layoutY="76.0" prefHeight="28.0" prefWidth="220.0" text="Mitarbeiter hinzufügen">
+         <font>
+            <Font size="18.0" />
+         </font>
+      </Label>
+      <VBox layoutX="223.0" layoutY="149.0" prefHeight="317.0" prefWidth="514.0">
+         <children>
+            <HBox prefHeight="43.0" prefWidth="331.0">
+               <children>
+                  <Label prefHeight="17.0" prefWidth="116.0" text="Nachname">
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                  </Label>
+                  <TextField id="lastname" prefHeight="25.0" prefWidth="194.0" />
+               </children>
+            </HBox>
+            <HBox prefHeight="60.0" prefWidth="331.0">
+               <children>
+                  <Label prefHeight="35.0" prefWidth="118.0" text="Vorname">
+                     <padding>
                        <Insets top="10.0" />
-                    </padding>
-                </HBox>
-                <HBox prefHeight="100.0" prefWidth="200.0">
-                    <children>
-                        <Label prefHeight="35.0" prefWidth="120.0" text="Stadt">
-                            <font>
-                                <Font size="16.0" />
-                            </font>
-                        </Label>
-                        <TextField fx:id="city" prefHeight="13.0" prefWidth="194.0">
-                            <HBox.margin>
-                                <Insets top="5.0" />
-                            </HBox.margin>
-                        </TextField>
-                    </children>
-                    <padding>
+                     </padding>
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                  </Label>
+                  <TextField id="firstname" prefHeight="25.0" prefWidth="193.0">
+                     <HBox.margin>
                        <Insets top="10.0" />
-                    </padding>
-                </HBox>
-                <HBox prefHeight="100.0" prefWidth="200.0">
-                    <children>
-                        <Label prefHeight="35.0" prefWidth="117.0" text="Email">
-                            <font>
-                                <Font size="16.0" />
-                            </font>
-                            <padding>
-                                <Insets top="10.0" />
-                            </padding>
-                        </Label>
-                        <TextField fx:id="email" prefHeight="25.0" prefWidth="196.0">
-                            <HBox.margin>
-                                <Insets top="10.0" />
-                            </HBox.margin>
-                        </TextField>
-                    </children>
-                </HBox>
-                <HBox prefHeight="100.0" prefWidth="471.0">
-                    <children>
-                        <Label prefHeight="35.0" prefWidth="122.0" text="Passwort">
-                            <font>
-                                <Font size="16.0" />
-                            </font>
-                            <padding>
-                                <Insets top="10.0" />
-                            </padding>
-                        </Label>
-                        <PasswordField fx:id="password" accessibleRole="PASSWORD_FIELD" prefHeight="25.0" prefWidth="194.0">
-                            <HBox.margin>
-                                <Insets top="10.0" />
-                            </HBox.margin>
-                        </PasswordField>
-                    </children>
-                </HBox>
-            </children>
-        </VBox>
-        <Button id="btCreateCoworker" fx:id="btCreateCoworker" layoutX="216.0" layoutY="533.0" mnemonicParsing="false" onAction="#onBtSignUp" prefHeight="44.0" prefWidth="158.0" text="Mitarbeiter hinzufügen" />
-        <Button id="btCancelCoworker" fx:id="btCancelCoworker" layoutX="443.0" layoutY="533.0" mnemonicParsing="false" onAction="#onBtCancel" prefHeight="44.0" prefWidth="158.0" text="Abbrechen" />
-    </children>
+                     </HBox.margin>
+                  </TextField>
+               </children>
+            </HBox>
+            <HBox prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <Label prefHeight="35.0" prefWidth="116.0" text="Straße">
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                     <padding>
+                        <Insets top="10.0" />
+                     </padding>
+                  </Label>
+                  <TextField id="street" prefHeight="25.0" prefWidth="195.0">
+                     <HBox.margin>
+                        <Insets top="10.0" />
+                     </HBox.margin>
+                  </TextField>
+               </children>
+            </HBox>
+            <HBox prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <Label prefHeight="25.0" prefWidth="118.0" text="Hausnummer">
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                     <padding>
+                        <Insets top="10.0" />
+                     </padding>
+                  </Label>
+                  <TextField id="number" prefHeight="25.0" prefWidth="87.0">
+                     <HBox.margin>
+                        <Insets top="10.0" />
+                     </HBox.margin>
+                  </TextField>
+               </children>
+            </HBox>
+            <HBox prefHeight="24.0" prefWidth="331.0">
+               <children>
+                  <Label prefHeight="25.0" prefWidth="118.0" text="PLZ">
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                  </Label>
+                  <TextField id="plz" prefHeight="25.0" prefWidth="87.0">
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                  </TextField>
+               </children>
+               <padding>
+                  <Insets top="10.0" />
+               </padding>
+            </HBox>
+            <HBox prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <Label prefHeight="35.0" prefWidth="120.0" text="Stadt">
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                  </Label>
+                  <TextField id="city" prefHeight="13.0" prefWidth="194.0">
+                     <HBox.margin>
+                        <Insets top="5.0" />
+                     </HBox.margin>
+                  </TextField>
+               </children>
+               <padding>
+                  <Insets top="10.0" />
+               </padding>
+            </HBox>
+            <HBox prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <Label prefHeight="35.0" prefWidth="117.0" text="Email">
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                     <padding>
+                        <Insets top="10.0" />
+                     </padding>
+                  </Label>
+                  <TextField id="email" prefHeight="25.0" prefWidth="196.0">
+                     <HBox.margin>
+                        <Insets top="10.0" />
+                     </HBox.margin>
+                  </TextField>
+               </children>
+            </HBox>
+            <HBox prefHeight="100.0" prefWidth="471.0">
+               <children>
+                  <Label prefHeight="35.0" prefWidth="122.0" text="Passwort">
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                     <padding>
+                        <Insets top="10.0" />
+                     </padding>
+                  </Label>
+                  <PasswordField id="password" accessibleRole="PASSWORD_FIELD" prefHeight="25.0" prefWidth="194.0">
+                     <HBox.margin>
+                        <Insets top="10.0" />
+                     </HBox.margin>
+                  </PasswordField>
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+      <Button id="btCreateCoworker" fx:id="btCreateCoworker" layoutX="216.0" layoutY="533.0" mnemonicParsing="false" onAction="#onBtSignUp" prefHeight="44.0" prefWidth="158.0" text="Mitarbeiter hinzufügen" />
+      <Button id="btCancelCoworker" fx:id="btCancelCoworker" layoutX="443.0" layoutY="533.0" mnemonicParsing="false" onAction="#onBtCancel" prefHeight="44.0" prefWidth="158.0" text="Abbrechen" />
+   </children>
 </AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/createFood-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/createFood-view.fxml
@@ -5,103 +5,92 @@
 <?import javafx.scene.layout.*?>
 <?import javafx.scene.text.*?>

-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="731.0" stylesheets="@createFood.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.CreateFoodController">
-    <children>
-        <Label alignment="CENTER" layoutX="247.0" layoutY="29.0" prefHeight="44.0" prefWidth="237.0" text="Gericht hinzufügen">
-            <font>
-                <Font size="18.0" />
-            </font>
-        </Label>
-        <VBox layoutX="136.0" layoutY="73.0" prefHeight="388.0" prefWidth="459.0">
-            <children>
-                <HBox prefHeight="75.0" prefWidth="459.0">
-                    <children>
-                        <Label prefHeight="33.0" prefWidth="121.0" text="Name des Gerichts" />
-                        <TextField fx:id="name" prefHeight="25.0" prefWidth="290.0">
-                            <HBox.margin>
-                                <Insets top="5.0" />
-                            </HBox.margin>
-                        </TextField>
-                    </children>
-                </HBox>
-                <HBox prefHeight="75.0" prefWidth="459.0">
-                    <children>
-                        <Label prefHeight="33.0" prefWidth="121.0" text="Beschreibung" />
-                        <TextArea fx:id="description" prefHeight="75.0" prefWidth="290.0" />
-                    </children>
-                    <padding>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="521.0" prefWidth="731.0" stylesheets="@createFood.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <Label alignment="CENTER" layoutX="247.0" layoutY="29.0" prefHeight="44.0" prefWidth="237.0" text="Gericht hinzufügen">
+         <font>
+            <Font size="18.0" />
+         </font>
+      </Label>
+      <VBox layoutX="136.0" layoutY="73.0" prefHeight="389.0" prefWidth="459.0">
+         <children>
+            <HBox prefHeight="75.0" prefWidth="459.0">
+               <children>
+                  <Label prefHeight="33.0" prefWidth="121.0" text="Name des Gerichts" />
+                  <TextField prefHeight="25.0" prefWidth="290.0">
+                     <HBox.margin>
                        <Insets top="5.0" />
-                    </padding>
-                </HBox>
-                <HBox prefHeight="75.0" prefWidth="459.0">
-                    <children>
-                        <Label text="Art des Gerichts">
-                            <HBox.margin>
-                                <Insets top="20.0" />
-                            </HBox.margin>
-                        </Label>
-                        <RadioButton fx:id="isHauptgerichtRadio" mnemonicParsing="false" text="Hauptgericht">
-                            <HBox.margin>
-                                <Insets left="35.0" top="20.0" />
-                            </HBox.margin>
-                     <toggleGroup>
-                        <ToggleGroup fx:id="art" />
-                     </toggleGroup>
-                        </RadioButton>
-                        <RadioButton fx:id="isDessertRadio" mnemonicParsing="false" text="Dessert" toggleGroup="$art">
-                            <HBox.margin>
-                                <Insets left="50.0" top="20.0" />
-                            </HBox.margin>
-                        </RadioButton>
-                    </children>
-                    <VBox.margin>
-                        <Insets />
-                    </VBox.margin>
-                    <padding>
-                        <Insets top="5.0" />
-                    </padding>
-                </HBox>
-                <HBox prefHeight="75.0" prefWidth="459.0">
-                    <children>
-                        <Label text="Typ">
-                            <HBox.margin>
-                                <Insets top="20.0" />
-                            </HBox.margin>
-                        </Label>
-                        <RadioButton fx:id="isVegetarischRadio" mnemonicParsing="false" prefHeight="17.0" prefWidth="91.0" text="Vegetarisch">
-                            <HBox.margin>
-                                <Insets left="100.0" top="20.0" />
-                            </HBox.margin>
-                     <toggleGroup>
-                        <ToggleGroup fx:id="typ" />
-                     </toggleGroup>
-                        </RadioButton>
-                        <RadioButton fx:id="isVeganRadio" mnemonicParsing="false" text="Vegan" toggleGroup="$typ">
-                            <HBox.margin>
-                                <Insets left="20.0" top="20.0" />
-                            </HBox.margin>
-                        </RadioButton>
-                        <RadioButton fx:id="isFleischRadio" mnemonicParsing="false" text="Fleisch" toggleGroup="$typ">
-                            <HBox.margin>
-                                <Insets left="40.0" top="20.0" />
-                            </HBox.margin>
-                        </RadioButton>
-                    </children>
-                </HBox>
-                <HBox prefHeight="76.0" prefWidth="459.0">
-                    <children>
-                        <Label prefHeight="41.0" prefWidth="171.0" text="Allergien mit Komma getrennt" />
-                        <TextArea fx:id="allergienTextBox" prefHeight="76.0" prefWidth="246.0" />
-                    </children>
-                </HBox>
-            <Text fx:id="responseText" fill="RED" strokeType="OUTSIDE" strokeWidth="0.0" textAlignment="CENTER" wrappingWidth="459.13673400878906">
+                     </HBox.margin>
+                  </TextField>
+               </children>
+            </HBox>
+            <HBox prefHeight="75.0" prefWidth="459.0">
+               <children>
+                  <Label prefHeight="33.0" prefWidth="121.0" text="Beschreibung" />
+                  <TextArea prefHeight="75.0" prefWidth="290.0" />
+               </children>
+               <padding>
+                  <Insets top="5.0" />
+               </padding>
+            </HBox>
+            <HBox prefHeight="75.0" prefWidth="459.0">
+               <children>
+                  <Label text="Art des Gerichts">
+                     <HBox.margin>
+                        <Insets top="20.0" />
+                     </HBox.margin>
+                  </Label>
+                  <RadioButton mnemonicParsing="false" text="Hauptgericht">
+                     <HBox.margin>
+                        <Insets left="35.0" top="20.0" />
+                     </HBox.margin>
+                  </RadioButton>
+                  <RadioButton mnemonicParsing="false" text="Dessert">
+                     <HBox.margin>
+                        <Insets left="50.0" top="20.0" />
+                     </HBox.margin>
+                  </RadioButton>
+               </children>
               <VBox.margin>
-                  <Insets top="20.0" />
+                  <Insets />
               </VBox.margin>
-            </Text>
-            </children>
-        </VBox>
-        <Button id="btCreateFood" layoutX="484.0" layoutY="481.0" mnemonicParsing="false" onAction="#onHinzufügen" prefHeight="34.0" prefWidth="146.0" text="Hinzufügen" />
-        <Button id="btCancelFood" layoutX="102.0" layoutY="473.0" mnemonicParsing="false" onAction="#onAbbrechen" prefHeight="50.0" prefWidth="162.0" text="Abbrechen" />
-    </children>
+               <padding>
+                  <Insets top="5.0" />
+               </padding>
+            </HBox>
+            <HBox prefHeight="75.0" prefWidth="459.0">
+               <children>
+                  <Label text="Typ">
+                     <HBox.margin>
+                        <Insets top="20.0" />
+                     </HBox.margin>
+                  </Label>
+                  <RadioButton mnemonicParsing="false" prefHeight="17.0" prefWidth="91.0" text="Vegetarisch">
+                     <HBox.margin>
+                        <Insets left="100.0" top="20.0" />
+                     </HBox.margin>
+                  </RadioButton>
+                  <RadioButton mnemonicParsing="false" text="Vegan">
+                     <HBox.margin>
+                        <Insets left="20.0" top="20.0" />
+                     </HBox.margin>
+                  </RadioButton>
+                  <RadioButton mnemonicParsing="false" text="Fleisch">
+                     <HBox.margin>
+                        <Insets left="40.0" top="20.0" />
+                     </HBox.margin>
+                  </RadioButton>
+               </children>
+            </HBox>
+            <HBox prefHeight="76.0" prefWidth="459.0">
+               <children>
+                  <Label prefHeight="41.0" prefWidth="171.0" text="Allergien mit Komma getrennt" />
+                  <TextArea prefHeight="76.0" prefWidth="246.0" />
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+      <Button id="btCreateFood" layoutX="485.0" layoutY="464.0" mnemonicParsing="false" prefHeight="34.0" prefWidth="146.0" text="Hinzufügen" />
+      <Button id="btCancelFood" layoutX="102.0" layoutY="456.0" mnemonicParsing="false" prefHeight="50.0" prefWidth="162.0" text="Abbrechen" />
+   </children>
 </AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/createFoodplan-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/createFoodplan-view.fxml
@@ -1,83 +1,87 @@
 <?xml version="1.0" encoding="UTF-8"?>

-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>

-<HBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="700.0" prefWidth="950.0" stylesheets="@createFoodplan.css" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.CreateFoodplanController">
-    <children>
-        <VBox alignment="CENTER" prefHeight="599.0" prefWidth="357.0" spacing="20.0">
-            <children>
-                <Label text="Essensplan erstellen">
-                    <font>
-                        <Font size="18.0" />
-                    </font>
-                </Label>
-                <VBox prefHeight="285.0" prefWidth="358.0">
-                    <children>
-                        <HBox prefHeight="50.0" prefWidth="632.0">
-                            <children>
-                                <Label prefHeight="17.0" prefWidth="133.0" text="Datum JJJJ-MMM-TT">
-                                    <HBox.margin>
-                                        <Insets top="5.0" />
-                                    </HBox.margin>
-                                </Label>
-                                <DatePicker fx:id="date" onAction="#onDateChange" />
-                            </children>
-                        </HBox>
-                        <HBox prefHeight="50.0" prefWidth="632.0">
-                            <children>
-                                <Label prefHeight="17.0" prefWidth="133.0" text="Veganes Hauptgericht">
-                                    <HBox.margin>
-                                        <Insets top="5.0" />
-                                    </HBox.margin>
-                                </Label>
-                                <ChoiceBox fx:id="firstMeal" prefWidth="150.0" />
-                            </children>
-                        </HBox>
-                        <HBox prefHeight="50.0" prefWidth="632.0">
-                            <children>
-                                <Label prefHeight="17.0" prefWidth="133.0" text="Zweites Hauptgericht">
-                                    <HBox.margin>
-                                        <Insets top="5.0" />
-                                    </HBox.margin>
-                                </Label>
-                                <ChoiceBox fx:id="secondMeal" prefWidth="150.0" />
-                            </children>
-                        </HBox>
-                        <HBox prefHeight="50.0" prefWidth="632.0">
-                            <children>
-                                <Label prefHeight="17.0" prefWidth="133.0" text="Veganes Dessert">
-                                    <HBox.margin>
-                                        <Insets />
-                                    </HBox.margin>
-                                    <padding>
-                                        <Insets top="5.0" />
-                                    </padding>
-                                </Label>
-                                <ChoiceBox fx:id="firstDessert" prefWidth="150.0" />
-                            </children>
-                        </HBox>
-                        <HBox prefHeight="50.0" prefWidth="632.0">
-                            <children>
-                                <Label prefHeight="17.0" prefWidth="133.0" text="Zweites Dessert">
-                                    <padding>
-                                        <Insets top="5.0" />
-                                    </padding>
-                                </Label>
-                                <ChoiceBox fx:id="secondDessert" prefWidth="150.0" />
-                            </children>
-                        </HBox>
-                        <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
-                            <children>
-                                <Button id="btCreateFoodplan" fx:id="erstellenButton" mnemonicParsing="false" onAction="#onPlanErstellen" prefHeight="68.0" prefWidth="133.0" text="Plan erstellen" />
-                                <Button id="btCancelFoodplan" mnemonicParsing="false" onAction="#onAbbrechen" prefHeight="68.0" prefWidth="133.0" text="Abbrechen" />
-                            </children>
-                        </HBox>
-                    </children>
-                </VBox>
-            </children>
-        </VBox>
-    </children>
-</HBox>
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="599.0" prefWidth="900.0" stylesheets="@createFoodplan.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <Label layoutX="359.0" layoutY="36.0" text="Essensplan erstellen">
+         <font>
+            <Font size="18.0" />
+         </font>
+      </Label>
+      <VBox layoutX="134.0" layoutY="124.0" prefHeight="327.0" prefWidth="632.0">
+         <children>
+            <HBox prefHeight="50.0" prefWidth="632.0">
+               <children>
+                  <Label prefHeight="17.0" prefWidth="133.0" text="Datum JJJJ-MMM-TT">
+                     <HBox.margin>
+                        <Insets top="5.0" />
+                     </HBox.margin>
+                  </Label>
+                  <TextField />
+               </children>
+            </HBox>
+            <HBox prefHeight="50.0" prefWidth="632.0">
+               <children>
+                  <Label prefHeight="17.0" prefWidth="133.0" text="Veganes Hauptgericht">
+                     <HBox.margin>
+                        <Insets top="5.0" />
+                     </HBox.margin>
+                  </Label>
+                  <TextField>
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                  </TextField>
+               </children>
+            </HBox>
+            <HBox prefHeight="50.0" prefWidth="632.0">
+               <children>
+                  <Label prefHeight="17.0" prefWidth="133.0" text="Zweites Hauptgericht">
+                     <HBox.margin>
+                        <Insets top="5.0" />
+                     </HBox.margin>
+                  </Label>
+                  <TextField>
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                  </TextField>
+               </children>
+            </HBox>
+            <HBox prefHeight="50.0" prefWidth="632.0">
+               <children>
+                  <Label prefHeight="17.0" prefWidth="133.0" text="Veganes Dessert">
+                     <HBox.margin>
+                        <Insets />
+                     </HBox.margin>
+                     <padding>
+                        <Insets top="5.0" />
+                     </padding>
+                  </Label>
+                  <TextField />
+               </children>
+            </HBox>
+            <HBox prefHeight="50.0" prefWidth="632.0">
+               <children>
+                  <Label prefHeight="17.0" prefWidth="133.0" text="Zweites Dessert">
+                     <padding>
+                        <Insets top="5.0" />
+                     </padding>
+                  </Label>
+                  <TextField />
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+      <Button id="btCreateFoodplan" layoutX="112.0" layoutY="427.0" mnemonicParsing="false" prefHeight="68.0" prefWidth="133.0" text="Plan erstellen" />
+      <Button id="btCancelFoodplan" layoutX="299.0" layoutY="427.0" mnemonicParsing="false" prefHeight="68.0" prefWidth="133.0" text="Abbrechen" />
+   </children>
+</AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/hello-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/hello-view.fxml
@@ -0,0 +1,30 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.control.PasswordField?>
+<GridPane hgap="10.0" vgap="10.0"
+          xmlns:fx="http://javafx.com/fxml/1"
+          xmlns="http://javafx.com/javafx/11.0.2"
+          fx:controller="com.bib.essensbestellungsverwaltung.HelloController">
+    <padding>
+        <Insets bottom="20.0" left="20.0" right="20.0" top="20.0"/>
+    </padding>
+    <Label text="Bitte geben Sie Ihre Anmeldedaten ein."
+           GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="0" />
+    <Label text="Benutzername:"
+           GridPane.columnIndex="0" GridPane.rowIndex="1" />
+    <TextField fx:id="unsernameEingabe"
+               GridPane.columnIndex="1" GridPane.rowIndex="1"/>
+    <Label text="Passwort:"
+            GridPane.columnIndex="0" GridPane.rowIndex="2" />
+    <PasswordField fx:id="passwortEingabe"
+                   GridPane.columnIndex="1" GridPane.rowIndex="2"/>
+    <Button text="LOGIN" onAction="#onLoginButtonClick"
+            GridPane.columnIndex="1" GridPane.rowIndex="3" />
+    <Label fx:id="lblAusgabe"
+           GridPane.columnIndex="0" GridPane.columnSpan="2" GridPane.rowIndex="4"/>
+</GridPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/invoice-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/invoice-view.fxml
@@ -1,64 +1,14 @@
 <?xml version="1.0" encoding="UTF-8"?>

 <?import java.lang.*?>
-<?import javafx.collections.*?>
-<?import javafx.geometry.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
 <?import javafx.scene.control.*?>
 <?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>

-<HBox alignment="CENTER" maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="700.0" prefWidth="950.0" xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.InvoiceController">
-   <children>
-      <VBox alignment="CENTER" prefHeight="860.0" prefWidth="500.0">
-         <children>
-            <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Abrechnung erstellen">
-               <font>
-                  <Font name="System Bold" size="25.0" />
-               </font></Text>
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="122.0" spacing="20.0">
-               <children>
-                  <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
-                     <children>
-                        <Label text="Jahr" />
-                         <Spinner fx:id="jahrSpinner">
-                             <valueFactory>
-                                 <SpinnerValueFactory.IntegerSpinnerValueFactory initialValue="2023" max="2100" min="2020" />
-                             </valueFactory>
-                         </Spinner>
-                     </children>
-                  </VBox>
-                  <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0">
-                     <children>
-                        <Label text="Monat" />
-                         <ChoiceBox fx:id="monatChoiceBox" value="Januar">
-                             <items>
-                                 <FXCollections fx:factory="observableArrayList">
-                                     <String fx:value="Januar" />
-                                     <String fx:value="Februar" />
-                                     <String fx:value="März" />
-                                     <String fx:value="April" />
-                                     <String fx:value="Mai" />
-                                     <String fx:value="Juni" />
-                                     <String fx:value="Juli" />
-                                     <String fx:value="August" />
-                                     <String fx:value="September" />
-                                     <String fx:value="Oktober" />
-                                     <String fx:value="November" />
-                                     <String fx:value="Dezember" />
-                                 </FXCollections>
-                             </items>
-                         </ChoiceBox>
-                     </children>
-                  </VBox>
-               </children>
-            </HBox>
-            <Button mnemonicParsing="false" onMouseClicked="#onRechnungErstellenClick" text="Rechnung erstellen" />
-            <Text fx:id="responseText" strokeType="OUTSIDE" strokeWidth="0.0">
-               <VBox.margin>
-                  <Insets top="100.0" />
-               </VBox.margin>
-            </Text>
-         </children>
-      </VBox>
-   </children>
-</HBox>
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="com.bib.essensbestellungsverwaltung.AdminController"
+            prefHeight="400.0" prefWidth="600.0">
+
+</AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/launch-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/launch-view.fxml
@@ -0,0 +1,147 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane prefHeight="536.0" prefWidth="929.0" style="-fx-background-color: lightblue;" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.MenueController">
+   <children>
+      <Label alignment="CENTER" layoutX="14.0" layoutY="14.0" prefHeight="35.0" prefWidth="895.0" text="Essenbestellung">
+         <font>
+            <Font size="28.0"/>
+         </font>
+      </Label>
+      <Button alignment="CENTER" layoutX="868.0" layoutY="61.0" mnemonicParsing="false" style="-fx-background-color: white;" text="Login" />
+      <VBox layoutX="14.0" layoutY="100.0" prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+         <children>
+            <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Montag" textAlignment="CENTER">
+               <VBox.margin>
+                  <Insets bottom="10.0" />
+               </VBox.margin>
+               <font>
+                  <Font size="18.0" />
+               </font>
+            </Label>
+            <Label prefHeight="18.0" prefWidth="180.0" text="Hauptgericht" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Button">
+               <VBox.margin>
+                  <Insets />
+               </VBox.margin>
+            </Button>
+            <Label prefHeight="18.0" prefWidth="174.0" text="Dessert">
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </Label>
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Button" />
+         </children>
+      </VBox>
+      <VBox layoutX="194.0" layoutY="100.0" prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+         <children>
+            <Label alignment="CENTER" prefHeight="18.0" prefWidth="210.0" text="Dienstag">
+               <font>
+                  <Font size="18.0" />
+               </font>
+            </Label>
+            <Label prefHeight="18.0" prefWidth="182.0" text="Hauptgericht">
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </Label>
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Button" />
+            <Label prefHeight="18.0" prefWidth="183.0" text="Dessert">
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </Label>
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Button" />
+         </children>
+      </VBox>
+      <VBox layoutX="554.0" layoutY="100.0" prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+         <children>
+            <Label alignment="CENTER" prefHeight="18.0" prefWidth="214.0" text="Donnerstag">
+               <font>
+                  <Font size="18.0" />
+               </font>
+            </Label>
+            <Label prefHeight="18.0" prefWidth="178.0" text="Hauptgericht">
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </Label>
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+            <Label prefHeight="18.0" prefWidth="186.0" text="Dessert">
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </Label>
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+         </children>
+      </VBox>
+      <VBox layoutX="374.0" layoutY="100.0" prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+         <children>
+            <Label alignment="CENTER" prefHeight="18.0" prefWidth="212.0" text="Mittwoch">
+               <font>
+                  <Font size="18.0" />
+               </font>
+            </Label>
+            <Label prefHeight="18.0" prefWidth="176.0" text="Hauptgericht">
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </Label>
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+            <Label prefHeight="18.0" prefWidth="177.0" text="Dessert">
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </Label>
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+         </children>
+      </VBox>
+      <VBox layoutX="734.0" layoutY="100.0" prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+         <children>
+            <Label alignment="CENTER" prefHeight="18.0" prefWidth="200.0" text="Freitag">
+               <font>
+                  <Font size="18.0" />
+               </font>
+            </Label>
+            <Label prefHeight="18.0" prefWidth="190.0" text="Hauptgericht">
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </Label>
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+            <Label prefHeight="18.0" prefWidth="190.0" text="Dessert">
+               <VBox.margin>
+                  <Insets top="10.0" />
+               </VBox.margin>
+            </Label>
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Button" />
+            <Button alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="218.0" text="Button" />
+         </children>
+      </VBox>
+   </children>
+</AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml
@@ -10,15 +10,15 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>

-<AnchorPane prefHeight="750.0" prefWidth="950.0" stylesheets="@menue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.MenueController">
+<AnchorPane prefHeight="600.0" prefWidth="900.0" stylesheets="@menue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.MenueController">
   <children>
-      <Label alignment="CENTER" layoutX="392.0" layoutY="25.0" prefHeight="40.0" prefWidth="223.0" text="Essen bestellen">
+      <Label alignment="CENTER" layoutX="14.0" layoutY="14.0" prefHeight="35.0" prefWidth="895.0" text="Essenbestellung">
         <font>
            <Font size="28.0" />
         </font>
      </Label>
      <Button id="btLogin" alignment="CENTER" layoutX="848.0" layoutY="34.0" mnemonicParsing="false" text="Login" />
-      <HBox layoutX="220.0" layoutY="87.0" prefHeight="570.0" prefWidth="688.0">
+      <HBox layoutX="220.0" layoutY="87.0" prefHeight="414.0" prefWidth="688.0">
         <children>
            <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
               <children>
@@ -30,35 +30,17 @@
                        <Font size="18.0" />
                     </font>
                  </Label>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin></Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin></Button>
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
                     <VBox.margin>
-                        <Insets bottom="30.0" top="10.0" />
+                        <Insets bottom="20.0" />
                     </VBox.margin>
                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin></Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin></Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert">
-                     <VBox.margin>
-                        <Insets top="10.0" />
-                     </VBox.margin></Button>
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
               </children>
-               <HBox.margin>
-                  <Insets />
-               </HBox.margin>
            </VBox>
            <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
               <children>
@@ -70,36 +52,16 @@
                        <Font size="18.0" />
                     </font>
                  </Label>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
                     <VBox.margin>
-                        <Insets bottom="30.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert">
-                     <VBox.margin>
-                        <Insets top="10.0" />
+                        <Insets bottom="20.0" />
                     </VBox.margin>
                  </Button>
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
               </children>
            </VBox>
            <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
@@ -112,36 +74,16 @@
                        <Font size="18.0" />
                     </font>
                  </Label>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
                     <VBox.margin>
-                        <Insets bottom="30.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert">
-                     <VBox.margin>
-                        <Insets top="10.0" />
+                        <Insets bottom="20.0" />
                     </VBox.margin>
                  </Button>
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
               </children>
            </VBox>
            <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
@@ -154,36 +96,16 @@
                        <Font size="18.0" />
                     </font>
                  </Label>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
                     <VBox.margin>
-                        <Insets bottom="30.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert">
-                     <VBox.margin>
-                        <Insets top="10.0" />
+                        <Insets bottom="20.0" />
                     </VBox.margin>
                  </Button>
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
               </children>
            </VBox>
            <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
@@ -196,42 +118,22 @@
                        <Font size="18.0" />
                     </font>
                  </Label>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
                     <VBox.margin>
-                        <Insets bottom="30.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2">
-                     <VBox.margin>
-                        <Insets bottom="10.0" top="10.0" />
-                     </VBox.margin>
-                  </Button>
-                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert">
-                     <VBox.margin>
-                        <Insets top="10.0" />
+                        <Insets bottom="20.0" />
                     </VBox.margin>
                  </Button>
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
+                  <Button id="btFoodChoice" alignment="CENTER" mnemonicParsing="false" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
               </children>
            </VBox>
         </children>
      </HBox>
-      <Button id="btPlaceOrder" layoutX="436.0" layoutY="677.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Bestellung speichern" />
+      <Button id="btPlaceOrder" layoutX="379.0" layoutY="527.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Bestellung abschicken" />
      <ComboBox id="cbChooseChild" layoutX="29.0" layoutY="34.0" prefWidth="150.0" promptText="Wähle Kind" stylesheets="@menue.css" />
-      <ListView id="lvShowDescription" layoutX="14.0" layoutY="151.0" prefHeight="475.0" prefWidth="200.0" />
+      <ListView id="lvShowDescription" layoutX="20.0" layoutY="115.0" prefHeight="370.0" prefWidth="200.0" />
   </children>
 </AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/menue.css
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/menue.css
@@ -1,10 +1,40 @@
-.sidebar-nav_button {
-    -fx-background-color: #69b6ff;
-    -fx-text-fill: #123;
-    -fx-border-color: #000;
-    -fx-border-radius: 20;
-}
-.sidebar-nav_button.active {
-    -fx-background-color: #4e92b4;
+#btFoodChoice{
+    -fx-background-color: transparent;
 }

+#btFoodChoice:hover{
+    -fx-underline: true;
+    -fx-text-fill: black;
+}
+#btPlaceOrder{
+    -fx-background-color: lightblue;
+    -fx-text-fill: white;
+    -fx-background-radius: 25;
+}
+
+#btLogin{
+    -fx-background-color: #9ac1ce;
+    -fx-text-fill: white;
+}
+
+#btLogin:hover{
+    -fx-underline: true;
+    -fx-text-fill: black;
+}
+
+
+#btPlaceOrder:hover{
+    -fx-border-width: 0;
+    -fx-text-fill: black;
+    -fx-underline: true;
+}
+
+#cbChooseChild{
+    -fx-background-color: #9ac1ce;
+    -fx-prompt-text-fill: white;
+}
+
+#btFoodChoice:hover{
+    -fx-underline: true;
+    -fx-text-fill: black;
+}
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenu-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenu-view.fxml
@@ -1,94 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.Font?>
-<BorderPane fx:id="contentView" prefHeight="750.0" prefWidth="1200.0" stylesheets="@menue.css"
-            xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="com.bib.essensbestellungsverwaltung.ParentMenuController">
-    <left>
-        <VBox alignment="TOP_CENTER" prefHeight="750.0" prefWidth="350.0" spacing="10.0"
-              style="-fx-background-color: #69b6ff; -fx-padding: 20;" BorderPane.alignment="CENTER">
-            <children>
-                <Button fx:id="essensplanButton" alignment="CENTER_LEFT" mnemonicParsing="false"
-                        onMouseClicked="#onEssensplanClick" prefHeight="60.0" prefWidth="250.0"
-                        styleClass="sidebar-nav_button" text="Essensplan">
-                    <font>
-                        <Font size="20.0"/>
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/menu.png"/>
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Button fx:id="kinderButton" alignment="CENTER_LEFT" mnemonicParsing="false"
-                        onMouseClicked="#onKinderClick" prefHeight="60.0" prefWidth="250.0"
-                        styleClass="sidebar-nav_button" text="Kinder">
-                    <font>
-                        <Font size="20.0"/>
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/little-kid.png"/>
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Button fx:id="bestellungButton" alignment="CENTER_LEFT" mnemonicParsing="false"
-                        onMouseClicked="#onBestellungClick" prefHeight="60.0" prefWidth="250.0"
-                        styleClass="sidebar-nav_button" text="Bestellung">
-                    <font>
-                        <Font size="20.0"/>
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/shopping-list.png"/>
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Region VBox.vgrow="ALWAYS"/>
-                <Button fx:id="einstellungenButton" alignment="CENTER_LEFT" layoutX="10.0" layoutY="130.0"
-                        mnemonicParsing="false" onMouseClicked="#onEinstellungenClick" prefHeight="60.0"
-                        prefWidth="250.0" styleClass="sidebar-nav_button" text="Einstellungen">
-                    <font>
-                        <Font size="20.0"/>
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/setting.png"/>
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-            </children>
-        </VBox>
-    </left>
-    <top>
-        <HBox alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1200.0" style="-fx-background-color: #69b6ff;"
-              BorderPane.alignment="CENTER">
-            <children>
-                <Button mnemonicParsing="false" onMouseClicked="#onAusloggenClick" styleClass="sidebar-nav_button"
-                        text="Ausloggen">
-                    <opaqueInsets>
-                        <Insets/>
-                    </opaqueInsets>
-                </Button>
-            </children>
-            <padding>
-                <Insets right="20.0"/>
-            </padding>
-        </HBox>
-    </top>
-    <center>
-        <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER"/>
-    </center>
-</BorderPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue-view.fxml
@@ -0,0 +1,82 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="800.0" prefWidth="1200.0" stylesheets="parentMenue.css" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
+   <children>
+      <VBox id="contentContainer" layoutY="-14.0" prefHeight="814.0" prefWidth="333.0" stylesheets="@parentMenue.css">
+         <children>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="327.0">
+               <children>
+                  <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@pics/menu.png" />
+                     </image>
+                  </ImageView>
+                  <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="260.0" text="Essensplan">
+                     <font>
+                        <Font size="25.0" />
+                     </font>
+                  </Button>
+               </children>
+            </HBox>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@pics/little-kid.png" />
+                     </image>
+                  </ImageView>
+                  <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="25.0" prefWidth="260.0" text="Kind">
+                     <font>
+                        <Font size="25.0" />
+                     </font>
+                  </Button>
+               </children>
+            </HBox>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@pics/shopping-list.png" />
+                     </image>
+                  </ImageView>
+                  <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="52.0" prefWidth="260.0" text="Bestellung">
+                     <font>
+                        <Font size="25.0" />
+                     </font>
+                  </Button>
+               </children>
+            </HBox>
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <ImageView fitHeight="60.0" fitWidth="60.0" pickOnBounds="true" preserveRatio="true">
+                     <image>
+                        <Image url="@pics/setting.png" />
+                     </image>
+                  </ImageView>
+                  <Button id="contentButton" alignment="BASELINE_LEFT" mnemonicParsing="false" prefHeight="52.0" prefWidth="260.0" text="Nutzereinstellungen">
+                     <font>
+                        <Font size="25.0" />
+                     </font>
+                  </Button>
+               </children>
+            </HBox>
+         </children>
+         <padding>
+            <Insets top="50.0" />
+         </padding></VBox>
+      <HBox id="contentContainer2" alignment="CENTER_RIGHT" prefHeight="40.0" prefWidth="1200.0" stylesheets="@parentMenue.css">
+         <children>
+            <Button id="btLogOut" mnemonicParsing="false" stylesheets="@parentMenue.css" text="Abmelden" />
+         </children>
+      </HBox>
+   </children>
+</AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue.css
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/parentMenue.css
@@ -0,0 +1,26 @@
+#contentContainer{
+    -fx-background-color: #add8e6;
+}
+
+#contentContainer2{
+    -fx-background-color: lightblue;
+}
+
+#contentButton{
+    -fx-background-color: transparent;
+}
+
+#contentButton:hover{
+    -fx-underline: true;
+    -fx-background-color: #78939d;
+    -fx-text-fill: white;
+}
+
+#btLogOut{
+    -fx-background-color: transparent;
+    -fx-pref-height: 40px;
+}
+
+#btLogOut:hover{
+    -fx-underline: true;
+}
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/settingsMenue.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/settingsMenue.fxml
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<AnchorPane xmlns="http://javafx.com/javafx"
+            xmlns:fx="http://javafx.com/fxml"
+            fx:controller="com.bib.essensbestellungsverwaltung.SettingsController"
+            prefHeight="400.0" prefWidth="600.0">
+
+</AnchorPane>
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml
@@ -29,9 +29,9 @@
        <Circle fill="#67b5ff2e" layoutX="-23.0" layoutY="368.0" radius="100.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
        <Circle fill="#69b6ffb0" layoutX="235.0" layoutY="310.0" radius="158.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
        <Circle fill="#93c4f23d" layoutY="258.0" radius="106.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
-        <VBox alignment="CENTER" layoutX="263.0" prefHeight="400.0" prefWidth="338.0" style="-fx-background-color: white;">
+        <VBox layoutX="262.0" prefHeight="400.0" prefWidth="364.0" style="-fx-background-color: white;">
            <children>
-            <TextField promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="tfEmail">
+            <TextField fx:id="tfEmail" alignment="TOP_LEFT" prefHeight="26.0" prefWidth="282.0" promptText="Name" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
               <effect>
                  <Blend />
               </effect>
@@ -42,7 +42,7 @@
                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
               </VBox.margin>
            </TextField>
-            <TextField promptText="Email bestätigen" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="tfBestätigungEmail">
+            <TextField fx:id="tfBestätigungEmail" promptText="Vorname" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
               <effect>
                  <Blend />
               </effect>
@@ -53,7 +53,7 @@
                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
               </VBox.margin>
            </TextField>
-            <PasswordField promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="pfPasswort">
+            <PasswordField fx:id="pfPasswort" accessibleRole="TEXT_FIELD" promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
               <font>
                  <Font name="Microsoft Tai Le Bold" size="12.0" />
               </font>
@@ -67,7 +67,7 @@
                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
               </VBox.margin>
            </PasswordField>
-            <PasswordField promptText="Passwort bestätigen" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="pfBestätigungPassowrt">
+            <PasswordField fx:id="pfBestätigungPassowrt" promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
               <font>
                  <Font name="Microsoft Tai Le Bold" size="12.0" />
               </font>
@@ -81,13 +81,53 @@
                  <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
               </VBox.margin>
            </PasswordField>
+            <HBox prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <TextField prefHeight="35.0" prefWidth="92.0" promptText="PLZ" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <HBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </HBox.margin>
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="12.0" />
+                     </font>
+                  </TextField>
+                  <TextField prefHeight="35.0" prefWidth="182.0" promptText="Stadt" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <HBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </HBox.margin>
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="12.0" />
+                     </font>
+                  </TextField>
+               </children>
+            </HBox>
+            <HBox prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <TextField prefHeight="27.0" prefWidth="134.0" promptText="Straße" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <HBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </HBox.margin>
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="12.0" />
+                     </font>
+                  </TextField>
+                  <TextField prefHeight="27.0" prefWidth="99.0" promptText="Hausnummer" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                     <HBox.margin>
+                        <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+                     </HBox.margin>
+                     <font>
+                        <Font name="Microsoft Tai Le Bold" size="12.0" />
+                     </font>
+                  </TextField>
+               </children>
+            </HBox>
                <HBox alignment="CENTER" prefHeight="30.0" prefWidth="238.0">
                    <children>
-                        <Button mnemonicParsing="false" prefHeight="25.0" prefWidth="106.0" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Konto erstellen" textFill="WHITE" onAction="#onKontoErstellenBtClick">
+                        <Button mnemonicParsing="false" onAction="#onKontoErstellenBtClick" prefHeight="25.0" prefWidth="106.0" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Konto erstellen" textFill="WHITE">
                            <font>
                                <Font name="Microsoft Tai Le Bold" size="12.0" />
                            </font></Button>
-                        <Button id="btSignUp" mnemonicParsing="false" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Anmelden" textFill="#7c7b7b" underline="true"  onAction="#onAnmeldenBtClick"/>
+                        <Button id="btSignUp" mnemonicParsing="false" onAction="#onAnmeldenBtClick" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Anmelden" textFill="#7c7b7b" underline="true" />
                    </children>
               <opaqueInsets>
                  <Insets top="15.0" />
--- a/src/main/resources/com/bib/essensbestellungsverwaltung/workerMenu-view.fxml
+++ b/src/main/resources/com/bib/essensbestellungsverwaltung/workerMenu-view.fxml
@@ -1,129 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
-<BorderPane fx:id="contentView" prefHeight="750.0" prefWidth="1200.0" stylesheets="@menue.css"
-            xmlns="http://javafx.com/javafx/17.0.2-ea" xmlns:fx="http://javafx.com/fxml/1"
-            fx:controller="com.bib.essensbestellungsverwaltung.WorkerMenuController">
-    <left>
-        <VBox alignment="TOP_CENTER" prefHeight="750.0" prefWidth="350.0" spacing="10.0"
-              style="-fx-background-color: #69b6ff; -fx-padding: 20;" BorderPane.alignment="CENTER">
-            <children>
-                <Button fx:id="tagesbestellungButton" alignment="CENTER_LEFT" mnemonicParsing="false"
-                        onMouseClicked="#onTagesbestellungenClick" prefHeight="60.0" prefWidth="250.0"
-                        styleClass="sidebar-nav_button" text="Tagesbestellung">
-                    <font>
-                        <Font size="20.0"/>
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/to-do-list.png"/>
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Button fx:id="monatsabrechnungButton" alignment="CENTER_LEFT" mnemonicParsing="false"
-                        onMouseClicked="#onMonatsabrechnungClick" prefHeight="60.0" prefWidth="250.0"
-                        styleClass="sidebar-nav_button" text="Monatsabrechnung">
-                    <font>
-                        <Font size="20.0"/>
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/spreadsheet.png"/>
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Button fx:id="wochenplanButton" alignment="CENTER_LEFT" mnemonicParsing="false"
-                        onMouseClicked="#onWochenplanClick" prefHeight="60.0" prefWidth="250.0"
-                        styleClass="sidebar-nav_button" text="Wochenplan">
-                    <font>
-                        <Font size="20.0"/>
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/calendar.png"/>
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Button fx:id="mahlzeitButton" alignment="CENTER_LEFT" mnemonicParsing="false"
-                        onMouseClicked="#onMahlzeitClick" prefHeight="60.0" prefWidth="250.0"
-                        styleClass="sidebar-nav_button" text="Mahlzeit">
-                    <font>
-                        <Font size="20.0"/>
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/lunch.png"/>
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Button fx:id="mitarbeiterButton" alignment="CENTER_LEFT" mnemonicParsing="false"
-                        onMouseClicked="#onMitarbeiterClick" prefHeight="60.0" prefWidth="250.0"
-                        styleClass="sidebar-nav_button" text="Mitarbeiter">
-                    <font>
-                        <Font size="20.0"/>
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/teamwork.png"/>
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-                <Region style="-fx-padding: 20;" VBox.vgrow="ALWAYS">
-                    <opaqueInsets>
-                        <Insets/>
-                    </opaqueInsets>
-                </Region>
-                <Button fx:id="einstellungenButton" alignment="CENTER_LEFT" layoutX="10.0" layoutY="130.0"
-                        mnemonicParsing="false" onMouseClicked="#onEinstellungenClick" prefHeight="60.0"
-                        prefWidth="250.0" styleClass="sidebar-nav_button" text="Einstellungen">
-                    <font>
-                        <Font size="20.0"/>
-                    </font>
-                    <graphic>
-                        <ImageView fitHeight="35.0" fitWidth="35.0" pickOnBounds="true" preserveRatio="true">
-                            <image>
-                                <Image url="@pics/setting.png"/>
-                            </image>
-                        </ImageView>
-                    </graphic>
-                </Button>
-            </children>
-            <opaqueInsets>
-                <Insets/>
-            </opaqueInsets>
-        </VBox>
-    </left>
-    <top>
-        <HBox alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1200.0" style="-fx-background-color: #69b6ff;"
-              BorderPane.alignment="CENTER">
-            <children>
-                <Button mnemonicParsing="false" onMouseClicked="#onAusloggenClick" styleClass="sidebar-nav_button"
-                        text="Ausloggen">
-                    <opaqueInsets>
-                        <Insets/>
-                    </opaqueInsets>
-                </Button>
-            </children>
-            <padding>
-                <Insets right="20.0"/>
-            </padding>
-        </HBox>
-    </top>
-    <center>
-        <AnchorPane prefHeight="200.0" prefWidth="200.0" BorderPane.alignment="CENTER"/>
-    </center>
-</BorderPane>
Author	SHA1	Message	Date
pbs2h21asc	2814244d29	Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch # Conflicts: # src/main/resources/com/bib/essensbestellungsverwaltung/createCoworker-view.fxml	2023-01-31 12:27:59 +01:00
pbs2h21asc	1a9f13581e	Admin Controller bearbeitet	2023-01-31 12:27:14 +01:00
richard	6747188668	settingsview & Controller erstellt	2023-01-31 10:22:48 +01:00
pbs2h21asc	0550482a6b	View überarbeitet Controller AdminController anfangen	2023-01-30 15:03:54 +01:00
pbs2h21asc	6cb48af976	Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch	2023-01-30 14:58:43 +01:00
pbs2h21asc	9e4db23e7a	View überarbeitet Controller AdminController anfangen	2023-01-30 14:57:57 +01:00
Malte Schulze Hobeling	a039bb09fc	„.idea/vcs.xml“ löschen	2023-01-30 14:22:23 +01:00
Malte Schulze Hobeling	97af9f3792	„.idea/misc.xml“ löschen	2023-01-30 14:22:17 +01:00
Malte Schulze Hobeling	2b1223b3b7	„.idea/encodings.xml“ löschen	2023-01-30 14:22:12 +01:00
Malte Schulze Hobeling	7e6b1aedf3	„.idea/.gitignore“ löschen	2023-01-30 14:22:07 +01:00
Malte Schulze Hobeling	464285dcbf	„database.db“ löschen	2023-01-30 14:21:50 +01:00
Malte Schulze Hobeling	49575add8a	Merge branch 'main' into Richards_Branch	2023-01-30 14:21:09 +01:00
Reshad Meher	3c0edbc431	new Regisiteren View	2023-01-27 15:17:17 +01:00
Reshad Meher	981169d578	Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch	2023-01-27 15:11:38 +01:00
Reshad Meher	9b73f91f5c	new Regisiteren View	2023-01-27 15:11:25 +01:00
richard	67b3637505	Views & Controller erstellt	2023-01-27 14:36:10 +01:00
Reshad Meher	c7d0514c43	Merge remote-tracking branch 'origin/Richards_Branch' into Richards_Branch	2023-01-23 09:08:32 +01:00
Reshad Meher	702677b65b	neue Zustand 23.01.23	2023-01-23 09:08:03 +01:00