Skip to content
Snippets Groups Projects
Commit 022fcec3 authored by Nicolay Schiøll-Johansen's avatar Nicolay Schiøll-Johansen
Browse files

fixed compile file

parent 14737ea6
No related branches found
No related tags found
2 merge requests!13Weekly Merge To Master,!9Added basic layout for login and sign up pages in the new project structure
Pipeline #73025 passed
Showing with 17 additions and 11 deletions
<?xml version="1.0" encoding="UTF-8"?>
<module type="JAVA_MODULE" version="4" />
\ No newline at end of file
...@@ -7,7 +7,6 @@ ...@@ -7,7 +7,6 @@
<sourceTestOutputDir name="target/generated-test-sources/test-annotations" /> <sourceTestOutputDir name="target/generated-test-sources/test-annotations" />
<outputRelativeToContentRoot value="true" /> <outputRelativeToContentRoot value="true" />
<module name="ImageApplication" /> <module name="ImageApplication" />
<module name="team-14-software-engineering" />
</profile> </profile>
</annotationProcessing> </annotationProcessing>
</component> </component>
......
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="ExternalStorageConfigurationManager" enabled="true" /> <component name="ExternalStorageConfigurationManager" enabled="true" />
<component name="JavaScriptSettings">
<option name="languageLevel" value="ES6" />
</component>
<component name="MavenProjectsManager"> <component name="MavenProjectsManager">
<option name="originalFiles"> <option name="originalFiles">
<list> <list>
...@@ -8,7 +11,7 @@ ...@@ -8,7 +11,7 @@
</list> </list>
</option> </option>
</component> </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" /> <output url="file://$PROJECT_DIR$/out" />
</component> </component>
</project> </project>
\ No newline at end of file
<?xml version="1.0" encoding="UTF-8"?> <?xml version="1.0" encoding="UTF-8"?>
<project version="4"> <project version="4">
<component name="VcsDirectoryMappings"> <component name="VcsDirectoryMappings">
<mapping directory="$PROJECT_DIR$" vcs="Git" /> <mapping directory="" vcs="Git" />
</component> </component>
</project> </project>
\ No newline at end of file
...@@ -15,7 +15,7 @@ public class App extends Application { ...@@ -15,7 +15,7 @@ public class App extends Application {
@Override @Override
public void start(Stage stage) throws IOException { public void start(Stage stage) throws IOException {
scene = new Scene(loadFXML("Login")); scene = new Scene(loadFXML("login"));
stage.setScene(scene); stage.setScene(scene);
stage.show(); stage.show();
} }
......
File deleted
No preview for this file type
...@@ -4,7 +4,7 @@ ...@@ -4,7 +4,7 @@
<?import javafx.scene.image.ImageView?> <?import javafx.scene.image.ImageView?>
<?import javafx.scene.layout.AnchorPane?> <?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> <children>
<ImageView fitHeight="150.0" fitWidth="200.0" layoutX="200.0" layoutY="125.0" pickOnBounds="true" preserveRatio="true"> <ImageView fitHeight="150.0" fitWidth="200.0" layoutX="200.0" layoutY="125.0" pickOnBounds="true" preserveRatio="true">
<image> <image>
......
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
NTNU/IDATT1002/SecondaryController.class
NTNU/IDATT1002/LoggedIn.class
NTNU/IDATT1002/PrimaryController.class
NTNU/IDATT1002/App.class
C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\App.java /Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/App.java
C:\Users\Eirik\OneDrive - NTNU\Skole\IDATT1002\ImageApplication\src\main\java\NTNU\IDATT1002\PrimaryController.java /Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/SecondaryController.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/PrimaryController.java
/Users/Shared/Previously Relocated Items/Security/Programmering/Team 14/ImageApplication/src/main/java/NTNU/IDATT1002/LoggedIn.java
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment