diff --git a/javadoc/no/ntnu/idatt1002/demo/MyApp.html b/javadoc/no/ntnu/idatt1002/demo/MyApp.html
index 14f844d22f3184ac952d2988d1021e3db1ad1b58..dd8d81de49f194f79515b2cfff7d951d2fb1a010 100644
--- a/javadoc/no/ntnu/idatt1002/demo/MyApp.html
+++ b/javadoc/no/ntnu/idatt1002/demo/MyApp.html
@@ -88,7 +88,7 @@ loadScripts(document, 'script');</script>
<h1 title="Class MyApp" class="title">Class MyApp</h1>
</div>
<div class="inheritance" title="Inheritance Tree"><a href="https://docs.oracle.com/en/java/javase/17/docs/api/java.base/java/lang/Object.html" title="class or interface in java.lang" class="external-link">java.lang.Object</a>
-<div class="inheritance">no.ntnu.idatt1002.demo.MyApp</div>
+<div class="inheritance">no.ntnu.idatt1002.demo.view.MyApp</div>
</div>
<section class="class-description" id="class-description">
<hr>
diff --git a/javadoc/no/ntnu/idatt1002/demo/class-use/MyApp.html b/javadoc/no/ntnu/idatt1002/demo/class-use/MyApp.html
index 4adb36b01f52cf9f0cdadfd3cbc3c703dc5da2f2..03126e52d417253d41cbf991d258038a6026da19 100644
--- a/javadoc/no/ntnu/idatt1002/demo/class-use/MyApp.html
+++ b/javadoc/no/ntnu/idatt1002/demo/class-use/MyApp.html
@@ -2,7 +2,7 @@
<html lang="en">
<head>
<!-- Generated by javadoc (19) on Thu Feb 02 10:19:17 CET 2023 -->
-<title>Uses of Class no.ntnu.idatt1002.demo.MyApp (demo 1.0-SNAPSHOT API)</title>
+<title>Uses of Class no.ntnu.idatt1002.demo.view.MyApp (demo 1.0-SNAPSHOT API)</title>
<meta name="viewport" content="width=device-width, initial-scale=1">
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8">
<meta name="dc.created" content="2023-02-02">
@@ -50,9 +50,9 @@ loadScripts(document, 'script');</script>
<div class="flex-content">
<main role="main">
<div class="header">
-<h1 title="Uses of Class no.ntnu.idatt1002.demo.MyApp" class="title">Uses of Class<br>no.ntnu.idatt1002.demo.MyApp</h1>
+<h1 title="Uses of Class no.ntnu.idatt1002.demo.view.MyApp" class="title">Uses of Class<br>no.ntnu.idatt1002.demo.view.MyApp</h1>
</div>
-No usage of no.ntnu.idatt1002.demo.MyApp</main>
+No usage of no.ntnu.idatt1002.demo.view.MyApp</main>
<footer role="contentinfo">
<hr>
<p class="legal-copy"><small>Copyright © 2023. All rights reserved.</small></p>
diff --git a/pom.xml b/pom.xml
index 454e08c12b85f37e49b785ea36d3e5e9e8e4a768..e60349b91d2981bb74468c723a55e5f0760f2a39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -152,7 +152,7 @@
<archive>
<manifest>
<mainClass>
- no.ntnu.idatt1002.demo.MyApp
+ no.ntnu.idatt1002.demo.view.MyApp
</mainClass>
</manifest>
</archive>
@@ -172,7 +172,7 @@
<!-- Default configuration for running with: mvn clean javafx:run -->
<id>default-cli</id>
<configuration>
- <mainClass>no.ntnu.idatt1002.demo/no.ntnu.idatt1002.demo.MyApp</mainClass>
+ <mainClass>no.ntnu.idatt1002.demo/no.ntnu.idatt1002.demo.view.MyApp</mainClass>
<launcher>app</launcher>
<jlinkZipName>app</jlinkZipName>
<jlinkImageName>app</jlinkImageName>
diff --git a/src/main/java/no/ntnu/idatt1002/demo/view/MyApp.java b/src/main/java/no/ntnu/idatt1002/demo/view/MyApp.java
new file mode 100644
index 0000000000000000000000000000000000000000..bd5d12758eabe3328291895993f3d0511a0c81cc
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/view/MyApp.java
@@ -0,0 +1,24 @@
+package no.ntnu.idatt1002.demo.view;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.stage.Stage;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+
+import java.io.IOException;
+
+public class MyApp extends Application {
+
+ @Override
+ public void start(Stage stage) throws IOException {
+ FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/FirstMenu.fxml"));
+ Parent root = loader.load();
+ Scene scene = new Scene(root);
+ stage.setScene(scene);
+ stage.show();
+ }
+ public static void main(String[] args) {
+ launch(args);
+ }
+}
\ No newline at end of file
diff --git a/src/main/java/no/ntnu/idatt1002/demo/view/NewBudget.java b/src/main/java/no/ntnu/idatt1002/demo/view/NewBudget.java
new file mode 100644
index 0000000000000000000000000000000000000000..2844313e33642897ff58d598a5b62e2e162c073d
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/view/NewBudget.java
@@ -0,0 +1,42 @@
+package no.ntnu.idatt1002.demo.view;
+
+import javafx.geometry.Insets;
+import javafx.geometry.Pos;
+import javafx.scene.Scene;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextArea;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import javafx.scene.layout.HBox;
+import javafx.scene.layout.Pane;
+import javafx.scene.layout.StackPane;
+import javafx.scene.layout.VBox;
+import javafx.scene.text.Font;
+import javafx.scene.text.FontPosture;
+import javafx.scene.text.FontWeight;
+import javafx.stage.Stage;
+
+import java.io.FileInputStream;
+import java.io.IOException;
+
+public class NewBudget {
+
+ private static StackPane root;
+ public static Pane getRoot() throws IOException {
+
+ TextArea income = new TextArea();
+ TextArea income2 = new TextArea();
+ income.setMaxSize(200, 20);
+ income2.setMaxSize(200, 20);
+ VBox inputs = new VBox();
+ inputs.getChildren().addAll(income, income2);
+ inputs.setAlignment(Pos.CENTER);
+ inputs.setSpacing(100);
+
+
+ return root;
+ }
+
+}
+
diff --git a/src/main/java/no/ntnu/idatt1002/demo/view/SceneController.java b/src/main/java/no/ntnu/idatt1002/demo/view/SceneController.java
new file mode 100644
index 0000000000000000000000000000000000000000..efaaef7b8c68b6da859d314c8b403b3f476e5272
--- /dev/null
+++ b/src/main/java/no/ntnu/idatt1002/demo/view/SceneController.java
@@ -0,0 +1,35 @@
+package no.ntnu.idatt1002.demo.view;
+
+import java.io.IOException;
+
+import javafx.event.ActionEvent;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+public class SceneController {
+
+ private Stage stage;
+ private Scene scene;
+ private Parent root;
+
+
+ public void switchStartMenu(ActionEvent event) throws IOException {
+ FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/FirstMenu.fxml"));
+ root = loader.load();
+ stage = (Stage)((Node)event.getSource()).getScene().getWindow();
+ scene = new Scene(root);
+ stage.setScene(scene);
+ stage.show();
+ }
+ public void switchNewBudget(ActionEvent event) throws IOException {
+ FXMLLoader loader = new FXMLLoader(SceneController.class.getResource("/view/NewBudget.fxml"));
+ Parent root = loader.load();
+ stage = (Stage)((Node)event.getSource()).getScene().getWindow();
+ scene = new Scene(root);
+ stage.setScene(scene);
+ stage.show();
+ }
+}
\ No newline at end of file
diff --git a/src/main/resources/Images/backgroundMini.jpg b/src/main/resources/Images/backgroundMini.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..d67d659fd817307112ddf542096c0b5ecdb014f9
Binary files /dev/null and b/src/main/resources/Images/backgroundMini.jpg differ
diff --git a/src/main/resources/Images/budgetbuddycover.jpeg b/src/main/resources/Images/budgetbuddycover.jpeg
new file mode 100644
index 0000000000000000000000000000000000000000..75e7f244e9d27b0416904cef73a52d3d88111f20
Binary files /dev/null and b/src/main/resources/Images/budgetbuddycover.jpeg differ
diff --git a/src/main/resources/view/Expenses.fxml b/src/main/resources/view/Expenses.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..0dcfe2d5fc2c6ffeaabc10034cd3e3cfc318cee7
--- /dev/null
+++ b/src/main/resources/view/Expenses.fxml
@@ -0,0 +1,131 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?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>
+ <ImageView fitHeight="400.0" fitWidth="600.0" pickOnBounds="true">
+ <image>
+ <Image url="@../Images/backgroundMini.jpg" />
+ </image>
+ <cursor>
+ <Cursor fx:constant="DEFAULT" />
+ </cursor>
+ </ImageView>
+ <BorderPane prefHeight="400.0" prefWidth="593.0">
+ <top>
+ <HBox BorderPane.alignment="CENTER">
+ <children>
+ <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>
+ <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>
diff --git a/src/main/resources/view/FirstMenu.fxml b/src/main/resources/view/FirstMenu.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..de07d4ce94f5bfedf0f0fc5d7832d6a4f362ea30
--- /dev/null
+++ b/src/main/resources/view/FirstMenu.fxml
@@ -0,0 +1,34 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane maxHeight="600" maxWidth="607.0" minHeight="406.0" minWidth="600" prefHeight="406.0" prefWidth="607.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.view.SceneController">
+ <ImageView fitHeight="412.0" fitWidth="614.0" layoutX="-7.0" layoutY="-6.0" pickOnBounds="true" smooth="false">
+ <Image url="@../Images/backgroundMini.jpg" />
+ </ImageView>
+ <Label alignment="CENTER" contentDisplay="CENTER" layoutX="73.0" layoutY="113.0" lineSpacing="1.0" text="Welcome to BudgetBuddy!" textAlignment="CENTER" textOverrun="LEADING_ELLIPSIS" wrapText="true">
+ <font>
+ <Font name="Verdana" size="34.0" />
+ </font>
+ </Label>
+ <Label ellipsisString="" layoutX="147.0" layoutY="171.0" lineSpacing="1.0" text="Please choose one of the options:" textAlignment="CENTER">
+ <font>
+ <Font name="Verdana" size="18.0" />
+ </font>
+ </Label>
+ <Button layoutX="69.0" layoutY="212.0" mnemonicParsing="false" onAction="#switchNewBudget" text="New Budget">
+ <font>
+ <Font size="24.0" />
+ </font>
+ </Button>
+ <Button layoutX="380.0" layoutY="212.0" mnemonicParsing="false" text="Old Budget">
+ <font>
+ <Font size="24.0" />
+ </font>
+ </Button>
+</AnchorPane>
diff --git a/src/main/resources/view/NewBudget.fxml b/src/main/resources/view/NewBudget.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..caf32b91e8e295b2a1b9f795c09246124b7f3bc9
--- /dev/null
+++ b/src/main/resources/view/NewBudget.fxml
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.ListView?>
+<?import javafx.scene.control.TextArea?>
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.text.Text?>
+
+<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/19" xmlns:fx="http://javafx.com/fxml/1" fx:controller="no.ntnu.idatt1002.demo.view.SceneController">
+ <children>
+ <ImageView fitHeight="400.0" fitWidth="600.0" pickOnBounds="true">
+ <image>
+ <Image url="@../Images/backgroundMini.jpg" />
+ </image>
+ </ImageView>
+ <ListView layoutX="133.0" layoutY="145.0" prefHeight="233.0" prefWidth="313.0" />
+ <TextArea layoutX="133.0" layoutY="97.0" prefHeight="39.0" prefWidth="276.0" />
+ <Button layoutX="409.0" layoutY="97.0" mnemonicParsing="false" prefHeight="39.0" prefWidth="38.0" text="+" />
+ <Text layoutX="133.0" layoutY="84.0" strokeType="OUTSIDE" strokeWidth="0.0" text="Write your income here:" />
+ <Button layoutX="14.0" layoutY="14.0" mnemonicParsing="false" onAction="#switchStartMenu" text="Back" />
+ </children>
+</AnchorPane>