Grab JavaFx files to create controllers and etc.

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>21</version>
+        </dependency>
         <dependency>
             <groupId>org.seleniumhq.selenium</groupId>
             <artifactId>selenium-java</artifactId>
@@ -81,7 +86,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>
 

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/DAO/CharityDAO.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/CharityDAO.java

@@ -1,6 +1,6 @@
-package ntnu.sytemutvikling.team6.DAO;
+package ntnu.systemutvikling.team6.DAO;
 
-import ntnu.sytemutvikling.team6.scraper.APICharityData;
+import ntnu.systemutvikling.team6.scraper.APICharityData;
 
 import java.sql.*;
 import java.util.List;

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/DAO/DonationDAO.java

@@ -0,0 +1,4 @@
+package ntnu.systemutvikling.team6.DAO;
+
+public class DonationDAO {
+}

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/HmHApplication.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/HmHApplication.java

@@ -1,10 +1,10 @@
-package ntnu.sytemutvikling.team6;
+package ntnu.systemutvikling.team6;
 
-import ntnu.sytemutvikling.team6.database.DatabaseConnection;
-import ntnu.sytemutvikling.team6.database.DatabaseManager;
-import ntnu.sytemutvikling.team6.models.Charity;
-import ntnu.sytemutvikling.team6.models.CharityRegistry;
-import ntnu.sytemutvikling.team6.scraper.APICharityScraper;
+import ntnu.systemutvikling.team6.database.DatabaseConnection;
+import ntnu.systemutvikling.team6.database.DatabaseManager;
+import ntnu.systemutvikling.team6.models.Charity;
+import ntnu.systemutvikling.team6.models.CharityRegistry;
+import ntnu.systemutvikling.team6.scraper.APICharityScraper;
 
 import java.io.IOException;
 import java.net.URISyntaxException;

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java

@@ -0,0 +1,26 @@
+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.setMinHeight(700);
+    stage.setMinWidth(1100);
+
+    stage.show();
+  }
+
+  public static void main(String[] args) {
+    launch(args);
+  }
+}

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java

@@ -0,0 +1,15 @@
+package ntnu.systemutvikling.team6.controller;
+
+import javafx.fxml.FXML;
+import javafx.scene.layout.FlowPane;
+
+public class CharityPageController {
+    @FXML private FlowPane charityPage;
+
+    @FXML
+    public void initialize() {
+
+    }
+
+
+}

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java

@@ -0,0 +1,38 @@
+package ntnu.systemutvikling.team6.controller;
+
+import java.util.List;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.layout.FlowPane;
+import ntnu.systemutvikling.team6.models.Charity;
+
+public class FrontpageController {
+
+  @FXML private FlowPane cardsContainer;
+
+  @FXML
+  public void initialize() {
+    try {
+
+     /* 
+
+      for (Charity ch : charities) {
+
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/organizationCard.fxml"));
+
+        Parent card = loader.load();
+
+        OrganizationCardController cardController = loader.getController();
+
+        cardController.setOrganization(ch.getName(), ch.getDescription());
+
+        cardsContainer.getChildren().add(card);
+      }
+      */
+
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+}

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/OrganizationCardController.java

@@ -0,0 +1,16 @@
+package ntnu.systemutvikling.team6.controller;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+
+public class OrganizationCardController {
+
+  @FXML private Label organizationName;
+
+  @FXML private Label organizationDescription;
+
+  public void setOrganization(String name, String description) {
+    organizationName.setText(name);
+    organizationDescription.setText(description);
+  }
+}

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/database/DatabaseConnection.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseConnection.java

@@ -1,4 +1,4 @@
-package ntnu.sytemutvikling.team6.database;
+package ntnu.systemutvikling.team6.database;
 
 import java.sql.Connection;
 import java.sql.DriverManager;

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/database/DatabaseManager.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/database/DatabaseManager.java

@@ -1,8 +1,8 @@
-package ntnu.sytemutvikling.team6.database;
+package ntnu.systemutvikling.team6.database;
 
-import ntnu.sytemutvikling.team6.models.Charity;
-import ntnu.sytemutvikling.team6.models.CharityRegistry;
-import ntnu.sytemutvikling.team6.scraper.APICharityData;
+import ntnu.systemutvikling.team6.models.Charity;
+import ntnu.systemutvikling.team6.models.CharityRegistry;
+import ntnu.systemutvikling.team6.scraper.APICharityData;
 
 import java.sql.*;
 import java.util.List;

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Charity.java → 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;

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/CharityRegistry.java → 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.*;
 
@@ -19,6 +19,13 @@ public Optional<Charity> findCharityByOrgnumber(String org_number) {
     }
     return charities.stream().filter(charity -> org_number.equals(charity.getOrg_number())).findFirst();
   }
+
+  public Optional<Charity> findCharityByUUID(UUID uuid) {
+    if (uuid == null) {
+      throw new IllegalArgumentException("CharityId can not be null.");
+    }
+    return charities.stream().filter(charity -> uuid.equals(charity.getOrg_number())).findFirst();
+  }
 
   public void addCharity(Charity charity) {
     if (charity == null) {
@@ -33,4 +40,10 @@ public boolean removeCharity(String org_number) {
     }
     return charities.removeIf(charity -> org_number.equals(charity.getOrg_number()));
   }
+  public boolean removeCharityUUID(UUID uuid) {
+    if (uuid == null) {
+      throw new IllegalArgumentException("CharityId can not be null.");
+    }
+    return charities.removeIf(charity -> uuid.equals(charity.getUUID()));
+  }
 }

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Donation.java → 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 */

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/DonationRegistry.java → 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.*;
 

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Feedback.java → 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 */

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/Organization.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/Organization.java

@@ -1,4 +1,4 @@
-package ntnu.sytemutvikling.team6.models;
+package ntnu.systemutvikling.team6.models;
 
 public class Organization {
     private final String name;

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/models/UserRegistry.java

@@ -0,0 +1,3 @@
+package ntnu.systemutvikling.team6.models;
+
+public class UserRegistry {}

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/user/Inbox.java → 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.*;
 

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/user/Language.java → 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.

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/user/Message.java → 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;

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/user/Role.java → 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

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/user/Settings.java → 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
 

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/models/user/User.java → 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.

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/scraper/APICharityData.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/APICharityData.java

@@ -1,6 +1,6 @@
-package ntnu.sytemutvikling.team6.scraper;
+package ntnu.systemutvikling.team6.scraper;
 
-import ntnu.sytemutvikling.team6.database.DatabaseManager;
+import ntnu.systemutvikling.team6.database.DatabaseManager;
 
 /**
  * Represents data parsed from the IK API JSON response.

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/scraper/APICharityScraper.java → helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/scraper/APICharityScraper.java

@@ -1,9 +1,9 @@
-package ntnu.sytemutvikling.team6.scraper;
+package ntnu.systemutvikling.team6.scraper;
 
 import com.google.gson.Gson;
-import ntnu.sytemutvikling.team6.database.DatabaseConnection;
-import ntnu.sytemutvikling.team6.models.Charity;
-import ntnu.sytemutvikling.team6.models.CharityRegistry;
+import ntnu.systemutvikling.team6.database.DatabaseConnection;
+import ntnu.systemutvikling.team6.models.Charity;
+import ntnu.systemutvikling.team6.models.CharityRegistry;
 
 import java.io.IOException;
 import java.net.*;

helpmehelpapplication/src/main/java/ntnu/sytemutvikling/team6/security/PasswordHasher.java → 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;

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/CharityService.java

@@ -0,0 +1,3 @@
+package ntnu.systemutvikling.team6.service;
+
+public class CharityService {}

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/DonationService.java

@@ -0,0 +1,3 @@
+package ntnu.systemutvikling.team6.service;
+
+public class DonationService {}

helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/service/FeedbackService.java

@@ -0,0 +1,3 @@
+package ntnu.systemutvikling.team6.service;
+
+public class FeedbackService {}