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

Reshad Meher:
sanitized c46eff1dda

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

@@ -457,4 +457,31 @@ public class AccountMgr {
         String[] priceD = { "1", String.valueOf((int) (price * 100)) };
         Database.update("price", priceH, priceD);
     }
+
+
+    /**
+     * update password in User table
+     * @param password User
+     * @return update password
+     * @author Reshad Meher
+     */
+    protected static long updatePassword( User password) {
+
+        String[] pwH = {"password"};
+        String[] pwD = {password.getPassword()};
+        long updates = Database.update("user",pwH,pwD);
+        return updates;
+    }
+    /**
+     * update adress in User table
+     * @param address Adresss
+     * @return update Adrssse
+     * @author Reshad Meher
+     */
+    protected static long updateAdreess(Address address ){
+        String[] adH = {"stree","numbrt","plz","city"};
+        String[] adD = {address.getStreet(),address.getNumber(),address.getPlz(),address.getCity()};
+        long updates = Database.update("user",adH,adD);
+        return updates;
+    }
 }

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

@@ -26,4 +26,9 @@ public class Allergy {
     public String getHandle() {
         return handle;
     }
+
+    @Override
+    public String toString() {
+        return getName();
+    }
 }

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

@@ -26,4 +26,9 @@ public class AllergySeverity {
     public String getSeverity() {
         return severity;
     }
+
+    @Override
+    public String toString() {
+        return getAllergy().getName() + " (" + getSeverity() + ")";
+    }
 }

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

@@ -2,6 +2,8 @@
 
 package com.bib.essensbestellungsverwaltung;
 
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.Initializable;
@@ -35,6 +37,7 @@ public class ChildViewController implements Initializable {
     //public TextField allergies;
     @FXML
     public ListView allergiesList;
+    ObservableList olAllergiesList;
     @FXML
     public ComboBox selectAllergy;
     @FXML
@@ -71,17 +74,21 @@ public class ChildViewController implements Initializable {
         if(childData) {
 
 
-            Address adress = new Address(streetString, numberString, plzString, cityString);
+            Address adress = AccountMgr.currentUser.getAddress();
 
-            List<Allergy> childAllergyList = allergiesList.getItems();
+            var olChildAllergyList = allergiesList.getItems();
+            List<AllergySeverity> childAllergyList = new ArrayList<>();
+            for (var o : olChildAllergyList) {
+                childAllergyList.add((AllergySeverity) o);
+            }
             ArrayList<AllergySeverity> allergySeverityArrayList = new ArrayList<>();
 
-            /*for (Allergy a : childAllergyList) {
+            /*for (AllergySeverity a : childAllergyList) {
                 AllergySeverity aS = new AllergySeverity(a, )
             }          */                                       //Allergy Severity doesn't work in my case so the List will be left empty for now
 
 
-            Child child = new Child(childLastname, childName, adress, allergySeverityArrayList);
+            Child child = new Child(childLastname, childName, adress, childAllergyList);
 
             System.out.println(AccountMgr.createChild(child));
 
@@ -121,9 +128,11 @@ public class ChildViewController implements Initializable {
 
 
 
-        String addedAllergy = selectAllergy.getValue().toString();
-        String addedSeverity = selectAllergySeverity.getValue().toString().split(":")[0];
-        allergiesList.getItems().add(addedAllergy + ":" + addedSeverity);
+        Allergy addedAllergy = (Allergy)selectAllergy.getValue();
+        long addedSeverityId = Long.parseLong(selectAllergySeverity.getValue().toString().split(":")[0]);
+        String addedSeverity = selectAllergySeverity.getValue().toString().split(":")[1];
+        olAllergiesList.add(new AllergySeverity(addedAllergy,addedSeverityId,addedSeverity));
+        allergiesList.setItems(olAllergiesList);
 
 
         selectAllergy.setValue("Allergie Wählen");
@@ -133,8 +142,15 @@ public class ChildViewController implements Initializable {
 
     @Override
     public void initialize(URL url, ResourceBundle resourceBundle) {
-        selectAllergy.getItems().addAll(allergyComboBox());
+        ObservableList<Allergy> olAll = FXCollections.observableArrayList(allergyComboBox());
+        selectAllergy.setItems(olAll);
+        //selectAllergy.getItems().addAll(allergyComboBox());
+        olAllergiesList = FXCollections.observableArrayList();
 
-        selectAllergySeverity.getItems().addAll("1:Harmlos","2:Warnung","3:Kritisch");
+        ObservableList olSev = FXCollections.observableArrayList();
+        olSev.add("1:Harmlos");
+        olSev.add("2:Warnung");
+        olSev.add("3:Kritisch");
+        selectAllergySeverity.setItems(olSev);
     }
 }

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

@@ -6,6 +6,10 @@ import javafx.fxml.FXML;
 import javafx.scene.Node;
 import javafx.scene.control.*;
 
+import java.time.LocalDate;
+import java.time.LocalDateTime;
+import java.util.List;
+
 public class MenueController {
 
     @FXML
@@ -71,14 +75,26 @@ public class MenueController {
     @FXML
     ComboBox<String> cbPickChild;
     @FXML
-    Button btLogin;
-    @FXML
     Button btSaveOrder;
     @FXML
     ListView<String> lvFoodInfo;
 
     public ObservableList<Node> buttons = FXCollections.observableArrayList();
+    public ObservableList<String> children = FXCollections.observableArrayList();
 
+    public List<Child> allChildren = AccountMgr.getAllChildrenFromParentWithId(3);
+    public void initialize(){
+        FoodPlan foodplanMon = FoodMgr.getFoodPlanById(1);
+        FoodPlan foodplanTue = FoodMgr.getFoodPlanById(2);
+        FoodPlan foodplanWed = FoodMgr.getFoodPlanById(3);
+        FoodPlan foodplanThu = FoodMgr.getFoodPlanById(4);
+        FoodPlan foodplanFri = FoodMgr.getFoodPlanById(5);
+
+        for (Child c : allChildren){
+            children.add(c.getFirstname());
+        }
+        cbPickChild.setItems(children);
+    }
 
     public void setButtonActive(ActionEvent event) {
         Button b = (Button) event.getSource();
@@ -87,14 +103,7 @@ public class MenueController {
         buttons = p.getChildrenUnmodifiable();
 
         for(Node button : buttons){
-            System.out.println(b.getStyleClass());
-            /*
-            b.getStyleClass().remove("active");
-
-            if (button.equals(b)){
-                b.getStyleClass().add("active");;
-            }
-             */
+            button.setDisable(button.equals(b));
         }
     }
 }

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

@@ -0,0 +1,149 @@
+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.TextField;
+
+import java.io.IOException;
+/**
+ * @author Reshad Meher
+ */
+
+public class SettingsController {
+
+    @FXML
+    private TextField tfOldPassword;
+    @FXML
+    private TextField tfNewPassword;
+    @FXML
+    private TextField tfConfirmNewPasword;
+    @FXML
+    private TextField tfPostCode;
+    @FXML
+    private TextField tfStreet;
+    @FXML
+    private TextField tfCity;
+    @FXML
+    private TextField tfHousNumber;
+
+    Alert alert;
+    @FXML
+    private void onPasswordChangClick(){
+        String oldPassword = tfOldPassword.getText();
+        String newPassword = tfNewPassword.getText();
+        String confirmNewPassword = tfConfirmNewPasword.getText();
+        if(!oldPassword.isEmpty() && !newPassword.isEmpty() && !confirmNewPassword.isEmpty()){
+            if(!newPassword.equals(confirmNewPassword)){
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Passwort");
+                alert.setHeaderText("Ihre  neue Passwort und Bestätigung passt nicht. Nochmal versuchen");
+                alert.showAndWait();
+            }else {
+                User userPassword = new User(newPassword);
+                long UpdateUserPassword = AccountMgr.updatePassword(userPassword);
+                if (UpdateUserPassword > 0){
+                    alert.setTitle("Passwort");
+                    alert.setHeaderText("Ihre Passwort erfolgreich geändert");
+                    alert.showAndWait();
+                }
+                else {
+                    alert.setTitle("Passwort");
+                    alert.setHeaderText("nei");
+                    alert.showAndWait();
+                }
+            }
+
+            tfOldPassword.setText("");
+            tfNewPassword.setText("");
+            tfConfirmNewPasword.setText("");
+        }
+        else {
+            if(oldPassword.isEmpty()){
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Passwort");
+                alert.setHeaderText("Ihre aktuelles Passwort ist leer.");
+                alert.showAndWait();
+            }else if(newPassword.isEmpty()){
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Passwort");
+                alert.setHeaderText("Ihre neues Passwort ist leer.");
+                alert.showAndWait();
+            }if(confirmNewPassword.isEmpty()){
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Passwort");
+                alert.setHeaderText("Ihre neue Passwort Bestätigung ist leer.");
+                alert.showAndWait();
+            }else{
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Passwort");
+                alert.setHeaderText("Ihre Passwort wurde nicht geändert");
+                alert.showAndWait();
+            }
+
+        }
+    }
+
+    @FXML
+    private void onChangAdressClick(){
+        String postCode = tfPostCode.getText();
+        String street = tfStreet.getText();
+        String city = tfCity.getText();
+        String housNumber = tfHousNumber.getText();
+        if (!postCode.isEmpty() && !street.isEmpty() && !city.isEmpty() && !housNumber.isEmpty()) {
+            Address userAdress = new Address(street,housNumber,postCode,city);
+            long UpdateUserAdress = AccountMgr.updateAdreess(userAdress);
+            if (UpdateUserAdress > 0) {
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Ihre Adresse erfolgreich geändert");
+                alert.showAndWait();
+
+                tfPostCode.setText("");
+                tfStreet.setText("");
+                tfCity.setText("");
+                tfHousNumber.setText("");
+            }
+
+        }else {
+            if (postCode.isEmpty()) {
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Postleitzahl ist leer.");
+                alert.showAndWait();
+            } else if (street.isEmpty()) {
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Straß ist leer.");
+                alert.showAndWait();
+            } else if (city.isEmpty()) {
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Statd ist leer.");
+                alert.showAndWait();
+            } else if (housNumber.isEmpty()) {
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Hausnumer  ist leer.");
+                alert.showAndWait();
+            } else {
+                alert = new Alert(Alert.AlertType.WARNING);
+                alert.setTitle("Adresse");
+                alert.setHeaderText("Ihre Adresse wurde nicht geändert");
+                alert.showAndWait();
+            }
+        }
+    }
+    @FXML
+    private void onLogOutBtClick() throws IOException{
+
+        FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource("login-view.fxml"));
+        Scene scene = new Scene(fxmlLoader.load(), 950,700);
+        StartViewApplication.primary.setScene(scene);
+    }
+
+    public void onSettingBtClick(ActionEvent actionEvent) {
+
+    }
+}

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

@@ -52,4 +52,13 @@ public class User {
     public Address getAddress() {
         return address;
     }
+
+
+    /**
+     *
+     * @author Reshad Meher
+     */
+    public User (String password){
+        this.password = password;
+    }
 }

src/main/resources/com/bib/essensbestellungsverwaltung/child-view.fxml

@@ -101,7 +101,7 @@
                         <Insets bottom="15.0" top="15.0" />
                      </VBox.margin>
                   </Text>
-                  <ListView prefHeight="101.0" prefWidth="227.0" />
+                  <ListView fx:id="allergiesList" prefHeight="101.0" prefWidth="227.0" />
                   <HBox prefHeight="26.0" prefWidth="256.0">
                      <children>
                         <ComboBox fx:id="selectAllergy" prefWidth="150.0" promptText="Allergie wählen" />

src/main/resources/com/bib/essensbestellungsverwaltung/login-view.fxml

@@ -8,17 +8,16 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.LoginController">
+<AnchorPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="750.0" prefWidth="1300.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.LoginController">
     <children>
-      <VBox alignment="CENTER" prefHeight="400.0" prefWidth="265.0" style="-fx-background-color: lightblue;">
+        <VBox alignment="CENTER" prefHeight="750.0" prefWidth="400.0" style="-fx-background-color: lightblue;">
             <children>
                 <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Essensbestellung">
                     <font>
-                  <Font name="Yu Gothic Light" size="26.0" />
+                        <Font name="Yu Gothic Light" size="35.0" />
                     </font>
                 </Text>
             </children>
@@ -26,12 +25,9 @@
                 <Insets bottom="150.0" />
             </padding>
         </VBox>
-      <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 alignment="CENTER" layoutX="400.0" prefHeight="750.0" prefWidth="900.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" promptText="Email" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
                     <VBox.margin>
                         <Insets bottom="15.0" left="25.0" right="25.0" top="25.0" />
                     </VBox.margin>
@@ -39,24 +35,33 @@
                         <Blend />
                     </effect>
                     <font>
-                  <Font name="Microsoft Tai Le" size="12.0" />
+                        <Font name="Microsoft Tai Le Bold" size="20.0" />
                     </font>
                 </TextField>
-            <PasswordField promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;" fx:id="pfPassword">
+                <PasswordField fx:id="pfPassword" promptText="Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
                     <VBox.margin>
                         <Insets bottom="25.0" left="25.0" right="25.0" top="15.0" />
                     </VBox.margin>
                     <font>
-                  <Font name="Microsoft Tai Le Bold" size="12.0" />
+                        <Font name="Microsoft Tai Le Bold" size="20.0" />
                     </font>
                 </PasswordField>
                 <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="Login" textFill="WHITE" onAction="#onBtLoginClick">
+                        <Button mnemonicParsing="false" onAction="#onBtLoginClick" prefHeight="45.0" prefWidth="118.0" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Login" 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="Sign up" textFill="#7c7b7b" underline="true" onAction="#changeToSignUp" />
+                                <Font name="Microsoft Tai Le Bold" size="18.0" />
+                            </font>
+                            <HBox.margin>
+                                <Insets right="15.0" />
+                            </HBox.margin></Button>
+                        <Button id="btSignUp" mnemonicParsing="false" onAction="#changeToSignUp" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Sign up" textFill="#7c7b7b" underline="true">
+                            <font>
+                                <Font size="15.0" />
+                            </font>
+                            <HBox.margin>
+                                <Insets left="15.0" />
+                            </HBox.margin></Button>
                     </children>
                 </HBox>
             </children>
@@ -64,7 +69,5 @@
                 <Insets bottom="65.0" left="45.0" right="45.0" top="45.0" />
             </padding>
         </VBox>
-      <Circle fill="#1469b895" layoutX="133.0" layoutY="368.0" radius="106.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
-      <Circle fill="#0088ff82" layoutX="77.0" layoutY="276.0" radius="53.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
     </children>
 </AnchorPane>

src/main/resources/com/bib/essensbestellungsverwaltung/menue-view.fxml

@@ -17,10 +17,9 @@
                 <Font size="28.0" />
             </font>
         </Label>
-        <Button id="btLogin" fx:id="btLogin" alignment="CENTER" layoutX="848.0" layoutY="34.0" mnemonicParsing="false" text="Login" />
-        <HBox layoutX="220.0" layoutY="87.0" prefHeight="414.0" prefWidth="688.0">
+        <HBox layoutX="220.0" layoutY="87.0" prefHeight="414.0" prefWidth="688.0" stylesheets="@menue.css">
             <children>
-                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;" styleClass="container">
                     <children>
                         <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Montag" textAlignment="CENTER">
                             <VBox.margin>
@@ -32,9 +31,12 @@
                         </Label>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <Button id="btFoodChoice" fx:id="btFirstMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 1" />
-                                <Button id="btFoodChoice" fx:id="btSecondMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 2" />
-                                <Button id="btFoodChoice" fx:id="btNoMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="Keine Mahlzeit">
+                                <Button id="btFoodChoice" fx:id="btFirstMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" stylesheets="@menue.css" text="Mahlzeit 1">
+                                    <VBox.margin>
+                                        <Insets />
+                                    </VBox.margin></Button>
+                                <Button id="btFoodChoice" fx:id="btSecondMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" stylesheets="@menue.css" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" stylesheets="@menue.css" text="Keine Mahlzeit">
                                     <VBox.margin>
                                         <Insets bottom="20.0" />
                                     </VBox.margin>
@@ -43,14 +45,14 @@
                         </VBox>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <Button id="btFoodChoice" fx:id="btFirstDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
-                                <Button id="btFoodChoice" fx:id="btSecondDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
-                                <Button id="btFoodChoice" fx:id="btNoDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
+                                <Button id="btFoodChoice" fx:id="btFirstDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Dessert 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Dessert 2" />
+                                <Button id="btFoodChoice" fx:id="btNoDessertMon" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="kein Dessert" />
                             </children>
                         </VBox>
                     </children>
                 </VBox>
-                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;" styleClass="container">
                     <children>
                         <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Dienstag" textAlignment="CENTER">
                             <VBox.margin>
@@ -62,9 +64,9 @@
                         </Label>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <Button id="btFoodChoice" fx:id="btFirstMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
-                                <Button id="btFoodChoice" fx:id="btSecondMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
-                                <Button id="btFoodChoice" fx:id="btNoMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
+                                <Button id="btFoodChoice" fx:id="btFirstMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="Keine Mahlzeit">
                                     <VBox.margin>
                                         <Insets bottom="20.0" />
                                     </VBox.margin>
@@ -73,14 +75,14 @@
                         </VBox>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <Button id="btFoodChoice" fx:id="btFirstDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
-                                <Button id="btFoodChoice" fx:id="btSecondDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
-                                <Button id="btFoodChoice" fx:id="btNoDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
+                                <Button id="btFoodChoice" fx:id="btFirstDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Dessert 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Dessert 2" />
+                                <Button id="btFoodChoice" fx:id="btNoDessertTue" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="kein Dessert" />
                             </children>
                         </VBox>
                     </children>
                 </VBox>
-                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;" styleClass="container">
                     <children>
                         <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Mittwoch" textAlignment="CENTER">
                             <VBox.margin>
@@ -92,9 +94,9 @@
                         </Label>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <Button id="btFoodChoice" fx:id="btFirstMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
-                                <Button id="btFoodChoice" fx:id="btSecondMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
-                                <Button id="btFoodChoice" fx:id="btNoMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
+                                <Button id="btFoodChoice" fx:id="btFirstMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="Keine Mahlzeit">
                                     <VBox.margin>
                                         <Insets bottom="20.0" />
                                     </VBox.margin>
@@ -103,14 +105,14 @@
                         </VBox>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <Button id="btFoodChoice" fx:id="btFirstDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
-                                <Button id="btFoodChoice" fx:id="btSecondDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
-                                <Button id="btFoodChoice" fx:id="btNoDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
+                                <Button id="btFoodChoice" fx:id="btFirstDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Dessert 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Dessert 2" />
+                                <Button id="btFoodChoice" fx:id="btNoDessertWed" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="kein Dessert" />
                             </children>
                         </VBox>
                     </children>
                 </VBox>
-                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;" styleClass="container">
                     <children>
                         <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Donnerstag" textAlignment="CENTER">
                             <VBox.margin>
@@ -122,9 +124,9 @@
                         </Label>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <Button id="btFoodChoice" fx:id="btFirstMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
-                                <Button id="btFoodChoice" fx:id="btSecondMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
-                                <Button id="btFoodChoice" fx:id="btNoMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
+                                <Button id="btFoodChoice" fx:id="btFirstMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="Keine Mahlzeit">
                                     <VBox.margin>
                                         <Insets bottom="20.0" />
                                     </VBox.margin>
@@ -133,14 +135,14 @@
                         </VBox>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <Button id="btFoodChoice" fx:id="btFirstDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
-                                <Button id="btFoodChoice" fx:id="btSecondDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
-                                <Button id="btFoodChoice" fx:id="btNoDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
+                                <Button id="btFoodChoice" fx:id="btFirstDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Dessert 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Dessert 2" />
+                                <Button id="btFoodChoice" fx:id="btNoDessertThu" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="kein Dessert" />
                             </children>
                         </VBox>
                     </children>
                 </VBox>
-                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;">
+                <VBox prefHeight="350.0" prefWidth="180.0" style="-fx-background-color: transparent; -fx-padding: 5;" styleClass="container">
                     <children>
                         <Label alignment="CENTER" contentDisplay="TOP" prefHeight="23.0" prefWidth="196.0" style="-fx-background-color: lightdarkblue;" text="Freitag" textAlignment="CENTER">
                             <VBox.margin>
@@ -152,9 +154,9 @@
                         </Label>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <Button id="btFoodChoice" fx:id="btFirstMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 1" />
-                                <Button id="btFoodChoice" fx:id="btSecondMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Mahlzeit 2" />
-                                <Button id="btFoodChoice" fx:id="btNoMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="Keine Mahlzeit">
+                                <Button id="btFoodChoice" fx:id="btFirstMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Mahlzeit 2" />
+                                <Button id="btFoodChoice" fx:id="btNoMealFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="Keine Mahlzeit">
                                     <VBox.margin>
                                         <Insets bottom="20.0" />
                                     </VBox.margin>
@@ -163,9 +165,9 @@
                         </VBox>
                         <VBox prefHeight="200.0" prefWidth="100.0">
                             <children>
-                                <Button id="btFoodChoice" fx:id="btFirstDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 1" />
-                                <Button id="btFoodChoice" fx:id="btSecondDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" text="Dessert 2" />
-                                <Button id="btFoodChoice" fx:id="btNoDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" text="kein Dessert" />
+                                <Button id="btFoodChoice" fx:id="btFirstDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Dessert 1" />
+                                <Button id="btFoodChoice" fx:id="btSecondDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="78.0" prefWidth="218.0" styleClass="btFood" text="Dessert 2" />
+                                <Button id="btFoodChoice" fx:id="btNoDessertFri" alignment="CENTER" mnemonicParsing="false" onAction="#setButtonActive" prefHeight="20.0" prefWidth="170.0" styleClass="btFood" text="kein Dessert" />
                             </children>
                         </VBox>
                     </children>

src/main/resources/com/bib/essensbestellungsverwaltung/menue.css

@@ -13,7 +13,6 @@
     -fx-background-radius: 25;
 }
 
-
 #btPlaceOrder:hover{
     -fx-border-width: 0;
     -fx-text-fill: black;
@@ -23,14 +22,16 @@
 #cbChooseChild{
     -fx-background-color: lightgray;
 }
-.btFood{
-    -fx-background-color: transparent;
+
+.container{
+    -fx-padding: 10%;
 }
 
-.btFood.active{
-    -fx-background-color: rgba(97, 97, 232, 0.3);
-    -fx-background-radius: 25;
+.sidebar-nav_button{
+    -fx-border-width: 0px;
 }
+
 .sidebar-nav_button.active {
     -fx-background-color: #4e92b4;
+    -fx-border-width: 0px;
 }

src/main/resources/com/bib/essensbestellungsverwaltung/parentMenu-view.fxml

@@ -1,20 +1,21 @@
 <?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.control.Button?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
 <?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">
+
+<BorderPane fx:id="contentView" prefHeight="750.0" prefWidth="1300.0" stylesheets="@menue.css" xmlns="http://javafx.com/javafx/19" 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">
+        <VBox alignment="TOP_CENTER" prefHeight="750.0" prefWidth="350.0" spacing="10.0" style="-fx-background-color: #ADD8E6FF; -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">
+                <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>
@@ -26,9 +27,7 @@
                         </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">
+                <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>
@@ -40,9 +39,7 @@
                         </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">
+                <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>
@@ -55,9 +52,7 @@
                     </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">
+                <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>
@@ -73,11 +68,9 @@
         </VBox>
     </left>
     <top>
-        <HBox alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1200.0" style="-fx-background-color: #69b6ff;"
-              BorderPane.alignment="CENTER">
+        <HBox alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1200.0" style="-fx-background-color: #ADD8E6FF;" BorderPane.alignment="CENTER">
             <children>
-                <Button mnemonicParsing="false" onMouseClicked="#onAusloggenClick" styleClass="sidebar-nav_button"
-                        text="Ausloggen">
+                <Button mnemonicParsing="false" onMouseClicked="#onAusloggenClick" styleClass="sidebar-nav_button" text="Ausloggen">
                     <opaqueInsets>
                         <Insets />
                     </opaqueInsets>

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;
+}

src/main/resources/com/bib/essensbestellungsverwaltung/settingsMenue.fxml

@@ -0,0 +1,183 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?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="800.0" prefWidth="1205.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.SettingsController">
+    <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 fx:id="BtSetting" alignment="BASELINE_LEFT" mnemonicParsing="false" onAction="#onSettingBtClick" 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 mnemonicParsing="false" onAction="#onLogOutBtClick" text="Abmelden" />
+            </children>
+        </HBox>
+        <HBox fx:id="UserSetting" layoutX="343.0" layoutY="48.0" prefHeight="355.0" prefWidth="856.0" style="-fx-border-width: 1 1 1 1; -fx-border-color: lightblue;" AnchorPane.topAnchor="230.0">
+            <children>
+                <VBox prefHeight="353.0" prefWidth="260.0">
+                    <children>
+                        <Label text="Elterndaten">
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="24.0" />
+                            </font>
+                            <VBox.margin>
+                                <Insets bottom="25.0" left="25.0" right="25.0" top="10.0" />
+                            </VBox.margin>
+                        </Label>
+                        <TextField prefHeight="36.0" prefWidth="274.0" promptText="aktuelles Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <VBox.margin>
+                                <Insets bottom="25.0" left="20.0" right="25.0" top="5.0" />
+                            </VBox.margin>
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="16.0" />
+                            </font>
+                        </TextField>
+                        <TextField promptText="neues Passwort" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <VBox.margin>
+                                <Insets left="20.0" right="25.0" top="5.0" />
+                            </VBox.margin>
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                            </font>
+                        </TextField>
+                        <TextField promptText="passwort bestätigen " style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <VBox.margin>
+                                <Insets bottom="25.0" left="20.0" right="25.0" top="25.0" />
+                            </VBox.margin>
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                            </font>
+                        </TextField>
+                        <Button alignment="BASELINE_LEFT" contentDisplay="TOP" mnemonicParsing="false" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Passowrt ändern" textFill="WHITE">
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                            </font>
+                            <VBox.margin>
+                                <Insets left="80.0" top="25.0" />
+                            </VBox.margin>
+                        </Button>
+                    </children>
+                </VBox>
+                <VBox prefHeight="353.0" prefWidth="245.0">
+                    <children>
+                        <TextField prefHeight="35.0" prefWidth="102.0" promptText="PLZ" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <VBox.margin>
+                                <Insets bottom="25.0" left="20.0" right="25.0" top="75.0" />
+                            </VBox.margin>
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="16.0" />
+                            </font>
+                        </TextField>
+                        <TextField promptText="Straße" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                            </font>
+                            <VBox.margin>
+                                <Insets bottom="25.0" left="20.0" right="25.0" top="5.0" />
+                            </VBox.margin>
+                        </TextField>
+                    </children>
+                    <HBox.margin>
+                        <Insets left="80.0" />
+                    </HBox.margin>
+                </VBox>
+                <VBox prefHeight="411.0" prefWidth="225.0">
+                    <children>
+                        <TextField promptText="Stadt" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <VBox.margin>
+                                <Insets left="20.0" right="25.0" top="75.0" />
+                            </VBox.margin>
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                            </font>
+                        </TextField>
+                        <TextField promptText="Hausnummer" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                            </font>
+                            <VBox.margin>
+                                <Insets left="25.0" right="25.0" top="25.0" />
+                            </VBox.margin>
+                        </TextField>
+                        <Button alignment="BASELINE_LEFT" contentDisplay="TOP" mnemonicParsing="false" style="-fx-background-radius: 25; -fx-background-color: lightblue;" text="Adresse ändern" textFill="WHITE">
+                            <font>
+                                <Font name="Microsoft Tai Le Bold" size="16.799999237060547" />
+                            </font>
+                            <VBox.margin>
+                                <Insets left="60.0" top="120.0" />
+                            </VBox.margin>
+                        </Button>
+                    </children>
+                </VBox>
+            </children>
+        </HBox>
+    </children>
+</AnchorPane>

src/main/resources/com/bib/essensbestellungsverwaltung/signUp-view.fxml

@@ -8,35 +8,19 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
-<?import javafx.scene.shape.Circle?>
 <?import javafx.scene.text.Font?>
 <?import javafx.scene.text.Text?>
 
-<AnchorPane maxHeight="-400" maxWidth="-600" minHeight="-400" minWidth="-600" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.SingUpController">
+<AnchorPane maxHeight="750.0" maxWidth="1300.0" minHeight="750.0" minWidth="1200.0" prefHeight="750.0" prefWidth="1300.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.SingUpController">
     <children>
-        <VBox alignment="CENTER" prefHeight="400.0" prefWidth="265.0" style="-fx-background-color: lightblue;">
-            <children>
-                <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Essensbestellung">
-                    <font>
-                        <Font name="Yu Gothic Light" size="26.0" />
-                    </font>
-                </Text>
-            </children>
-            <padding>
-                <Insets bottom="150.0" />
-            </padding>
-        </VBox>
-        <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 layoutX="262.0" prefHeight="400.0" prefWidth="364.0" style="-fx-background-color: white;">
+        <VBox layoutX="400.0" prefHeight="750.0" prefWidth="900.0" style="-fx-background-color: white;">
             <children>
                 <TextField fx:id="tfLastName" 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>
                     <font>
-                        <Font name="Microsoft Tai Le Bold" size="12.0" />
+                        <Font name="Microsoft Tai Le Bold" size="20.0" />
                     </font>
                     <VBox.margin>
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
@@ -47,7 +31,7 @@
                         <Blend />
                     </effect>
                     <font>
-                        <Font name="Microsoft Tai Le Bold" size="12.0" />
+                        <Font name="Microsoft Tai Le Bold" size="20.0" />
                     </font>
                     <VBox.margin>
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
@@ -58,7 +42,7 @@
                         <Blend />
                     </effect>
                     <font>
-                        <Font name="Microsoft Tai Le Bold" size="12.0" />
+                        <Font name="Microsoft Tai Le Bold" size="20.0" />
                     </font>
                     <VBox.margin>
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
@@ -66,7 +50,7 @@
                 </TextField>
                 <PasswordField fx:id="pfPassword" accessibleRole="TEXT_FIELD" 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 name="Microsoft Tai Le Bold" size="20.0" />
                     </font>
                     <opaqueInsets>
                         <Insets />
@@ -85,7 +69,7 @@
                                 <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 name="Microsoft Tai Le Bold" size="20.0" />
                             </font>
                         </TextField>
                         <TextField fx:id="tfCity" prefHeight="35.0" prefWidth="182.0" promptText="Stadt" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
@@ -93,7 +77,7 @@
                                 <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 name="Microsoft Tai Le Bold" size="20.0" />
                             </font>
                         </TextField>
                     </children>
@@ -105,26 +89,35 @@
                                 <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 name="Microsoft Tai Le Bold" size="20.0" />
                             </font>
                         </TextField>
-                        <TextField fx:id="tfHouseNumber" prefHeight="27.0" prefWidth="99.0" promptText="Hausnummer" style="-fx-background-color: transparent; -fx-border-color: lightgray; -fx-border-width: 0 0 1 0;">
+                        <TextField fx:id="tfHouseNumber" prefHeight="43.0" prefWidth="155.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 name="Microsoft Tai Le Bold" size="20.0" />
                             </font>
                         </TextField>
                     </children>
                 </HBox>
                 <HBox alignment="CENTER" prefHeight="30.0" prefWidth="238.0">
                     <children>
-                        <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">
+                        <Button mnemonicParsing="false" onAction="#onKontoErstellenBtClick" prefHeight="48.0" prefWidth="137.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" onAction="#onAnmeldenBtClick" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Anmelden" textFill="#7c7b7b" underline="true" />
+                                <Font name="Microsoft Tai Le Bold" size="15.0" />
+                            </font>
+                            <HBox.margin>
+                                <Insets right="15.0" />
+                            </HBox.margin></Button>
+                        <Button id="btSignUp" mnemonicParsing="false" onAction="#onAnmeldenBtClick" prefHeight="25.0" prefWidth="101.0" style="-fx-background-color: tranparent;" text="Anmelden" textFill="#7c7b7b" underline="true">
+                            <font>
+                                <Font size="15.0" />
+                            </font>
+                            <HBox.margin>
+                                <Insets left="15.0" />
+                            </HBox.margin></Button>
                     </children>
                     <opaqueInsets>
                         <Insets top="15.0" />
@@ -135,10 +128,20 @@
                 </HBox>
             </children>
             <padding>
-                <Insets bottom="65.0" left="45.0" right="45.0" top="45.0" />
+                <Insets bottom="65.0" left="45.0" right="45.0" top="150.0" />
+            </padding>
+        </VBox>
+        <VBox alignment="CENTER" prefHeight="750.0" prefWidth="400.0" style="-fx-background-color: lightblue;">
+            <children>
+                <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Essensbestellung">
+                    <font>
+                        <Font name="Yu Gothic Light" size="35.0" />
+                    </font>
+                </Text>
+            </children>
+            <padding>
+                <Insets bottom="150.0" />
             </padding>
         </VBox>
-        <Circle fill="#1469b895" layoutX="133.0" layoutY="368.0" radius="106.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
-        <Circle fill="#0088ff82" layoutX="77.0" layoutY="276.0" radius="53.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" />
     </children>
 </AnchorPane>

src/main/resources/com/bib/essensbestellungsverwaltung/workerMenu-view.fxml

@@ -1,14 +1,19 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.image.*?>
-<?import javafx.scene.layout.*?>
-<?import javafx.scene.text.*?>
+<?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.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+<?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.WorkerMenuController">
+<BorderPane fx:id="contentView" prefHeight="750.0" prefWidth="1300.0" stylesheets="@menue.css" xmlns="http://javafx.com/javafx/19" 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">
+        <VBox alignment="TOP_CENTER" prefHeight="750.0" prefWidth="350.0" spacing="10.0" style="-fx-background-color: #ADD8E6FF; -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>
@@ -94,7 +99,7 @@
         </VBox>
     </left>
     <top>
-        <HBox alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1200.0" style="-fx-background-color: #69b6ff;" BorderPane.alignment="CENTER">
+        <HBox alignment="CENTER_RIGHT" prefHeight="50.0" prefWidth="1200.0" style="-fx-background-color: #ADD8E6FF;" BorderPane.alignment="CENTER">
             <children>
                 <Button mnemonicParsing="false" onMouseClicked="#onAusloggenClick" styleClass="sidebar-nav_button" text="Ausloggen">
                     <opaqueInsets>