diff --git a/.idea/ImageApplication.iml b/.idea/ImageApplication.iml new file mode 100644 index 0000000000000000000000000000000000000000..78b2cc53b203f0b97534bb1184cdc7b474339fb4 --- /dev/null +++ b/.idea/ImageApplication.iml @@ -0,0 +1,2 @@ +<?xml version="1.0" encoding="UTF-8"?> +<module type="JAVA_MODULE" version="4" /> \ No newline at end of file diff --git a/.idea/compiler.xml b/.idea/compiler.xml index 8a3925573a4b4da3936a5b811451e7028ee39d20..8f00a5c3ae025facf8f25e8a49b8efaf47be78ef 100644 --- a/.idea/compiler.xml +++ b/.idea/compiler.xml @@ -7,7 +7,6 @@ <sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <outputRelativeToContentRoot value="true" /> <module name="ImageApplication" /> - <module name="team-14-software-engineering" /> </profile> </annotationProcessing> </component> diff --git a/.idea/misc.xml b/.idea/misc.xml index d24ea8e7debb4071df92884f676aca977525fde9..8a27f0be8802d186a3374461f2ff4dc2b8667c9a 100644 --- a/.idea/misc.xml +++ b/.idea/misc.xml @@ -1,6 +1,9 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="ExternalStorageConfigurationManager" enabled="true" /> + <component name="JavaScriptSettings"> + <option name="languageLevel" value="ES6" /> + </component> <component name="MavenProjectsManager"> <option name="originalFiles"> <list> @@ -8,7 +11,7 @@ </list> </option> </component> - <component name="ProjectRootManager" version="2" languageLevel="JDK_11" project-jdk-name="11" project-jdk-type="JavaSDK"> + <component name="ProjectRootManager" version="2" languageLevel="JDK_11" default="false" 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 index 94a25f7f4cb416c083d265558da75d457237d671..35eb1ddfbbc029bcab630581847471d7f238ec53 100644 --- a/.idea/vcs.xml +++ b/.idea/vcs.xml @@ -1,6 +1,6 @@ <?xml version="1.0" encoding="UTF-8"?> <project version="4"> <component name="VcsDirectoryMappings"> - <mapping directory="$PROJECT_DIR$" vcs="Git" /> + <mapping directory="" vcs="Git" /> </component> </project> \ 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 440db2ffb206befebc5c60ca80426027e8d3d453..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("Login")); + scene = new Scene(loadFXML("login")); stage.setScene(scene); stage.show(); } diff --git a/target/classes/META-INF/team-14-software-engineering.kotlin_module b/target/classes/META-INF/team-14-software-engineering.kotlin_module deleted file mode 100644 index a49347afef10a9b5f95305e1058ba36adec7d6dd..0000000000000000000000000000000000000000 Binary files a/target/classes/META-INF/team-14-software-engineering.kotlin_module and /dev/null differ diff --git a/target/classes/NTNU/IDATT1002/App.class b/target/classes/NTNU/IDATT1002/App.class index 5c22c737004984638d7f5237f07c2117e5fe340a..3ccc92e611c82414752d2a5c564c5f29e32a5d99 100644 Binary files a/target/classes/NTNU/IDATT1002/App.class and b/target/classes/NTNU/IDATT1002/App.class differ diff --git a/target/classes/NTNU/IDATT1002/logged-in.fxml b/target/classes/NTNU/IDATT1002/logged-in.fxml index 8f022dc618e30ce020f636ad1f8cd3295eda409c..0e4f965206e96bd06bcf373f7257dda94f87f02d 100644 --- a/target/classes/NTNU/IDATT1002/logged-in.fxml +++ b/target/classes/NTNU/IDATT1002/logged-in.fxml @@ -4,7 +4,7 @@ <?import javafx.scene.image.ImageView?> <?import javafx.scene.layout.AnchorPane?> -<AnchorPane prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/11.0.1" xmlns:fx="http://javafx.com/fxml/1" fx:controller="NTNU.IDATT1002.LoggedIn"> +<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> 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 index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..0e7f130ef39f05ef01ef8ca8d8c0d13fb495600c 100644 --- a/target/maven-status/maven-compiler-plugin/compile/null/createdFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/null/createdFiles.lst @@ -0,0 +1,4 @@ +NTNU/IDATT1002/SecondaryController.class +NTNU/IDATT1002/LoggedIn.class +NTNU/IDATT1002/PrimaryController.class +NTNU/IDATT1002/App.class diff --git a/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst b/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst index 7cbf2f2b76290aaf017bd390a6d83de34d722aac..ad9b0c8eafc3ef16cbef3008a6c2e116c8713b21 100644 --- a/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst +++ b/target/maven-status/maven-compiler-plugin/compile/null/inputFiles.lst @@ -1,3 +1,4 @@ -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 +/Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/App.java +/Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/SecondaryController.java +/Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/PrimaryController.java +/Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/LoggedIn.java