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 3a8655809451505936ea5ce338725fdc526631ce..e60349b91d2981bb74468c723a55e5f0760f2a39 100644
--- a/pom.xml
+++ b/pom.xml
@@ -15,7 +15,7 @@
<maven.compiler.target>17</maven.compiler.target>
<project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
<junit.version>5.8.1</junit.version>
- <javafx.version>17.0.6</javafx.version>
+ <javafx.version>17.0.1</javafx.version>
</properties>
<repositories>
@@ -152,7 +152,7 @@
<archive>
<manifest>
<mainClass>
- no.ntnu.idatt1002.demo.MyApp
+ no.ntnu.idatt1002.demo.view.MyApp
</mainClass>
</manifest>
</archive>
@@ -172,8 +172,7 @@
<!-- Default configuration for running with: mvn clean javafx:run -->
<id>default-cli</id>
<configuration>
- <mainClass>no.ntnu.idatt1002.demo.MyApp</mainClass>
- <executable>C:\Program Files\Java\jdk-17\bin\java.exe</executable>
+ <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/MyApp.java b/src/main/java/no/ntnu/idatt1002/demo/view/MyApp.java
similarity index 55%
rename from src/main/java/no/ntnu/idatt1002/demo/MyApp.java
rename to src/main/java/no/ntnu/idatt1002/demo/view/MyApp.java
index 8450b33fcfa9785f427ac7b5f1e4966f77d38d54..bd5d12758eabe3328291895993f3d0511a0c81cc 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/MyApp.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/view/MyApp.java
@@ -1,4 +1,4 @@
-package no.ntnu.idatt1002.demo;
+package no.ntnu.idatt1002.demo.view;
import javafx.application.Application;
import javafx.fxml.FXMLLoader;
@@ -6,21 +6,17 @@ import javafx.stage.Stage;
import javafx.scene.Parent;
import javafx.scene.Scene;
-import java.util.Objects;
+import java.io.IOException;
public class MyApp extends Application {
- @Override
- public void start(Stage stage) {
- try {
- Parent root = FXMLLoader.load(Objects.requireNonNull(getClass().getResource("FirstMenu.fxml")));
+ @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();
-
- } catch(Exception e) {
- e.printStackTrace();
- }
}
public static void main(String[] args) {
launch(args);
diff --git a/src/main/java/no/ntnu/idatt1002/demo/view/NewBudget.fxml b/src/main/java/no/ntnu/idatt1002/demo/view/NewBudget.fxml
deleted file mode 100644
index 3105571c9455d707e03f7262dd4b15b806e381f7..0000000000000000000000000000000000000000
--- a/src/main/java/no/ntnu/idatt1002/demo/view/NewBudget.fxml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx"
- xmlns:fx="http://javafx.com/fxml"
- fx:controller="no.ntnu.idatt1002.demo.view.NewBudget"
- prefHeight="400.0" prefWidth="600.0">
-
-</AnchorPane>
diff --git a/src/main/java/no/ntnu/idatt1002/demo/sceneController.java b/src/main/java/no/ntnu/idatt1002/demo/view/sceneController.java
similarity index 72%
rename from src/main/java/no/ntnu/idatt1002/demo/sceneController.java
rename to src/main/java/no/ntnu/idatt1002/demo/view/sceneController.java
index fd0cf1987fb1b94fd5449be89524438653f41ba1..30f086968a22885122dea7536f45442cc73edd00 100644
--- a/src/main/java/no/ntnu/idatt1002/demo/sceneController.java
+++ b/src/main/java/no/ntnu/idatt1002/demo/view/sceneController.java
@@ -1,8 +1,7 @@
-package no.ntnu.idatt1002.demo;
+package no.ntnu.idatt1002.demo.view;
import java.io.IOException;
-import java.util.Objects;
import javafx.event.ActionEvent;
import javafx.fxml.FXMLLoader;
import javafx.scene.Node;
@@ -16,18 +15,18 @@ public class sceneController {
private Scene scene;
private Parent root;
+
public void switchStartMenu(ActionEvent event) throws IOException {
- root = FXMLLoader.load(
- Objects.requireNonNull(getClass().getResource("view/StartMenu.fxml")));
+ 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 {
- root = FXMLLoader.load(
- Objects.requireNonNull(getClass().getResource("view/NewBudget.fxml")));
+ 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);
diff --git a/src/main/resources/CSS/outline.css b/src/main/resources/CSS/outline.css
deleted file mode 100644
index 1680a4b7e2480ae5271397b6cd8cfe1e21f2133a..0000000000000000000000000000000000000000
--- a/src/main/resources/CSS/outline.css
+++ /dev/null
@@ -1,9 +0,0 @@
-.label {
- -fx-font-size: 60px;
-}
-
-.outline.label .text {
- -fx-fill: white;
- -fx-stroke: black;
- -fx-stroke-width: 2px;
-}
\ No newline at end of file
diff --git a/src/main/resources/Defaults/backgroundMini.jpg b/src/main/resources/Images/backgroundMini.jpg
similarity index 100%
rename from src/main/resources/Defaults/backgroundMini.jpg
rename to src/main/resources/Images/backgroundMini.jpg
diff --git a/src/main/resources/Defaults/budgetbuddycover.jpeg b/src/main/resources/Images/budgetbuddycover.jpeg
similarity index 100%
rename from src/main/resources/Defaults/budgetbuddycover.jpeg
rename to src/main/resources/Images/budgetbuddycover.jpeg
diff --git a/src/main/resources/Windows/FirstMenu.fxml b/src/main/resources/Windows/FirstMenu.fxml
deleted file mode 100644
index 853195ed01dbb4bd8f43e04c91b145c4ecb3ef2a..0000000000000000000000000000000000000000
--- a/src/main/resources/Windows/FirstMenu.fxml
+++ /dev/null
@@ -1,38 +0,0 @@
-<?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="-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="no.ntnu.idatt1002.demo.sceneController">
- <children>
- <ImageView fitHeight="412.0" fitWidth="614.0" layoutX="-7.0" layoutY="-6.0" pickOnBounds="true" smooth="false">
- <image>
- <Image url="@../Defaults/backgroundMini.jpg" />
- </image>
- </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" 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>
- </children>
-</AnchorPane>
diff --git a/src/main/resources/view/FirstMenu.fxml b/src/main/resources/view/FirstMenu.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..6eaa60cb521adee04fbea6dea06402f5195f19da
--- /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..454ea846bfcc4898f82007512d167d55480a5c09
--- /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>