diff --git a/.gitignore b/.gitignore
index a4990287e087b65c55366c085040a371d6399428..14e974d2d29ac37222bb57568181e8f2f2118cf0 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,6 +1,9 @@
# Covers JetBrains IDEs: IntelliJ, RubyMine, PhpStorm, AppCode, PyCharm, CLion, Android Studio, WebStorm and Rider
# Reference: https://intellij-support.jetbrains.com/hc/en-us/articles/206544839
+target/
+.idea/
+
# User-specific stuff
.idea/**/workspace.xml
.idea/**/tasks.xml
diff --git a/.idea/.gitignore b/.idea/.gitignore
deleted file mode 100644
index 5c98b428844d9f7d529e2b6fb918d15bf072f3df..0000000000000000000000000000000000000000
--- a/.idea/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-# Default ignored files
-/workspace.xml
\ No newline at end of file
diff --git a/.idea/compiler.xml b/.idea/compiler.xml
deleted file mode 100644
index 8f00a5c3ae025facf8f25e8a49b8efaf47be78ef..0000000000000000000000000000000000000000
--- a/.idea/compiler.xml
+++ /dev/null
@@ -1,13 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="CompilerConfiguration">
- <annotationProcessing>
- <profile name="Maven default annotation processors profile" enabled="true">
- <sourceOutputDir name="target/generated-sources/annotations" />
- <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
- <outputRelativeToContentRoot value="true" />
- <module name="ImageApplication" />
- </profile>
- </annotationProcessing>
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/encodings.xml b/.idea/encodings.xml
deleted file mode 100644
index aa00ffab7828f4818589659c804ec2cfd99baed3..0000000000000000000000000000000000000000
--- a/.idea/encodings.xml
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="Encoding">
- <file url="file://$PROJECT_DIR$/src/main/java" charset="UTF-8" />
- <file url="file://$PROJECT_DIR$/src/main/resources" charset="UTF-8" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/misc.xml b/.idea/misc.xml
deleted file mode 100644
index d24ea8e7debb4071df92884f676aca977525fde9..0000000000000000000000000000000000000000
--- a/.idea/misc.xml
+++ /dev/null
@@ -1,14 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="ExternalStorageConfigurationManager" enabled="true" />
- <component name="MavenProjectsManager">
- <option name="originalFiles">
- <list>
- <option value="$PROJECT_DIR$/pom.xml" />
- </list>
- </option>
- </component>
- <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK">
- <output url="file://$PROJECT_DIR$/out" />
- </component>
-</project>
\ No newline at end of file
diff --git a/.idea/vcs.xml b/.idea/vcs.xml
deleted file mode 100644
index 94a25f7f4cb416c083d265558da75d457237d671..0000000000000000000000000000000000000000
--- a/.idea/vcs.xml
+++ /dev/null
@@ -1,6 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<project version="4">
- <component name="VcsDirectoryMappings">
- <mapping directory="$PROJECT_DIR$" vcs="Git" />
- </component>
-</project>
\ No newline at end of file
diff --git a/ImageApplication.iml b/ImageApplication.iml
index 78b2cc53b203f0b97534bb1184cdc7b474339fb4..17c32733b6a4d708a270f93539323b1e277f363a 100644
--- a/ImageApplication.iml
+++ b/ImageApplication.iml
@@ -1,2 +1,22 @@
<?xml version="1.0" encoding="UTF-8"?>
-<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
+<module org.jetbrains.idea.maven.project.MavenProjectsManager.isMavenModule="true" type="JAVA_MODULE" version="4">
+ <component name="NewModuleRootManager" LANGUAGE_LEVEL="JDK_11">
+ <output url="file://$MODULE_DIR$/target/classes" />
+ <output-test url="file://$MODULE_DIR$/target/test-classes" />
+ <content url="file://$MODULE_DIR$">
+ <sourceFolder url="file://$MODULE_DIR$/src/main/java" isTestSource="false" />
+ <sourceFolder url="file://$MODULE_DIR$/src/main/resources" type="java-resource" />
+ <excludeFolder url="file://$MODULE_DIR$/target" />
+ </content>
+ <orderEntry type="inheritedJdk" />
+ <orderEntry type="sourceFolder" forTests="false" />
+ <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:13" level="project" />
+ <orderEntry type="library" name="Maven: org.openjfx:javafx-controls:mac:13" level="project" />
+ <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:13" level="project" />
+ <orderEntry type="library" name="Maven: org.openjfx:javafx-graphics:mac:13" level="project" />
+ <orderEntry type="library" name="Maven: org.openjfx:javafx-base:13" level="project" />
+ <orderEntry type="library" name="Maven: org.openjfx:javafx-base:mac:13" level="project" />
+ <orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:13" level="project" />
+ <orderEntry type="library" name="Maven: org.openjfx:javafx-fxml:mac:13" level="project" />
+ </component>
+</module>
\ No newline at end of file
diff --git a/src/main/java/NTNU/IDATT1002/App.java b/src/main/java/NTNU/IDATT1002/App.java
index 741448f26ca7b2c05acd6c482639d5fe3faaeacd..1edc0bd5753db883e0d7be0319bc9473ae1895d4 100644
--- a/src/main/java/NTNU/IDATT1002/App.java
+++ b/src/main/java/NTNU/IDATT1002/App.java
@@ -15,7 +15,7 @@ public class App extends Application {
@Override
public void start(Stage stage) throws IOException {
- scene = new Scene(loadFXML("primary"));
+ scene = new Scene(loadFXML("login"));
stage.setScene(scene);
stage.show();
}
diff --git a/src/main/java/NTNU/IDATT1002/LoggedIn.java b/src/main/java/NTNU/IDATT1002/LoggedIn.java
new file mode 100644
index 0000000000000000000000000000000000000000..a5dfa507ed9751e5fe14709dc113ce179961d824
--- /dev/null
+++ b/src/main/java/NTNU/IDATT1002/LoggedIn.java
@@ -0,0 +1,4 @@
+package NTNU.IDATT1002;
+
+public class LoggedIn {
+}
diff --git a/src/main/java/NTNU/IDATT1002/PrimaryController.java b/src/main/java/NTNU/IDATT1002/PrimaryController.java
index 108082aaf1cc7766bf1f5bc430ca79e01db050e9..07804a5932394466a0d8ae86453e577175b5b981 100644
--- a/src/main/java/NTNU/IDATT1002/PrimaryController.java
+++ b/src/main/java/NTNU/IDATT1002/PrimaryController.java
@@ -1,12 +1,19 @@
package NTNU.IDATT1002;
import java.io.IOException;
+
+import javafx.event.ActionEvent;
import javafx.fxml.FXML;
public class PrimaryController {
@FXML
private void switchToSecondary() throws IOException {
- App.setRoot("secondary");
+ App.setRoot("signup");
+ }
+
+
+ public void switchToLoggedIn(ActionEvent actionEvent) throws IOException {
+ App.setRoot("logged-in");
}
}
diff --git a/src/main/java/NTNU/IDATT1002/SecondaryController.java b/src/main/java/NTNU/IDATT1002/SecondaryController.java
index 5cec98b3574b6980990236dd04a30b1dd5628cf0..b8a2a3eb70471a14faa03c9d2b9aae9482ab5c4c 100644
--- a/src/main/java/NTNU/IDATT1002/SecondaryController.java
+++ b/src/main/java/NTNU/IDATT1002/SecondaryController.java
@@ -7,6 +7,6 @@ public class SecondaryController {
@FXML
private void switchToPrimary() throws IOException {
- App.setRoot("primary");
+ App.setRoot("login");
}
}
\ No newline at end of file
diff --git a/src/main/resources/Images/party.jpg b/src/main/resources/Images/party.jpg
new file mode 100644
index 0000000000000000000000000000000000000000..6a14372c764eaf8d6aa0f53a31dd28381d25774a
Binary files /dev/null and b/src/main/resources/Images/party.jpg differ
diff --git a/src/main/resources/NTNU/IDATT1002/logged-in.fxml b/src/main/resources/NTNU/IDATT1002/logged-in.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..0e4f965206e96bd06bcf373f7257dda94f87f02d
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/logged-in.fxml
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.image.Image?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.AnchorPane?>
+
+<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.LoggedIn">
+ <children>
+ <ImageView fitHeight="150.0" fitWidth="200.0" layoutX="200.0" layoutY="125.0" pickOnBounds="true" preserveRatio="true">
+ <image>
+ <Image url="@../../Images/party.jpg" />
+ </image>
+ </ImageView>
+ </children>
+</AnchorPane>
diff --git a/src/main/resources/NTNU/IDATT1002/login.fxml b/src/main/resources/NTNU/IDATT1002/login.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..815e50ffd41bdd8c595b40a05a827fbf42c04575
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/login.fxml
@@ -0,0 +1,43 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
+
+<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml" fx:controller="NTNU.IDATT1002.PrimaryController">
+ <children>
+ <Label text="Login Page" />
+ <GridPane hgap="10.0" maxWidth="300.0" prefHeight="90.0" prefWidth="200.0" vgap="10.0">
+ <columnConstraints>
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="5.0" prefWidth="70.0" />
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="30.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>
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Username:" GridPane.halignment="RIGHT" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Password:" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
+ <TextField GridPane.columnIndex="1" />
+ <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="1" />
+ <Button fx:id="primaryButton" onAction="#switchToSecondary" text="Sign Up" GridPane.columnIndex="1" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
+ <Button fx:id="primaryButton1" layoutX="171.0" layoutY="74.0" onAction="#switchToLoggedIn" text="Log In" GridPane.columnIndex="1" GridPane.halignment="LEFT" GridPane.rowIndex="2" />
+ </children>
+ <padding>
+ <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
+ </padding>
+ </GridPane>
+ </children>
+ <padding>
+ <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+ </padding>
+</VBox>
diff --git a/src/main/resources/NTNU/IDATT1002/primary.fxml b/src/main/resources/NTNU/IDATT1002/primary.fxml
deleted file mode 100644
index 1761dcc3e0703b384ceb5f56ee316331ca347366..0000000000000000000000000000000000000000
--- a/src/main/resources/NTNU/IDATT1002/primary.fxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Button?>
-<?import javafx.geometry.Insets?>
-
-<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.PrimaryController">
- <children>
- <Label text="Primary View" />
- <Button fx:id="primaryButton" text="Switch to Secondary View" onAction="#switchToSecondary"/>
- </children>
- <padding>
- <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
- </padding>
-</VBox>
diff --git a/src/main/resources/NTNU/IDATT1002/secondary.fxml b/src/main/resources/NTNU/IDATT1002/secondary.fxml
deleted file mode 100644
index 09145233b69fb2f9186fa2209a07a0e47035f76b..0000000000000000000000000000000000000000
--- a/src/main/resources/NTNU/IDATT1002/secondary.fxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Button?>
-<?import javafx.geometry.Insets?>
-
-<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.SecondaryController">
- <children>
- <Label text="Secondary View" />
- <Button fx:id="secondaryButton" text="Switch to Primary View" onAction="#switchToPrimary" />
- </children>
- <padding>
- <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
- </padding>
-</VBox>
diff --git a/src/main/resources/NTNU/IDATT1002/signup.fxml b/src/main/resources/NTNU/IDATT1002/signup.fxml
new file mode 100644
index 0000000000000000000000000000000000000000..59ddd040c8cede8d51335933a532161b8b08b1da
--- /dev/null
+++ b/src/main/resources/NTNU/IDATT1002/signup.fxml
@@ -0,0 +1,44 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.ColumnConstraints?>
+<?import javafx.scene.layout.GridPane?>
+<?import javafx.scene.layout.RowConstraints?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Text?>
+
+<VBox alignment="CENTER" prefHeight="400.0" prefWidth="600.0" spacing="20.0" xmlns="http://javafx.com/javafx" xmlns:fx="http://javafx.com/fxml/" fx:controller="NTNU.IDATT1002.SecondaryController">
+ <children>
+ <Label text="Sign Up page" />
+ <GridPane hgap="10.0" maxWidth="-Infinity" prefHeight="110.0" prefWidth="300.0" vgap="10.0">
+ <columnConstraints>
+ <ColumnConstraints hgrow="SOMETIMES" maxWidth="-Infinity" minWidth="10.0" prefWidth="80.0" />
+ <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.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>
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Username:" GridPane.halignment="RIGHT" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="E-Mail:" GridPane.halignment="RIGHT" GridPane.rowIndex="1" />
+ <Text strokeType="OUTSIDE" strokeWidth="0.0" text="Password:" GridPane.halignment="RIGHT" GridPane.rowIndex="2" />
+ <TextField GridPane.columnIndex="1" />
+ <TextField GridPane.columnIndex="1" GridPane.rowIndex="1" />
+ <PasswordField GridPane.columnIndex="1" GridPane.rowIndex="2" />
+ </children>
+ <padding>
+ <Insets bottom="3.0" left="3.0" right="3.0" top="3.0" />
+ </padding>
+ </GridPane>
+ <Button fx:id="secondaryButton" onAction="#switchToPrimary" text="Sign up" />
+ </children>
+ <padding>
+ <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+ </padding>
+</VBox>
diff --git a/target/classes/NTNU/IDATT1002/App.class b/target/classes/NTNU/IDATT1002/App.class
deleted file mode 100644
index 7802e3aeea832e6acbb1500d96902229a0697438..0000000000000000000000000000000000000000
Binary files a/target/classes/NTNU/IDATT1002/App.class and /dev/null differ
diff --git a/target/classes/NTNU/IDATT1002/PrimaryController.class b/target/classes/NTNU/IDATT1002/PrimaryController.class
deleted file mode 100644
index 18a11f4d93a16af27530c61f6fc68fdb722aa0ae..0000000000000000000000000000000000000000
Binary files a/target/classes/NTNU/IDATT1002/PrimaryController.class and /dev/null differ
diff --git a/target/classes/NTNU/IDATT1002/SecondaryController.class b/target/classes/NTNU/IDATT1002/SecondaryController.class
deleted file mode 100644
index 820c07aaf2801a9e56c9e5e5ae0f01e3730b948f..0000000000000000000000000000000000000000
Binary files a/target/classes/NTNU/IDATT1002/SecondaryController.class and /dev/null differ
diff --git a/target/classes/NTNU/IDATT1002/primary.fxml b/target/classes/NTNU/IDATT1002/primary.fxml
deleted file mode 100644
index 1761dcc3e0703b384ceb5f56ee316331ca347366..0000000000000000000000000000000000000000
--- a/target/classes/NTNU/IDATT1002/primary.fxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Button?>
-<?import javafx.geometry.Insets?>
-
-<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.PrimaryController">
- <children>
- <Label text="Primary View" />
- <Button fx:id="primaryButton" text="Switch to Secondary View" onAction="#switchToSecondary"/>
- </children>
- <padding>
- <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
- </padding>
-</VBox>
diff --git a/target/classes/NTNU/IDATT1002/secondary.fxml b/target/classes/NTNU/IDATT1002/secondary.fxml
deleted file mode 100644
index 09145233b69fb2f9186fa2209a07a0e47035f76b..0000000000000000000000000000000000000000
--- a/target/classes/NTNU/IDATT1002/secondary.fxml
+++ /dev/null
@@ -1,16 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.scene.layout.VBox?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.Button?>
-<?import javafx.geometry.Insets?>
-
-<VBox alignment="CENTER" spacing="20.0" xmlns="http://javafx.com/javafx/8.0.171" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.SecondaryController">
- <children>
- <Label text="Secondary View" />
- <Button fx:id="secondaryButton" text="Switch to Primary View" onAction="#switchToPrimary" />
- </children>
- <padding>
- <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
- </padding>
-</VBox>
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-cli/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-cli/createdFiles.lst
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst
deleted file mode 100644
index 7cbf2f2b76290aaf017bd390a6d83de34d722aac..0000000000000000000000000000000000000000
--- a/target/maven-status/maven-compiler-plugin/compile/default-cli/inputFiles.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\App.java
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\PrimaryController.java
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\SecondaryController.java
diff --git a/target/maven-status/maven-compiler-plugin/compile/null/createdFiles.lst b/target/maven-status/maven-compiler-plugin/compile/null/createdFiles.lst
deleted file mode 100644
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0000000000000000000000000000000000000000
diff --git a/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst
deleted file mode 100644
index 7cbf2f2b76290aaf017bd390a6d83de34d722aac..0000000000000000000000000000000000000000
--- a/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst
+++ /dev/null
@@ -1,3 +0,0 @@
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\App.java
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\PrimaryController.java
-C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\SecondaryController.java