Merge branch 'master' into 'frontend-testing'

# Conflicts:
#   src/main/java/no/ntnu/idatt1002/demo/controller/AddExpenseController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/AddIncomeController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/BudgetController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/ExpensesController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/IncomeController.java
#   src/main/java/no/ntnu/idatt1002/demo/controller/MainMenuController.java
#   src/main/resources/Budget/Budget.budget
#   src/main/resources/Economics/Expense.register
#   src/main/resources/Economics/Income.register
#   src/main/resources/view/BudgetNew.fxml
#   src/main/resources/view/Expenses.fxml

src/main/resources/Budget/Budget.budget

@@ -3,9 +3,5 @@ maxAmount=1000.0
 
 budgetAmount=500.0
 budgetCategory=FOOD
-budgetDescription=
-
-budgetAmount=67.0
-budgetCategory=CLOTHES
-budgetDescription=
+budgetDescription=dd
 

src/main/resources/Economics/Expense.register

-date=2023-03-27
-amount=100.0
+date=2023-03-01
+description=twelve
+amount=12.0
+isRecurring=Not recurring
+category=CLOTHES
+
+date=2023-03-11
+description=1111
+amount=121.0
+isRecurring=Not recurring
+category=OTHER
+
+date=2023-03-26
+amount=10.0
 isRecurring=Not recurring
 category=FOOD
 

src/main/resources/Economics/Income.register

-date=2023-03-27
-amount=110.0
+date=2023-03-24
+description=studie
+amount=1000.0
 isRecurring=Recurring
-category=SALARY
+category=STUDENT_LOAN
 
-date=2023-03-31
+date=2023-03-25
 amount=100.0
 isRecurring=Not recurring
 category=GIFT
 
+date=2023-03-25
+description=airbnb
+amount=1000.0
+isRecurring=Not recurring
+category=GIFT
+

src/main/resources/view/Expenses.fxml

@@ -33,28 +33,9 @@
       </ImageView>
       <BorderPane prefHeight="400.0" prefWidth="600.0">
          <top>
-            <BorderPane BorderPane.alignment="CENTER">
-               <center>
-                  <HBox>
-                     <children>
-                        <Button fx:id="returnBtn" mnemonicParsing="false" onAction="#switchScene" 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>
+            <HBox BorderPane.alignment="CENTER">
+               <children>
+                  <Button fx:id="returnBtn" mnemonicParsing="false" onAction="#switchScene" text="Return ">
                      <opaqueInsets>
                         <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
                      </opaqueInsets>
@@ -124,6 +105,23 @@
                         </ComboBox>
                      </children>
                   </VBox>
+                  <HBox prefHeight="100.0" prefWidth="200.0" GridPane.columnSpan="2" GridPane.rowIndex="3">
+                     <children>
+                      <Button fx:id="incomeBtn" mnemonicParsing="false" onAction="#switchScene" text="Income" />
+                        <Button fx:id="budgetBtn" mnemonicParsing="false" onAction="#switchScene" text="Budget" />
+                        <Button disable="true" mnemonicParsing="false" text="Expenses" />
+                        <Button mnemonicParsing="false" onAction="#switchScene" text="Next">
+                           <HBox.margin>
+                              <Insets left="170.0" />
+                           </HBox.margin></Button>
+                     </children>
+                     <padding>
+                        <Insets top="10.0" />
+                     </padding>
+                     <GridPane.margin>
+                        <Insets top="5.0" />
+                     </GridPane.margin>
+                  </HBox>
                   <TableView fx:id="expenseTableView" prefHeight="260.0" prefWidth="485.0" GridPane.columnSpan="2" GridPane.rowIndex="1">
                     <columns>
                       <TableColumn fx:id="dateColumn" prefWidth="75.0" text="Date" />