steven/csep-2025
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

merge main into feature/client-side-search

Browse source
This commit is contained in:
Natalia Cholewa 2025-12-19 23:43:39 +01:00
commit 96eb19d74c
18 changed files with 528 additions and 138 deletions
Download patch file Download diff file Expand all files Collapse all files

62
client/src/main/resources/client/scenes/FoodpalApplication.fxml
View file

@ -15,6 +15,7 @@
<?import javafx.scene.layout.VBox?>
<?import javafx.scene.text.Font?>
<?import javafx.scene.control.ComboBox?>
<BorderPane prefHeight="800.0" prefWidth="1200.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="client.scenes.FoodpalApplicationCtrl">
<!-- TOP BAR -->
@ -23,58 +24,12 @@
<padding>
<Insets bottom="10" left="10" right="10" top="10" />
</padding>
<GridPane>
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="198.0" minWidth="10.0" prefWidth="130.0" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="2.0" prefWidth="70.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints maxHeight="54.0" minHeight="10.0" prefHeight="54.0" vgrow="SOMETIMES" />
<RowConstraints maxHeight="25.0" minHeight="6.0" prefHeight="6.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Label prefHeight="56.0" prefWidth="158.0" text="FoodPal">
<font>
<Font name="System Bold" size="29.0" />
</font>
</Label>
<ButtonBar prefHeight="40.0" prefWidth="200.0" GridPane.rowIndex="2">
<buttons>
<ToolBar prefHeight="35.0" prefWidth="123.0">
<items>
<Button fx:id="flagEnButton" minWidth="33.0" onAction="#switchLocale" userData="en" prefHeight="25.0" prefWidth="33.0" text="EN" />
<Button fx:id="flagNlButton" onAction="#switchLocale" userData="nl" text="NL" />
<Button fx:id="flagPlButton" onAction="#switchLocale" userData="pl" text="PL" />
</items>
</ToolBar>
</buttons>
</ButtonBar>
</children>
</GridPane>
<Pane HBox.hgrow="ALWAYS" />
<HBox spacing="5" />
<GridPane prefHeight="90.0" prefWidth="114.0">
<columnConstraints>
<ColumnConstraints hgrow="SOMETIMES" maxWidth="315.0" minWidth="10.0" prefWidth="32.1666259765625" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="315.0" minWidth="10.0" prefWidth="24.8333740234375" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="173.0" minWidth="10.0" prefWidth="28.6666259765625" />
<ColumnConstraints hgrow="SOMETIMES" maxWidth="95.0" minWidth="10.0" prefWidth="34.0" />
</columnConstraints>
<rowConstraints>
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
<RowConstraints minHeight="10.0" prefHeight="30.0" vgrow="SOMETIMES" />
</rowConstraints>
<children>
<Button fx:id="refreshButton" onAction="#refresh" prefHeight="25.0" prefWidth="34.0" text="⟳" GridPane.columnIndex="3" GridPane.rowIndex="2" />
</children>
</GridPane>
</HBox>
<Label prefHeight="56.0" prefWidth="158.0" text="FoodPal">
<font>
<Font name="System Bold" size="29.0" />
</font>
</Label>
</HBox>
</top>
<!-- LEFT: RECIPE LIST -->
@ -83,7 +38,8 @@
<padding>
<Insets bottom="10" left="10" right="10" top="10" />
</padding>
<fx:include source="LangSelect.fxml" />
<Button fx:id="refreshButton" onAction="#refresh" prefHeight="25.0" prefWidth="34.0" text="⟳" GridPane.columnIndex="3" GridPane.rowIndex="2" />
<Label fx:id="recipesLabel" text="Recipes">
<font>
<Font name="System Bold" size="15.0" />

16
client/src/main/resources/client/scenes/LangSelect.fxml Normal file
View file

@ -0,0 +1,16 @@
<?xml version="1.0" encoding="UTF-8"?>
<?import java.lang.*?>
<?import java.util.*?>
<?import javafx.scene.*?>
<?import javafx.scene.control.*?>
<?import javafx.scene.layout.*?>
<ComboBox
fx:id="langSelectMenu"
xmlns="http://javafx.com/javafx/25"
xmlns:fx="http://javafx.com/fxml/1"
onAction="#switchLocale"
fx:controller="client.scenes.LangSelectMenuCtrl"
>
</ComboBox>

BIN
client/src/main/resources/flag_en.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 995 B

BIN
client/src/main/resources/flag_nl.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 266 B

BIN
client/src/main/resources/flag_pl.png Normal file
View file

Binary file not shown.
Side by side

After

Width:  |  Height:  |  Size: 241 B

4
client/src/main/resources/locale/lang.properties
View file

@ -24,3 +24,7 @@ menu.button.remove.step=Remove Step
menu.button.edit=Edit
menu.button.clone=Clone
menu.button.print=Print recipe
lang.en.display=English
lang.nl.display=Dutch
lang.pl.display=Polish

5
client/src/main/resources/locale/lang_en.properties
View file

@ -25,4 +25,7 @@ menu.button.edit=Edit
menu.button.clone=Clone
menu.button.print=Print recipe
menu.search=Search...
menu.search=Search...
lang.en.display=English
lang.nl.display=Nederlands
lang.pl.display=Polski

5
client/src/main/resources/locale/lang_nl.properties
View file

@ -25,4 +25,7 @@ menu.button.edit=Bewerken
menu.button.clone=Dupliceren
menu.button.print=Recept afdrukken
menu.search=Zoeken...
menu.search=Zoeken...
lang.en.display=English
lang.nl.display=Nederlands
lang.pl.display=Polski

5
client/src/main/resources/locale/lang_pl.properties
View file

@ -25,4 +25,7 @@ menu.button.edit=Edytuj
menu.button.clone=Duplikuj
menu.button.print=Drukuj przepis
menu.search=Szukaj...
menu.search=Szukaj...
lang.en.display=English
lang.nl.display=Nederlands
lang.pl.display=Polski