diff --git a/src/main/resources/view/Expenses.fxml b/src/main/resources/view/Expenses.fxml
index b0996e59569b475d3f58d24f12175dd39bce65a3..0dcfe2d5fc2c6ffeaabc10034cd3e3cfc318cee7 100644
--- a/src/main/resources/view/Expenses.fxml
+++ b/src/main/resources/view/Expenses.fxml
@@ -3,14 +3,21 @@
<?import javafx.geometry.Insets?>
<?import javafx.scene.Cursor?>
<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ComboBox?>
<?import javafx.scene.control.TableColumn?>
<?import javafx.scene.control.TableView?>
<?import javafx.scene.image.Image?>
<?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?>
<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
<?import javafx.scene.layout.HBox?>
-
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+<?import javafx.scene.text.Text?>
<AnchorPane xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1">
<children>
@@ -22,28 +29,103 @@
<Cursor fx:constant="DEFAULT" />
</cursor>
</ImageView>
- <BorderPane prefHeight="400.0" prefWidth="600.0">
+ <BorderPane prefHeight="400.0" prefWidth="593.0">
<top>
<HBox BorderPane.alignment="CENTER">
<children>
- <Button mnemonicParsing="false" text="Return " />
+ <Button mnemonicParsing="false" text="Return ">
+ <opaqueInsets>
+ <Insets left="100.0" />
+ </opaqueInsets>
+ <HBox.margin>
+ <Insets left="10.0" top="10.0" />
+ </HBox.margin>
+ </Button>
+ <Region prefHeight="70.0" prefWidth="141.0" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Expenses" textAlignment="CENTER">
+ <HBox.margin>
+ <Insets />
+ </HBox.margin>
+ <font>
+ <Font size="48.0" />
+ </font>
+ </Text>
</children>
+ <opaqueInsets>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </opaqueInsets>
</HBox>
</top>
<center>
- <TableView BorderPane.alignment="CENTER">
- <columns>
- <TableColumn prefWidth="75.0" text="C1" />
- <TableColumn prefWidth="75.0" text="C2" />
- </columns>
- <opaqueInsets>
- <Insets bottom="10.0" left="10.0" right="10.0" />
- </opaqueInsets>
- </TableView>
+ <GridPane BorderPane.alignment="CENTER">
+ <BorderPane.margin>
+ <Insets bottom="40.0" left="40.0" right="40.0" />
+ </BorderPane.margin>
+ <columnConstraints>
+ <ColumnConstraints hgrow="ALWAYS" maxWidth="485.3333231608073" minWidth="10.0" prefWidth="427.33335367838544" />
+ <ColumnConstraints hgrow="ALWAYS" maxWidth="111.33333333333331" minWidth="10.0" prefWidth="92.66664632161456" />
+ </columnConstraints>
+ <rowConstraints>
+ <RowConstraints maxHeight="65.33334064483643" minHeight="10.0" prefHeight="65.33334064483643" vgrow="SOMETIMES" />
+ <RowConstraints maxHeight="298.66665744781494" minHeight="10.0" prefHeight="250.66665935516357" vgrow="SOMETIMES" />
+ </rowConstraints>
+ <children>
+ <HBox alignment="BOTTOM_LEFT" prefWidth="410.0">
+ <children>
+ <Button alignment="TOP_CENTER" mnemonicParsing="false" prefHeight="26.0" prefWidth="189.0" text="Add expense" textAlignment="CENTER">
+ <font>
+ <Font size="14.0" />
+ </font>
+ </Button>
+ </children>
+ <opaqueInsets>
+ <Insets />
+ </opaqueInsets>
+ <padding>
+ <Insets bottom="5.0" />
+ </padding>
+ </HBox>
+ <VBox alignment="BOTTOM_LEFT" prefHeight="200.0" prefWidth="100.0" spacing="5.0" GridPane.columnIndex="1">
+ <children>
+ <ComboBox prefWidth="150.0" promptText="Show">
+ <opaqueInsets>
+ <Insets />
+ </opaqueInsets>
+ <VBox.margin>
+ <Insets bottom="5.0" />
+ </VBox.margin>
+ </ComboBox>
+ </children>
+ </VBox>
+ <TableView prefHeight="260.0" prefWidth="485.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
+ <columns>
+ <TableColumn prefWidth="75.0" text="Date" />
+ <TableColumn prefWidth="75.0" text="Price" />
+ <TableColumn prefWidth="75.0" text="Category" />
+ <TableColumn prefWidth="75.0" text="Description" />
+ </columns>
+ <columnResizePolicy>
+ <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+ </columnResizePolicy>
+ </TableView>
+ </children>
+ </GridPane>
</center>
<opaqueInsets>
<Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
</opaqueInsets>
+ <left>
+ <Region prefHeight="357.0" prefWidth="25.0" BorderPane.alignment="CENTER" />
+ </left>
+ <right>
+ <Region prefHeight="357.0" prefWidth="0.0" BorderPane.alignment="CENTER" />
+ </right>
+ <bottom>
+ <Region prefHeight="0.0" prefWidth="600.0" BorderPane.alignment="CENTER" />
+ </bottom>
</BorderPane>
</children>
+ <opaqueInsets>
+ <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+ </opaqueInsets>
</AnchorPane>