Homeoffice/Essensbestellungsverwaltung
5
3
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Compare commits

base: Homeoffice:a03a29426016cc4b2af579892eb8a20cebfed2e4
Branches Tags
Homeoffice:main
Homeoffice:stable
Homeoffice:feat/kindErstellen
Homeoffice:Richards_Branch
Homeoffice:feat/essensplanErstellen
...
compare: Homeoffice:7b7889fee4651a51973df48f4502ab41b9e9c3a2
Branches Tags
Homeoffice:stable
Homeoffice:main
Homeoffice:feat/kindErstellen
Homeoffice:Richards_Branch
Homeoffice:feat/essensplanErstellen

2 Commits
a03a294260 ... 7b7889fee4

Author SHA1 Message Date
richard
7b7889fee4 Merge remote-tracking branch 'origin/stable' into stable 2023-02-06 09:35:18 +01:00
richard
a4ce206ec4 loginview, signupview angepasst. Fenstergröße angepasst 2023-02-06 09:34:17 +01:00
3 changed files with 61 additions and 58 deletions
Show Stats Expand all files Collapse all files

2
src/main/java/com/bib/essensbestellungsverwaltung/StartViewApplication.java
View File

@ -20,7 +20,7 @@ public class StartViewApplication extends Application {
@Override @Override
public void start(Stage stage) throws IOException { public void start(Stage stage) throws IOException {
FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource((firstLaunch) ? "signUp-view.fxml" : "login-view.fxml")); FXMLLoader fxmlLoader = new FXMLLoader(StartViewApplication.class.getResource((firstLaunch) ? "signUp-view.fxml" : "login-view.fxml"));
Scene scene = new Scene(fxmlLoader.load(), 1300, 750); Scene scene = new Scene(fxmlLoader.load(), 1200, 750);
primary = stage; primary = stage;
stage.setTitle("Essen Bestellung im Kindergarten"); stage.setTitle("Essen Bestellung im Kindergarten");
stage.setScene(scene); stage.setScene(scene);

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

@ -8,17 +8,16 @@
<?import javafx.scene.layout.AnchorPane?> <?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.HBox?> <?import javafx.scene.layout.HBox?>
<?import javafx.scene.layout.VBox?> <?import javafx.scene.layout.VBox?>
<?import javafx.scene.shape.Circle?>
<?import javafx.scene.text.Font?> <?import javafx.scene.text.Font?>
<?import javafx.scene.text.Text?> <?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="1200.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="com.bib.essensbestellungsverwaltung.LoginController">
<children> <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> <children>
<Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Essensbestellung"> <Text fill="WHITE" strokeType="OUTSIDE" strokeWidth="0.0" text="Essensbestellung">
<font> <font>
<Font name="Yu Gothic Light" size="26.0" /> <Font name="Yu Gothic Light" size="35.0" />
</font> </font>
</Text> </Text>
</children> </children>
@ -26,12 +25,9 @@
<Insets bottom="150.0" /> <Insets bottom="150.0" />
</padding> </padding>
</VBox> </VBox>
<Circle fill="#67b5ff2e" layoutX="-23.0" layoutY="368.0" radius="100.0" stroke="BLACK" strokeType="INSIDE" strokeWidth="0.0" /> <VBox alignment="CENTER" layoutX="400.0" prefHeight="750.0" prefWidth="900.0" style="-fx-background-color: white;">
<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;">
<children> <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> <VBox.margin>
<Insets bottom="15.0" left="25.0" right="25.0" top="25.0" /> <Insets bottom="15.0" left="25.0" right="25.0" top="25.0" />
</VBox.margin> </VBox.margin>
@ -39,24 +35,33 @@
<Blend /> <Blend />
</effect> </effect>
<font> <font>
<Font name="Microsoft Tai Le" size="12.0" /> <Font name="Microsoft Tai Le Bold" size="20.0" />
</font> </font>
</TextField> </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> <VBox.margin>
<Insets bottom="25.0" left="25.0" right="25.0" top="15.0" /> <Insets bottom="25.0" left="25.0" right="25.0" top="15.0" />
</VBox.margin> </VBox.margin>
<font> <font>
<Font name="Microsoft Tai Le Bold" size="12.0" /> <Font name="Microsoft Tai Le Bold" size="20.0" />
</font> </font>
</PasswordField> </PasswordField>
<HBox alignment="CENTER" prefHeight="30.0" prefWidth="238.0"> <HBox alignment="CENTER" prefHeight="30.0" prefWidth="238.0">
<children> <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>
<Font name="Microsoft Tai Le Bold" size="12.0" /> <Font name="Microsoft Tai Le Bold" size="18.0" />
</font></Button> </font>
<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" /> <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> </children>
</HBox> </HBox>
</children> </children>
@ -64,7 +69,5 @@
<Insets bottom="65.0" left="45.0" right="45.0" top="45.0" /> <Insets bottom="65.0" left="45.0" right="45.0" top="45.0" />
</padding> </padding>
</VBox> </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> </children>
</AnchorPane> </AnchorPane>

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

@ -174,7 +174,7 @@
</VBox> </VBox>
</children> </children>
</HBox> </HBox>
<Button id="btPlaceOrder" fx:id="btSaveOrder" layoutX="379.0" layoutY="527.0" mnemonicParsing="false" onAction="#placeOrder" prefHeight="40.0" prefWidth="150.0" text="Bestellung abschicken" /> <Button id="btPlaceOrder" fx:id="btSaveOrder" layoutX="379.0" layoutY="527.0" mnemonicParsing="false" prefHeight="40.0" prefWidth="150.0" text="Bestellung abschicken" />
<ComboBox id="cbChooseChild" fx:id="cbPickChild" layoutX="29.0" layoutY="34.0" prefWidth="150.0" promptText="Wähle Kind" stylesheets="@menue.css" /> <ComboBox id="cbChooseChild" fx:id="cbPickChild" layoutX="29.0" layoutY="34.0" prefWidth="150.0" promptText="Wähle Kind" stylesheets="@menue.css" />
<ListView id="lvShowDescription" fx:id="lvFoodInfo" layoutX="20.0" layoutY="115.0" prefHeight="370.0" prefWidth="200.0" /> <ListView id="lvShowDescription" fx:id="lvFoodInfo" layoutX="20.0" layoutY="115.0" prefHeight="370.0" prefWidth="200.0" />
</children> </children>