Fix: Errors after plain merge

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>

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

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

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/controller/FrontpageController.java

@@ -15,18 +15,7 @@ public class FrontpageController {
   public void initialize() {
     try {
 
-      List<Charity> charities =
-          List.of(
-              new Charity("Redd Barna",
-                "Protecting children's rights worldwide.",
-                "Children"),
-              new Charity("Leger Uten Grenser",
-                "Emergency medical aid in crisis areas.",
-                "Health"),
-              new Charity(
-                  "Kirkens Nødhjelp",
-                  "Humanitarian aid and long-term development work.",
-                  "Emergency Aid"));
+     /* 
 
       for (Charity ch : charities) {
 
@@ -40,6 +29,7 @@ public void initialize() {
 
         cardsContainer.getChildren().add(card);
       }
+      */
 
     } catch (Exception e) {
       e.printStackTrace();

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/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/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/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/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/test/java/ntnu/systemutvikling/team6/models/CharityRegistryTest.java

@@ -21,7 +21,7 @@ public class CharityRegistryTest {
   @BeforeEach
   public void setup() {
     registry = new CharityRegistry();
-    charity = new Charity("Charity1", "Something Somewhere Somehow", "Cancer");
+    //charity = new Charity("Charity1", "Something Somewhere Somehow", "Cancer");
   }
 
   @Test
@@ -49,7 +49,7 @@ void testGetAllCharitiesReturnsUnmodifiableList() {
   void testFindCharityByIdFound() {
     registry.addCharity(charity);
 
-    Optional<Charity> result = registry.findCharityById(charity.getId());
+    Optional<Charity> result = registry.findCharityById(charity.getUUID());
 
     assertTrue(result.isPresent());
     assertEquals(charity, result.get());