diff --git a/helpmehelpapplication/pom.xml b/helpmehelpapplication/pom.xml index da3d4e2..16743a5 100644 --- a/helpmehelpapplication/pom.xml +++ b/helpmehelpapplication/pom.xml @@ -25,6 +25,11 @@ javafx-controls 25.0.1 + + org.openjfx + javafx-fxml + 25.0.1 + @@ -49,7 +54,7 @@ javafx-maven-plugin 0.0.8 - ntnu.gruppe21.Main + ntnu.systemutvikling.team6.Main diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java index b30c2e3..3cc6b5d 100644 --- 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 index 2c2cb3f..45c5c26 100644 --- 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 index 2935c74..4a270fc 100644 --- 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 index 70f6268..4351a1b 100644 --- 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 index ff6d4e2..b06009d 100644 --- 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 index f753e8a..490c47e 100644 --- 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 index c858e31..514cbec 100644 --- 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 index b560092..e0d95a9 100644 --- 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 index ddc5d82..c568ede 100644 --- 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 index ef9707b..b70ece1 100644 --- 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 index 74e134f..94e0b22 100644 --- 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 index dd76557..d814283 100644 --- 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 index 64594a0..ef59000 100644 --- 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 index 8c2f7d9..baf5e4b 100644 --- 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 index 3b66851..b471c19 100644 --- 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 index 17692d5..fca9633 100644 --- 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 index 27eee23..ae1f984 100644 --- 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 index d5f8881..a42224b 100644 --- a/helpmehelpapplication/src/main/resources/fxml/donationPage.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/donationPage.fxml @@ -17,7 +17,7 @@ - + @@ -41,7 +41,7 @@ - + @@ -99,6 +99,7 @@ + @@ -229,7 +230,7 @@ - +