Merge pull request #44 from cathrkri/feature/javafx-frontpage

Added config to pom.xml and main. Also added fxml files for JavaFX
cathrkri · Mar 10, 2026 · b42e3ed · b42e3ed
2 parents 69dbc74 + b24af6c
commit b42e3ed
Show file tree

Hide file tree

Showing 27 changed files with 67 additions and 78 deletions.
diff --git a/helpmehelpapplication/pom.xml b/helpmehelpapplication/pom.xml
@@ -25,6 +25,11 @@
             <artifactId>javafx-controls</artifactId>
             <version>25.0.1</version>
         </dependency>
+        <dependency>
+            <groupId>org.openjfx</groupId>
+            <artifactId>javafx-fxml</artifactId>
+            <version>25.0.1</version>
+        </dependency>
     </dependencies>
 
     <build>
@@ -49,7 +54,7 @@
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.8</version>
                 <configuration>
-                    <mainClass>ntnu.gruppe21.Main</mainClass>
+                    <mainClass>ntnu.systemutvikling.team6.Main</mainClass>
                 </configuration>
             </plugin>
 

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java
@@ -1,7 +1,22 @@
-package ntnu.sytemutvikling.team6;
+package ntnu.systemutvikling.team6;
+
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
+
+public class Main extends Application {
+
+  @Override
+  public void start(Stage stage) throws Exception {
+    FXMLLoader fxmlLoader = new FXMLLoader(Main.class.getResource("/fxml/frontPage.fxml"));
+    Scene scene = new Scene(fxmlLoader.load());
+    stage.setTitle("Help Me Help");
+    stage.setScene(scene);
+    stage.show();
+  }
 
-public class Main {
   public static void main(String[] args) {
-    System.out.println("Hello world!");
+    launch(args);
   }
 }
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Charity.java
@@ -4,7 +4,7 @@
  *
  * @author Adrian Balunan
  */
-package ntnu.sytemutvikling.team6.models;
+package ntnu.systemutvikling.team6.models;
 
 import java.util.ArrayList;
 import java.util.List;

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/CharityRegistry.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/CharityRegistry.java
@@ -1,4 +1,4 @@
-package ntnu.sytemutvikling.team6.models;
+package ntnu.systemutvikling.team6.models;
 
 import java.util.*;
 

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Donation.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Donation.java
@@ -1,8 +1,8 @@
-package ntnu.sytemutvikling.team6.models;
+package ntnu.systemutvikling.team6.models;
 
 import java.time.LocalDateTime;
 import java.util.UUID;
-import ntnu.sytemutvikling.team6.models.user.User;
+import ntnu.systemutvikling.team6.models.user.User;
 
 public class Donation {
   /* UUID for uniquely identifying each donation */

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/DonationRegistry.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/DonationRegistry.java
@@ -1,4 +1,4 @@
-package ntnu.sytemutvikling.team6.models;
+package ntnu.systemutvikling.team6.models;
 
 import java.util.*;
 

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Feedback.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Feedback.java
@@ -1,8 +1,8 @@
-package ntnu.sytemutvikling.team6.models;
+package ntnu.systemutvikling.team6.models;
 
 import java.time.LocalDateTime;
 import java.util.UUID;
-import ntnu.sytemutvikling.team6.models.user.User;
+import ntnu.systemutvikling.team6.models.user.User;
 
 public class Feedback {
   /* Feedback id */

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/UserRegistry.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/UserRegistry.java
@@ -1,3 +1,3 @@
-package ntnu.sytemutvikling.team6.models;
+package ntnu.systemutvikling.team6.models;
 
 public class UserRegistry {}
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Inbox.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Inbox.java
@@ -1,4 +1,4 @@
-package ntnu.sytemutvikling.team6.models.user;
+package ntnu.systemutvikling.team6.models.user;
 
 import java.util.*;
 

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Language.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Language.java
@@ -1,4 +1,4 @@
-package ntnu.sytemutvikling.team6.models.user;
+package ntnu.systemutvikling.team6.models.user;
 
 /**
  * Supported application languages.

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Message.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Message.java
@@ -1,4 +1,4 @@
-package ntnu.sytemutvikling.team6.models.user;
+package ntnu.systemutvikling.team6.models.user;
 
 import java.time.LocalDateTime;
 import java.util.UUID;

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Role.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Role.java
@@ -1,4 +1,4 @@
-package ntnu.sytemutvikling.team6.models.user;
+package ntnu.systemutvikling.team6.models.user;
 
 /**
  * Available users

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Settings.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/Settings.java
@@ -1,4 +1,4 @@
-package ntnu.sytemutvikling.team6.models.user;
+package ntnu.systemutvikling.team6.models.user;
 
 // Mangler Enhetstesting
 

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/user/User.java
@@ -1,7 +1,7 @@
-package ntnu.sytemutvikling.team6.models.user;
+package ntnu.systemutvikling.team6.models.user;
 
 import java.util.UUID;
-import ntnu.sytemutvikling.team6.security.PasswordHasher;
+import ntnu.systemutvikling.team6.security.PasswordHasher;
 
 /**
  * Represents a user in the system.

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/security/PasswordHasher.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/security/PasswordHasher.java
@@ -1,4 +1,4 @@
-package ntnu.sytemutvikling.team6.security;
+package ntnu.systemutvikling.team6.security;
 
 import java.security.MessageDigest;
 import java.security.SecureRandom;

diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/CharityService.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/CharityService.java
@@ -1,3 +1,3 @@
-package ntnu.sytemutvikling.team6.service;
+package ntnu.systemutvikling.team6.service;
 
 public class CharityService {}
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/DonationService.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/DonationService.java
@@ -1,3 +1,3 @@
-package ntnu.sytemutvikling.team6.service;
+package ntnu.systemutvikling.team6.service;
 
 public class DonationService {}
diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/FeedbackService.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/FeedbackService.java
@@ -1,3 +1,3 @@
-package ntnu.sytemutvikling.team6.service;
+package ntnu.systemutvikling.team6.service;
 
 public class FeedbackService {}
diff --git a/helpmehelpapplication/src/main/resources/fxml/donationPage.fxml b/helpmehelpapplication/src/main/resources/fxml/donationPage.fxml
@@ -17,7 +17,7 @@
 <?import javafx.scene.shape.Rectangle?>
 <?import javafx.scene.text.Font?>
 
-<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/25">
+<GridPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="600.0" prefWidth="800.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1">
   <columnConstraints>
     <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
   </columnConstraints>
@@ -41,7 +41,7 @@
                <children>
                   <ImageView fitHeight="54.0" fitWidth="67.0" pickOnBounds="true" preserveRatio="true" translateX="10.0">
                      <image>
-                        <Image url="@../hmhikon.png" />
+                        <Image url="@../images/Logo.png" />
                      </image>
                      <cursor>
                         <Cursor fx:constant="HAND" />
@@ -99,6 +99,7 @@
                   <GridPane GridPane.columnIndex="1">
                     <columnConstraints>
                       <ColumnConstraints hgrow="SOMETIMES" minWidth="10.0" prefWidth="100.0" />
+                        <ColumnConstraints />
                     </columnConstraints>
                     <rowConstraints>
                       <RowConstraints minHeight="10.0" percentHeight="75.0" prefHeight="30.0" vgrow="SOMETIMES" />
@@ -229,7 +230,7 @@
                      <children>
                         <ImageView fitHeight="71.0" fitWidth="161.0" pickOnBounds="true" preserveRatio="true" translateX="-60.0" translateY="-30.0">
                            <image>
-                              <Image url="@../hmhbadge.png" />
+                              <Image url="@../images/img.png" />
                            </image>
                         </ImageView>
                         <Label maxWidth="200.0" text="All data is consistently updated and reverified" textAlignment="CENTER" textFill="WHITE" translateY="30.0" wrapText="true">

diff --git a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml
@@ -42,7 +42,7 @@
                <children>
                   <ImageView fitHeight="54.0" fitWidth="67.0" pickOnBounds="true" preserveRatio="true" translateX="10.0">
                      <image>
-                        <Image url="@../images/48f69f7d7c9649446ceffed7944a4a477c1328df.png" />
+                        <Image url="@../images/Logo.png" />
                      </image>
                      <cursor>
                         <Cursor fx:constant="HAND" />
@@ -365,7 +365,7 @@
                      <children>
                         <ImageView fitHeight="71.0" fitWidth="161.0" pickOnBounds="true" preserveRatio="true" translateX="-60.0" translateY="-30.0">
                            <image>
-                              <Image url="@../images/Vector.png" />
+                              <Image url="@../images/img.png" />
                            </image>
                         </ImageView>
                         <Label maxWidth="200.0" text="All data is consistently updated and reverified" textAlignment="CENTER" textFill="WHITE" translateY="30.0" wrapText="true">

diff --git a/...ehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java b/...ehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java
@@ -5,8 +5,6 @@
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
-import ntnu.sytemutvikling.team6.models.Charity;
-import ntnu.sytemutvikling.team6.models.CharityRegistry;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/CharityTest.java
@@ -3,7 +3,6 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.util.UUID;
-import ntnu.sytemutvikling.team6.models.Charity;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/DonationTest.java
@@ -3,12 +3,10 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.time.LocalDateTime;
-import ntnu.sytemutvikling.team6.models.Charity;
-import ntnu.sytemutvikling.team6.models.Donation;
-import ntnu.sytemutvikling.team6.models.user.Inbox;
-import ntnu.sytemutvikling.team6.models.user.Role;
-import ntnu.sytemutvikling.team6.models.user.Settings;
-import ntnu.sytemutvikling.team6.models.user.User;
+import ntnu.systemutvikling.team6.models.user.Inbox;
+import ntnu.systemutvikling.team6.models.user.Role;
+import ntnu.systemutvikling.team6.models.user.Settings;
+import ntnu.systemutvikling.team6.models.user.User;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/FeedbackTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/FeedbackTest.java
@@ -3,11 +3,10 @@
 import static org.junit.jupiter.api.Assertions.*;
 
 import java.time.LocalDateTime;
-import ntnu.sytemutvikling.team6.models.Feedback;
-import ntnu.sytemutvikling.team6.models.user.Inbox;
-import ntnu.sytemutvikling.team6.models.user.Role;
-import ntnu.sytemutvikling.team6.models.user.Settings;
-import ntnu.sytemutvikling.team6.models.user.User;
+import ntnu.systemutvikling.team6.models.user.Inbox;
+import ntnu.systemutvikling.team6.models.user.Role;
+import ntnu.systemutvikling.team6.models.user.Settings;
+import ntnu.systemutvikling.team6.models.user.User;
 import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 

diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/user/SettingsTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/user/SettingsTest.java
@@ -2,8 +2,6 @@
 
 import static org.junit.jupiter.api.Assertions.*;
 
-import ntnu.sytemutvikling.team6.models.user.Language;
-import ntnu.sytemutvikling.team6.models.user.Settings;
 import org.junit.jupiter.api.Test;
 
 class SettingsTest {

diff --git a/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/user/UserTest.java b/helpmehelpapplication/src/test/java/ntnu/systemutvikling/team6/models/user/UserTest.java
@@ -4,11 +4,6 @@
 import static org.junit.jupiter.api.Assertions.assertEquals;
 
 import java.util.UUID;
-
-import ntnu.sytemutvikling.team6.models.user.Inbox;
-import ntnu.sytemutvikling.team6.models.user.Role;
-import ntnu.sytemutvikling.team6.models.user.Settings;
-import ntnu.sytemutvikling.team6.models.user.User;
 import org.junit.jupiter.api.Nested;
 import org.junit.jupiter.api.Test;
 
@@ -28,18 +23,14 @@ class constructorTests {
     void shouldThrowIfNameIsNull() {
       assertThrows(
           IllegalArgumentException.class,
-          () ->
-              new User(
-                   null, validEmail, validPassword, validRole, validSettings, validInbox));
+          () -> new User(null, validEmail, validPassword, validRole, validSettings, validInbox));
     }
 
     @Test
     void shouldThrowIfNameIsBlank() {
       assertThrows(
           IllegalArgumentException.class,
-          () ->
-              new User(
-                   " ", validEmail, validPassword, validRole, validSettings, validInbox));
+          () -> new User(" ", validEmail, validPassword, validRole, validSettings, validInbox));
     }
 
     @Nested
@@ -49,18 +40,14 @@ class emailTests {
       void shouldThrowIfEmailIsNull() {
         assertThrows(
             IllegalArgumentException.class,
-            () ->
-                new User(
-                     validName, null, validPassword, validRole, validSettings, validInbox));
+            () -> new User(validName, null, validPassword, validRole, validSettings, validInbox));
       }
 
       @Test
       void shouldThrowIfEmailIsBlank() {
         assertThrows(
             IllegalArgumentException.class,
-            () ->
-                new User(
-                     validName, " ", validPassword, validRole, validSettings, validInbox));
+            () -> new User(validName, " ", validPassword, validRole, validSettings, validInbox));
       }
 
       @Test
@@ -69,7 +56,6 @@ void shouldThrowIfEmailDoesNotContainAt() {
             IllegalArgumentException.class,
             () ->
                 new User(
-
                     validName,
                     "test.gmail.com",
                     validPassword,
@@ -84,7 +70,6 @@ void shouldThrowIfEmailDoesNotContainPeriod() {
             IllegalArgumentException.class,
             () ->
                 new User(
-
                     validName,
                     "test@gmailcom",
                     validPassword,
@@ -98,49 +83,41 @@ void shouldThrowIfEmailDoesNotContainPeriod() {
     void shouldThrowIfPasswordIsNull() {
       assertThrows(
           IllegalArgumentException.class,
-          () ->
-              new User( validName, validEmail, null, validRole, validSettings, validInbox));
+          () -> new User(validName, validEmail, null, validRole, validSettings, validInbox));
     }
 
     @Test
     void shouldThrowIfRoleIsNull() {
       assertThrows(
           IllegalArgumentException.class,
-          () ->
-              new User(
-                   validName, validEmail, validPassword, null, validSettings, validInbox));
+          () -> new User(validName, validEmail, validPassword, null, validSettings, validInbox));
     }
 
     @Test
     void shouldThrowIfPasswordIsBlank() {
       assertThrows(
           IllegalArgumentException.class,
-          () ->
-              new User( validName, validEmail, " ", validRole, validSettings, validInbox));
+          () -> new User(validName, validEmail, " ", validRole, validSettings, validInbox));
     }
 
     @Test
     void shouldThrowIfSettingsIsNull() {
       assertThrows(
           IllegalArgumentException.class,
-          () ->
-              new User( validName, validEmail, validPassword, validRole, null, validInbox));
+          () -> new User(validName, validEmail, validPassword, validRole, null, validInbox));
     }
 
     @Test
     void shouldThrowIfInboxIsNull() {
       assertThrows(
           IllegalArgumentException.class,
-          () ->
-              new User(
-                   validName, validEmail, validPassword, validRole, validSettings, null));
+          () -> new User(validName, validEmail, validPassword, validRole, validSettings, null));
     }
 
     @Test
     void shouldCreateUser() {
       User user =
-          new User(
-                  validName, validEmail, validPassword, validRole, validSettings, validInbox);
+          new User(validName, validEmail, validPassword, validRole, validSettings, validInbox);
 
       assertAll(
           () -> assertEquals(validName, user.getName()),