From e2760fbb7f9f8fe35a7087523f2591976f9f12b4 Mon Sep 17 00:00:00 2001
From: haavajor <haavajor@stud.ntnu.no>
Date: Thu, 5 Mar 2026 11:36:45 +0100
Subject: [PATCH 001/101] Unit tests for Donation, User, and Organization
 classes

---
 .../domain/organization/Organization.java     |   4 +
 src/main/java/persistence/UserDao.java        |   2 +-
 src/test/java/domain/DonationTest.java        | 115 ++++++++++
 src/test/java/domain/OrganizationTest.java    | 202 ++++++++++++++++++
 src/test/java/domain/UserTest.java            | 132 ++++++++++++
 5 files changed, 454 insertions(+), 1 deletion(-)

diff --git a/src/main/java/domain/organization/Organization.java b/src/main/java/domain/organization/Organization.java
index c4d5d3c..611e18a 100644
--- a/src/main/java/domain/organization/Organization.java
+++ b/src/main/java/domain/organization/Organization.java
@@ -21,6 +21,8 @@ public Organization(String name, String orgNr, Cause cause, String description,
       if (orgNr == null || !orgNr.matches("\\d{9}")) {
         throw new IllegalArgumentException("Organization number must be 9 digits");
       }
+
+      //Legg til exception for contactEmail == null
       if (contactEmail != null) {
         contactEmail = contactEmail.trim();
 
@@ -35,6 +37,7 @@ public Organization(String name, String orgNr, Cause cause, String description,
           }
         }
 
+      //Legg til exception for website == null
       if (website != null) {
         website = website.trim();
 
@@ -42,6 +45,7 @@ public Organization(String name, String orgNr, Cause cause, String description,
           throw new IllegalArgumentException("Website cannot be blank");
         }
 
+        //Legg til feil for domain extension (.com f.eks)
         if (!website.matches("^https?://.+")) { //Got help from ChatGPT for regex
           throw new IllegalArgumentException("Website must start with http:// or https://");
         }
diff --git a/src/main/java/persistence/UserDao.java b/src/main/java/persistence/UserDao.java
index 5a77341..bf9edc4 100644
--- a/src/main/java/persistence/UserDao.java
+++ b/src/main/java/persistence/UserDao.java
@@ -4,7 +4,7 @@
 import java.sql.Connection;
 import java.sql.PreparedStatement;
 import java.sql.SQLException;
-import model.User;
+import domain.user.User;
 
 public class UserDao {
 
diff --git a/src/test/java/domain/DonationTest.java b/src/test/java/domain/DonationTest.java
index bb9c875..ea73049 100644
--- a/src/test/java/domain/DonationTest.java
+++ b/src/test/java/domain/DonationTest.java
@@ -1,5 +1,120 @@
 package domain;
 
+import domain.donation.Cause;
+import domain.donation.Donation;
+import domain.organization.Organization;
+import domain.user.User;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.time.Duration;
+import java.time.LocalDateTime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 class DonationTest {
 
+    //User Variables
+    private final String testUserName = "testUser";
+    private final String testPhoneNumber = "90909090";
+    private final String testEmail = "test@email.com";
+    private final String testPassword = "password";
+
+    //Organization Variables
+    private final String testName = "Name";
+    private final String testOrgNr = "123456789";
+    private final Cause testCause = Cause.HEALTH;
+    private final String testDescription = "Description";
+    private final String testContactEmail = "test@mail.com";
+    private final String testWebsite = "https://test.com";
+    private final boolean testVerified = true;
+
+    //Donation Variables
+    private Long testID = 123L;
+    private BigDecimal testAmount = new BigDecimal("1500");
+    private LocalDateTime testDateTime = LocalDateTime.of(2026, 3, 5, 8, 30, 0);
+    private User testUser;
+    private Organization testOrganization;
+
+    @BeforeEach
+    public void init() {
+        testUser = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        testOrganization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+    }
+
+
+    @Test
+    public void DonationTestPositive(){
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+    }
+
+    @Test
+    public void DonationTestUserNull(){
+        testUser = null;
+        NullPointerException Exception = assertThrows(NullPointerException.class,
+                () -> new Donation (testAmount, testUser, testOrganization));
+
+        assertEquals("User cannot be null", Exception.getMessage());
+    }
+
+    @Test
+    public void DonationOrganizationNull(){
+        testOrganization = null;
+        NullPointerException Exception = assertThrows(NullPointerException.class,
+                () -> new Donation (testAmount, testUser, testOrganization));
+
+        assertEquals("Organization cannot be null", Exception.getMessage());
+    }
+
+    @Test
+    public void DonationTestAmountNegative(){
+        testAmount = new BigDecimal("-23");
+        IllegalArgumentException Exception = assertThrows(IllegalArgumentException.class,
+                () -> new Donation (testAmount, testUser, testOrganization));
+
+        assertEquals("Amount must be greater than 0", Exception.getMessage());
+    }
+
+    //Getter tests
+    /* id is never set, getter makes a NullPointerException
+    @Test
+    public void DonationTestIdGet(){
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+        assertEquals(0L, donation.getId());
+
+    }
+    */
+
+    @Test
+    public void DonationTestAmountGet(){
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+        assertEquals(testAmount, donation.getAmount());
+
+    }
+
+    @Test
+    public void DonationTestDateTimeGet(){
+        LocalDateTime now = LocalDateTime.now();
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+
+        assertTrue(Duration.between(now, donation.getDateTime()).abs().toMillis() < 1000);
+
+    }
+
+    @Test
+    public void DonationTestUserGet(){
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+        assertEquals(testUser, donation.getUser());
+
+    }
+
+    @Test
+    public void DonationTestOrganizationGet(){
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+        assertEquals(testOrganization, donation.getOrganization());
+
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/domain/OrganizationTest.java b/src/test/java/domain/OrganizationTest.java
index 815aa53..47c8024 100644
--- a/src/test/java/domain/OrganizationTest.java
+++ b/src/test/java/domain/OrganizationTest.java
@@ -1,5 +1,207 @@
 package domain;
 
+import domain.donation.Cause;
+import domain.organization.Organization;
+import domain.user.User;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 class OrganizationTest {
+    private String testName = "Name";
+    private String testOrgNr = "123456789";
+    private Cause testCause = Cause.HEALTH;
+    private String testDescription = "Description";
+    private String testContactEmail = "test@mail.com";
+    private String testWebsite = "https://test.com";
+    private boolean testVerified = true;
+
+    //Positive tests
+    @Test
+    public void organizationTestPositive(){
+        Organization organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+    }
+
+    //Negative tests
+    @Test
+    public void organizationTestNameBlank(){
+        testName = "";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization("", testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Name cannot be null or blank", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestNameNull(){
+        testName = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Name cannot be null or blank", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestOrgNrNull(){
+        testOrgNr = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Organization number must be 9 digits", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestOrgNrLetters(){
+        testOrgNr = "12345678a";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Organization number must be 9 digits", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestOrgNrShort(){
+        testOrgNr = "12345";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Organization number must be 9 digits", exception.getMessage());
+    }
+
+    /* Mangler exception for når email er null
+    @Test
+    public void organizationTestContactEmailNull(){
+        testContactEmail = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+    }
+    */
+
+    @Test
+    public void organizationTestContactEmailTrim(){
+        testContactEmail = "test@mail.com   ";
+        Organization organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+    }
+
+    @Test
+    public void organizationTestContactEmailBlank(){
+        testContactEmail = "";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Email cannot be blank", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestContactEmailMissingAt(){
+        testContactEmail = "test.com";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Invalid email format", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestContactEmailDoubleAt(){
+        testContactEmail = "test@@mail.com";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Invalid email format", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestContactEmailMisplacedAt(){
+        testContactEmail = "@testmail.com";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Invalid email format", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestContactEmailMissingDot(){
+        testContactEmail = "test@mailcom";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Invalid email format", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestWebsiteMissingHttps(){
+        testWebsite = "test.com";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Website must start with http:// or https://", exception.getMessage());
+    }
+
+    /* Mangler exception når url mangler domain extension (.com f.eks)
+    @Test
+    public void organizationTestWebsiteMissingDot(){
+        testWebsite = "https://testcom";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Website must start with http:// or https://", exception.getMessage());
+    }
+    */
+
+    /* Mangler exception når website er null
+    @Test
+    public void organizationTestWebsiteMissingDot(){
+        testWebsite = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Website must start with http:// or https://", exception.getMessage());
+    }
+    */
+
+
+
+    //Getter tests
+    @Test
+    public void organizationTestNameGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testName, Organization.getName());
+    }
+
+    @Test
+    public void organizationTestOrgNrGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testOrgNr, Organization.getOrgNr());
+    }
+
+    @Test
+    public void organizationTestCauseGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testCause, Organization.getCause());
+    }
+
+    @Test
+    public void organizationDescriptionGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testDescription, Organization.getDescription());
+    }
+
+    @Test
+    public void organizationTestContactEmailGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testContactEmail, Organization.getContactEmail());
+    }
+
+    @Test
+    public void organizationTestWebsiteGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testWebsite, Organization.getWebsite());
+    }
 
+    @Test
+    public void organizationTestIsVerifiedGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testVerified, Organization.isVerified());
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/domain/UserTest.java b/src/test/java/domain/UserTest.java
index c21aa90..b1c8f14 100644
--- a/src/test/java/domain/UserTest.java
+++ b/src/test/java/domain/UserTest.java
@@ -1,5 +1,137 @@
 package domain;
 
+import domain.user.User;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 class UserTest {
 
+    private String testUserName = "testUser";
+    private String testPhoneNumber = "90909090";
+    private String testEmail = "test@email.com";
+    private final String testPassword = "password";
+
+    //Positive tests
+    @Test
+    public void userTestPositive(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+    }
+
+    //Negative tests
+    @Test
+    public void userTestUserNameBlank(){
+        testUserName = "";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("Username has to be filled in", exception.getMessage());
+    }
+
+    @Test
+    public void userTestUserNameNull(){
+        testUserName = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("Username has to be filled in", exception.getMessage());
+    }
+
+    @Test
+    public void userTestPhoneNumberBlank(){
+        testPhoneNumber = "";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("Phonenumber has to be filled in", exception.getMessage());
+    }
+
+    @Test
+    public void userTestPhoneNumberNull(){
+        testPhoneNumber = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("Phonenumber has to be filled in", exception.getMessage());
+    }
+
+    @Test
+    public void userTestPhoneNumberShort() {
+        testPhoneNumber = "909090";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("Fill in a phonenumber with 8 digits", exception.getMessage());
+    }
+
+    @Test
+    public void userTestEmailBlank(){
+        testEmail = "";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("E-mail has to be filled in", exception.getMessage());
+    }
+
+    @Test
+    public void userTestEmailNull(){
+        testEmail = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("E-mail has to be filled in", exception.getMessage());
+    }
+
+    //Getter tests
+    @Test
+    public void userTestUserNameGet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        assertEquals(User.getUsername(), testUserName);
+    }
+
+    @Test
+    public void userTestPhoneNumberGet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        assertEquals(User.getPhoneNumber(), testPhoneNumber);
+    }
+
+    @Test
+    public void userTestEmailGet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        assertEquals(User.getEMail(), testEmail);
+    }
+
+    @Test
+    public void userTestPasswordGet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        assertEquals(User.getPassword(), testPassword);
+    }
+
+    //Setter tests
+    @Test
+    public void userTestPasswordSet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        String newPassword = "NewPassoword";
+        User.setPassword(newPassword);
+        assertEquals(newPassword, User.getPassword());
+    }
+
+    @Test
+    public void userTestUserNameSet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        String newUserName = "NewUsername";
+        User.setUsername(newUserName);
+        assertEquals(newUserName, User.getUsername());
+    }
+
+    @Test
+    public void userTestPhoneNumberSet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        String newPhoneNumber = "123456asdsad7"; //Trenger input validering
+        User.setPhonenumber(newPhoneNumber);
+        assertEquals(newPhoneNumber, User.getPhoneNumber());
+    }
+
+
+
 }
\ No newline at end of file

From 16b15abe22a3f0d5babbe97b0d4435bedd40b706 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 14:48:02 +0100
Subject: [PATCH 002/101] Fixed main class configuration

---
 pom.xml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pom.xml b/pom.xml
index 85afbce..0f3156b 100644
--- a/pom.xml
+++ b/pom.xml
@@ -62,7 +62,7 @@
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.8</version>
                 <configuration>
-                    <mainClass>ui.GiveHopeGIU</mainClass>
+                    <mainClass>app.Main</mainClass>
                 </configuration>
             </plugin>
 

From 2f7251866013bfaf37731f3eb307b6b58973de7b Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 14:48:44 +0100
Subject: [PATCH 003/101] Removed unnecessary file

---
 src/main/java/app/GiveHopeApp.java | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 src/main/java/app/GiveHopeApp.java

diff --git a/src/main/java/app/GiveHopeApp.java b/src/main/java/app/GiveHopeApp.java
deleted file mode 100644
index 9738139..0000000
--- a/src/main/java/app/GiveHopeApp.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package app;
-
-public class GiveHopeApp {
-}

From 6b345692b08f8151f5254b2220810317da6a4e40 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 14:48:48 +0100
Subject: [PATCH 004/101] Removed unnecessary file

---
 src/main/java/ui/GiveHopeGIU.java | 23 -----------------------
 1 file changed, 23 deletions(-)
 delete mode 100644 src/main/java/ui/GiveHopeGIU.java

diff --git a/src/main/java/ui/GiveHopeGIU.java b/src/main/java/ui/GiveHopeGIU.java
deleted file mode 100644
index 2617122..0000000
--- a/src/main/java/ui/GiveHopeGIU.java
+++ /dev/null
@@ -1,23 +0,0 @@
-package ui;
-
-import javafx.application.Application;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Scene;
-import javafx.stage.Stage;
-
-public class GiveHopeGIU extends Application {
-
-    @Override
-    public void start(Stage stage) throws Exception {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/ui/home.fxml"));
-        Scene scene = new Scene(loader.load(), 600, 400);
-
-        stage.setTitle("GiveHope");
-        stage.setScene(scene);
-        stage.show();
-    }
-
-    public static void main(String[] args) {
-        launch();
-    }
-}
\ No newline at end of file

From 3edb5877c3adfbb2594519982cc95d0149982cf6 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 15:13:44 +0100
Subject: [PATCH 005/101] Class to move between scenes

---
 src/main/java/app/SceneManager.java | 21 +++++++++++++++++++++
 1 file changed, 21 insertions(+)
 create mode 100644 src/main/java/app/SceneManager.java

diff --git a/src/main/java/app/SceneManager.java b/src/main/java/app/SceneManager.java
new file mode 100644
index 0000000..0f69043
--- /dev/null
+++ b/src/main/java/app/SceneManager.java
@@ -0,0 +1,21 @@
+package app;
+
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.stage.Stage;
+
+import java.io.IOException;
+
+public class SceneManager {
+
+    private static Stage stage;
+
+    public static void setStage(Stage s) {
+        stage = s;
+    }
+
+    public static void switchTo(String fxmlPath) throws IOException {
+        Parent root = FXMLLoader.load(SceneManager.class.getResource(fxmlPath));
+        stage.getScene().setRoot(root);
+    }
+}
\ No newline at end of file

From 9ff4e73fa4f73c0f54cd5463776c2cc2bb9b3fba Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 15:14:36 +0100
Subject: [PATCH 006/101] Changed name to big capital letter

---
 src/main/resources/ui/home.fxml   | 31 -------------------------------
 src/main/resources/ui/signIn.fxml | 30 ------------------------------
 2 files changed, 61 deletions(-)
 delete mode 100644 src/main/resources/ui/home.fxml
 delete mode 100644 src/main/resources/ui/signIn.fxml

diff --git a/src/main/resources/ui/home.fxml b/src/main/resources/ui/home.fxml
deleted file mode 100644
index 5028391..0000000
--- a/src/main/resources/ui/home.fxml
+++ /dev/null
@@ -1,31 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="ui.controller.HomeController"
-            prefHeight="1080" prefWidth="1920">
-
-    <VBox
-            alignment="CENTER" spacing="20"
-            AnchorPane.topAnchor="0.0"
-            AnchorPane.bottomAnchor="0.0"
-            AnchorPane.leftAnchor="0.0"
-            AnchorPane.rightAnchor="0.0">
-
-            <Label text="GiveHope"
-                   style="-fx-font-size: 54px;" />
-
-            <Button fx:id="signInButton"
-                    text="Sign in"
-                    onAction="#goToSignIn" />
-
-            <Button text="Browse"
-                    onAction="#handleBrowse" />
-    </VBox>
-</AnchorPane>
diff --git a/src/main/resources/ui/signIn.fxml b/src/main/resources/ui/signIn.fxml
deleted file mode 100644
index 5bb59d4..0000000
--- a/src/main/resources/ui/signIn.fxml
+++ /dev/null
@@ -1,30 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
-
-<AnchorPane xmlns="http://javafx.com/javafx"
-            xmlns:fx="http://javafx.com/fxml"
-            fx:controller="ui.controller.SignInController"
-            prefHeight="1080" prefWidth="1920">
-
-    <!-- En "boks" som holder innholdet pent samlet -->
-    <VBox spacing="12"
-          layoutX="250" layoutY="160"
-          prefWidth="300">
-
-        <Label text="Sign In" style="-fx-font-size: 24px; -fx-font-weight: bold;"/>
-
-        <TextField fx:id="emailField" promptText="Email" />
-        <PasswordField fx:id="passwordField" promptText="Password" />
-
-        <Button text="Sign In" onAction="#handleSignIn" />
-        <Label fx:id="errorLabel" text="" style="-fx-text-fill: red;" />
-
-        <Hyperlink text="Don't have an account? Register" onAction="#goToRegister" />
-    </VBox>
-
-</AnchorPane>

From fe5cf4d404c139b1ecac59cf8434e3d4c9705ee5 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 15:14:49 +0100
Subject: [PATCH 007/101] css style for buttons

---
 src/main/resources/css/style.css | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 src/main/resources/css/style.css

diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css
new file mode 100644
index 0000000..187e81d
--- /dev/null
+++ b/src/main/resources/css/style.css
@@ -0,0 +1,17 @@
+.nav-button {
+    -fx-background-color: #d9d9d9;
+    -fx-background-radius: 20;
+    -fx-font-size: 22px;
+    -fx-cursor: hand;
+    -fx-padding: 10 20 10 20;
+}
+.nav-button:hover {
+    -fx-background-color: #bfc3c7;
+    -fx-scale-x: 1.05;
+    -fx-scale-y: 1.05;
+}
+.nav-button:pressed {
+    -fx-background-color: #a5a8ab;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
+}
\ No newline at end of file

From 0b68fc4bde6c43d081332fba29c0dce7b3382fcf Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 15:18:42 +0100
Subject: [PATCH 008/101] Created homepage and sign in page for application

---
 src/main/resources/fxml/Home.fxml   | 69 ++++++++++++++++++++++++++
 src/main/resources/fxml/SignIn.fxml | 75 +++++++++++++++++++++++++++++
 2 files changed, 144 insertions(+)
 create mode 100644 src/main/resources/fxml/Home.fxml
 create mode 100644 src/main/resources/fxml/SignIn.fxml

diff --git a/src/main/resources/fxml/Home.fxml b/src/main/resources/fxml/Home.fxml
new file mode 100644
index 0000000..5fa39ad
--- /dev/null
+++ b/src/main/resources/fxml/Home.fxml
@@ -0,0 +1,69 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
+
+
+<BorderPane xmlns:fx="http://javafx.com/fxml"
+            fx:controller="ui.controller.HomeController"
+            stylesheets="@/css/style.css"
+            prefWidth="1275" prefHeight="725.0"
+            style="-fx-background-color: #f4f4f4;">
+
+   <top>
+      <HBox alignment="CENTER_LEFT"
+            spacing="20"
+            prefHeight="120.0"
+            style="-fx-background-color: #c9dce5;">
+         <padding>
+            <Insets top="20" right="30" bottom="20" left="30"/>
+         </padding>
+
+         <Label text="GiveHope"
+                style="-fx-font-size: 36px; -fx-text-fill: black;-fx-font-weight: bold;" />
+
+         <Region HBox.hgrow="ALWAYS"/>
+
+         <Button text="Sign in"
+                 styleClass="nav-button"
+                 onAction="#handleSignIn"/>
+      </HBox>
+   </top>
+
+   <center>
+      <StackPane style="-fx-background-color: #3f5fb8;" alignment="CENTER_LEFT">
+         <padding>
+            <Insets top="40" right="50" bottom="40" left="50"/>
+         </padding>
+
+         <VBox alignment="CENTER_LEFT" spacing="35" maxWidth="900">
+            <Label text="MAKE A DIFFERENCE TODAY"
+                   wrapText="true"
+                   style="-fx-font-size: 42px; -fx-text-fill: white; -fx-font-weight: bold;" />
+
+            <Label text="Support trusted charitable organizations and create a lasting impact on communities around the world"
+                   wrapText="true"
+                   style="-fx-font-size: 20px; -fx-text-fill: white;" />
+
+            <HBox spacing="25">
+               <Button text="LEARN MORE"
+                       prefWidth="260"
+                       prefHeight="105"
+                       style="-fx-background-color: #a9cce3; -fx-background-radius: 24; -fx-font-size: 24px;" />
+
+               <Button text="EXPLORE ORGANIZATIONS"
+                       prefWidth="310"
+                       prefHeight="105"
+                       style="-fx-background-color: #a9cce3; -fx-background-radius: 24; -fx-font-size: 24px;" />
+            </HBox>
+         </VBox>
+      </StackPane>
+   </center>
+
+</BorderPane>
\ No newline at end of file
diff --git a/src/main/resources/fxml/SignIn.fxml b/src/main/resources/fxml/SignIn.fxml
new file mode 100644
index 0000000..61b20dc
--- /dev/null
+++ b/src/main/resources/fxml/SignIn.fxml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+
+<?import javafx.scene.control.Label?>
+<BorderPane xmlns:fx="http://javafx.com/fxml"
+            fx:controller="ui.controller.SignInController"
+            stylesheets="@/css/style.css"
+            prefWidth="1275" prefHeight="725.0"
+            style="-fx-background-color: #f4f4f4;">
+
+    <!-- TOP BAR -->
+    <top>
+        <HBox alignment="CENTER_LEFT" spacing="20">
+            <padding>
+                <Insets top="20" left="30"/>
+            </padding>
+
+            <Button text="Home"
+                    onAction="#handleGoHome"
+                    styleClass="nav-button"/>
+        </HBox>
+    </top>
+
+    <!-- LOGIN AREA -->
+    <center>
+
+        <VBox alignment="CENTER"
+              spacing="25"
+              maxWidth="500">
+
+            <TextField fx:id="usernameField"
+                       promptText="Enter Username or Email"
+                       prefWidth="480"
+                       prefHeight="65"
+                       style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+            <PasswordField fx:id="passwordField"
+                           promptText="Enter Password"
+                           prefWidth="480"
+                           prefHeight="65"
+                           style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+            <Button text="Sign in"
+                    onAction="#handleSignIn"
+                    styleClass="nav-button"
+                    prefWidth="280"
+                    prefHeight="70"
+                    style="-fx-font-size: 24px; -fx-background-color: #c3d6e6; -fx-background-radius: 14;" />
+
+            <Label fx:id="errorLabel"
+                   text=""
+                   style="-fx-text-fill: red; -fx-font-size: 16px;" />
+
+            <!-- REGISTER LINK -->
+            <HBox alignment="CENTER" spacing="5">
+
+                <Hyperlink text="Don't have an account? Register"
+                           onAction="#handleRegister"/>
+
+            </HBox>
+
+        </VBox>
+
+    </center>
+
+</BorderPane>
\ No newline at end of file

From 1e6fe5dfda239aead9719825e2a863936c3fe0d0 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 15:19:03 +0100
Subject: [PATCH 009/101] Controller for homepage

---
 src/main/java/ui/controller/HomeController.java | 11 ++++++++---
 1 file changed, 8 insertions(+), 3 deletions(-)

diff --git a/src/main/java/ui/controller/HomeController.java b/src/main/java/ui/controller/HomeController.java
index bda7d61..a498481 100644
--- a/src/main/java/ui/controller/HomeController.java
+++ b/src/main/java/ui/controller/HomeController.java
@@ -1,9 +1,14 @@
 package ui.controller;
 
+import app.SceneManager;
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
 import javafx.scene.Parent;
+import javafx.scene.Scene;
 import javafx.scene.control.Button;
+import javafx.stage.Stage;
 
 import java.io.IOException;
 
@@ -11,10 +16,10 @@ public class HomeController {
 
     public Button signInButton;
 
+    // HomeController.java
     @FXML
-    private void goToSignIn() throws IOException {
-        Parent root = FXMLLoader.load(getClass().getResource("/ui/signIn.fxml"));
-        signInButton.getScene().setRoot(root);
+    private void handleGoToSignIn() throws IOException {
+        SceneManager.switchTo("/fxml/SignIn.fxml");
     }
 
     @FXML

From d985616315e3ca29192bd1a6d6a057bf6fa59db1 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 15:19:11 +0100
Subject: [PATCH 010/101] Controller for sign in page

---
 .../java/ui/controller/SignInController.java  | 33 ++++++++++++++-----
 1 file changed, 25 insertions(+), 8 deletions(-)

diff --git a/src/main/java/ui/controller/SignInController.java b/src/main/java/ui/controller/SignInController.java
index 3e141bf..7dd573e 100644
--- a/src/main/java/ui/controller/SignInController.java
+++ b/src/main/java/ui/controller/SignInController.java
@@ -1,35 +1,52 @@
 package ui.controller;
 
+import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Node;
+import javafx.scene.Scene;
 import javafx.scene.control.Label;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
+import javafx.stage.Stage;
 
 public class SignInController {
 
-    @FXML private TextField emailField;
+    @FXML private TextField usernameField;
     @FXML private PasswordField passwordField;
     @FXML private Label errorLabel;
 
     @FXML
     private void handleSignIn() {
-        String email = emailField.getText();
-        String password = passwordField.getText();
 
-        // Mini-sjekk for å se at wiring funker
-        if (email == null || email.isBlank() || password == null || password.isBlank()) {
+        String email = usernameField.getText().trim();
+        String password = passwordField.getText().trim();
+
+        if (email.isEmpty() || password.isEmpty()) {
             errorLabel.setText("Please enter email and password.");
             return;
         }
 
-        errorLabel.setText(""); // nullstill
+        // nullstill eventuell gammel feilmelding
+        errorLabel.setText("");
+
         System.out.println("Trying to sign in with: " + email);
 
-        // Her skal du senere kalle service/DB (ikke her inne direkte!)
+        // Her skal senere login service kalles
+    }
+
+    @FXML
+    private void handleGoHome(ActionEvent event) throws Exception {
+
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/Home.fxml"));
+        Scene scene = new Scene(loader.load());
+
+        Stage stage = (Stage)((Node)event.getSource()).getScene().getWindow();
+        stage.setScene(scene);
     }
 
     @FXML
-    private void goToRegister() {
+    private void handleRegister() {
         System.out.println("Go to Register clicked");
         // Neste steg: bytte scene/view
     }

From e68902a3a1ee2c78785d1fc1024dfddc17dba7cd Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 15:19:55 +0100
Subject: [PATCH 011/101] Changed name for userLogin to userSignIn

---
 .../java/application/user/{UserLogin.java => UserSignIn.java} | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)
 rename src/main/java/application/user/{UserLogin.java => UserSignIn.java} (90%)

diff --git a/src/main/java/application/user/UserLogin.java b/src/main/java/application/user/UserSignIn.java
similarity index 90%
rename from src/main/java/application/user/UserLogin.java
rename to src/main/java/application/user/UserSignIn.java
index e116498..08a6dc6 100644
--- a/src/main/java/application/user/UserLogin.java
+++ b/src/main/java/application/user/UserSignIn.java
@@ -4,12 +4,12 @@
 import domain.user.User;
 import persistence.UserRepository;
 
-public class UserLogin {
+public class UserSignIn {
 
     private final PasswordHasher hasher;
     private final UserRepository repo;
 
-    public UserLogin(PasswordHasher hasher, UserRepository repo) {
+    public UserSignIn(PasswordHasher hasher, UserRepository repo) {
         this.hasher = hasher;
         this.repo = repo;
     }

From e58c20b31b7ba92e8fd5bafc06291ddac43dc19c Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 15:20:08 +0100
Subject: [PATCH 012/101] Updated main to show application

---
 src/main/java/app/Main.java | 40 ++++++++++++++-----------------------
 1 file changed, 15 insertions(+), 25 deletions(-)

diff --git a/src/main/java/app/Main.java b/src/main/java/app/Main.java
index 907cc4a..2462b45 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/app/Main.java
@@ -1,34 +1,24 @@
 package app;
 
-import application.security.PasswordHasher;
-import application.user.UserLogin;
-import application.user.UserRegister;
-import domain.user.User;
-import integration.security.Sha256PasswordHasher;
-import persistence.UserDao;
-import persistence.UserRepository;
-import persistence.db.Database;
+import javafx.application.Application;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.Scene;
+import javafx.stage.Stage;
 
-public class Main {
-  UserDao userDao = new UserDao();
-  public static void main(String[] args) {
-    try{
-      Database.getConnection();
-      System.out.println("Database connected");
+import java.io.IOException;
 
-      PasswordHasher hasher = new Sha256PasswordHasher();
-      UserRepository userRepo = new UserDao();
-      UserRegister userReg = new UserRegister(hasher, userRepo);
-      UserLogin login = new UserLogin(hasher, userRepo);
+public class Main extends Application {
 
+  @Override
+  public void start(Stage stage) throws IOException {
+    SceneManager.setStage(stage);
 
-      userReg.execute("wfrfrewfhbjdddswe3f", "45586456", "Jegerkddsdwdwful", "113@1h33weqd3.com");
-
-      System.out.println("Inserted user!");
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
-
+    Parent root = FXMLLoader.load(getClass().getResource("/fxml/Home.fxml"));
+    Scene scene = new Scene(root, 1275, 725);
 
+    stage.setTitle("GiveHope");
+    stage.setScene(scene);
+    stage.show();
   }
 }

From 4da4e066bc0eac82d174e6f0f9e55789b5664f1f Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 13 Mar 2026 16:00:00 +0100
Subject: [PATCH 013/101] Connected loggin use case to javafx

---
 .../java/ui/controller/HomeController.java    | 21 ++++++++-------
 .../java/ui/controller/SignInController.java  | 26 ++++++++++++++++---
 src/main/resources/fxml/SignIn.fxml           |  3 +--
 3 files changed, 34 insertions(+), 16 deletions(-)

diff --git a/src/main/java/ui/controller/HomeController.java b/src/main/java/ui/controller/HomeController.java
index a498481..34e02a2 100644
--- a/src/main/java/ui/controller/HomeController.java
+++ b/src/main/java/ui/controller/HomeController.java
@@ -1,29 +1,30 @@
 package ui.controller;
 
 import app.SceneManager;
-import javafx.event.ActionEvent;
+import application.security.PasswordHasher;
+import application.user.UserSignIn;
+import integration.security.Sha256PasswordHasher;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
-import javafx.scene.Parent;
-import javafx.scene.Scene;
 import javafx.scene.control.Button;
-import javafx.stage.Stage;
-
+import persistence.UserDao;
 import java.io.IOException;
 
 public class HomeController {
 
     public Button signInButton;
 
-    // HomeController.java
     @FXML
-    private void handleGoToSignIn() throws IOException {
-        SceneManager.switchTo("/fxml/SignIn.fxml");
+    private void handleSignIn() throws IOException {
+        UserDao userDao = new UserDao();
+        PasswordHasher hasher = new Sha256PasswordHasher();
+        UserSignIn userSignIn = new UserSignIn(hasher, userDao);
+
+        SceneManager.switchTo("/fxml/signIn.fxml", new SignInController(userSignIn));
     }
 
     @FXML
     private void handleBrowse() {
         System.out.println("Browse button pressed");
     }
+
 }
\ No newline at end of file
diff --git a/src/main/java/ui/controller/SignInController.java b/src/main/java/ui/controller/SignInController.java
index 7dd573e..994b4f0 100644
--- a/src/main/java/ui/controller/SignInController.java
+++ b/src/main/java/ui/controller/SignInController.java
@@ -1,5 +1,8 @@
 package ui.controller;
 
+import app.SceneManager;
+import application.user.UserSignIn;
+import domain.user.User;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -10,19 +13,27 @@
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
 
+import java.io.IOException;
+
 public class SignInController {
 
-    @FXML private TextField usernameField;
+    @FXML private TextField loginField;
     @FXML private PasswordField passwordField;
     @FXML private Label errorLabel;
 
+    private final UserSignIn userSignIn;
+
+    public SignInController(UserSignIn userSignIn) {
+        this.userSignIn = userSignIn;
+    }
+
     @FXML
     private void handleSignIn() {
 
-        String email = usernameField.getText().trim();
+        String login = loginField.getText().trim();
         String password = passwordField.getText().trim();
 
-        if (email.isEmpty() || password.isEmpty()) {
+        if (login.isEmpty() || password.isEmpty()) {
             errorLabel.setText("Please enter email and password.");
             return;
         }
@@ -30,7 +41,14 @@ private void handleSignIn() {
         // nullstill eventuell gammel feilmelding
         errorLabel.setText("");
 
-        System.out.println("Trying to sign in with: " + email);
+        try {
+            User user = userSignIn.execute(login, password);
+            SceneManager.switchTo("/fxml/Home.fxml");
+        } catch (IllegalArgumentException e) {
+            errorLabel.setText(e.getMessage());
+        } catch (IOException e) {
+            errorLabel.setText("Noe gikk galt, prøv igjen.");
+        }
 
         // Her skal senere login service kalles
     }
diff --git a/src/main/resources/fxml/SignIn.fxml b/src/main/resources/fxml/SignIn.fxml
index 61b20dc..ca35ea5 100644
--- a/src/main/resources/fxml/SignIn.fxml
+++ b/src/main/resources/fxml/SignIn.fxml
@@ -12,7 +12,6 @@
 
 <?import javafx.scene.control.Label?>
 <BorderPane xmlns:fx="http://javafx.com/fxml"
-            fx:controller="ui.controller.SignInController"
             stylesheets="@/css/style.css"
             prefWidth="1275" prefHeight="725.0"
             style="-fx-background-color: #f4f4f4;">
@@ -37,7 +36,7 @@
               spacing="25"
               maxWidth="500">
 
-            <TextField fx:id="usernameField"
+            <TextField fx:id="loginField"
                        promptText="Enter Username or Email"
                        prefWidth="480"
                        prefHeight="65"

From d81a1a621c4c1ad3cdc379c091bf5e2c090403c9 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Sat, 14 Mar 2026 13:39:56 +0100
Subject: [PATCH 014/101] Made switch method with path and also controller as
 parameter

---
 src/main/java/app/SceneManager.java | 7 +++++++
 1 file changed, 7 insertions(+)

diff --git a/src/main/java/app/SceneManager.java b/src/main/java/app/SceneManager.java
index 0f69043..9632b35 100644
--- a/src/main/java/app/SceneManager.java
+++ b/src/main/java/app/SceneManager.java
@@ -18,4 +18,11 @@ public static void switchTo(String fxmlPath) throws IOException {
         Parent root = FXMLLoader.load(SceneManager.class.getResource(fxmlPath));
         stage.getScene().setRoot(root);
     }
+
+    public static void switchTo(String fxmlPath, Object controller) throws IOException {
+        FXMLLoader loader = new FXMLLoader(SceneManager.class.getResource(fxmlPath));
+        loader.setController(controller);
+        Parent root = loader.load();
+        stage.getScene().setRoot(root);
+    }
 }
\ No newline at end of file

From 74e1a08a4af9c17db862402cb3cce7967c82e6af Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Sat, 14 Mar 2026 15:28:31 +0100
Subject: [PATCH 015/101] Added email validation

---
 src/main/java/domain/user/User.java | 13 +++++++++----
 1 file changed, 9 insertions(+), 4 deletions(-)

diff --git a/src/main/java/domain/user/User.java b/src/main/java/domain/user/User.java
index 9b5e82f..db221e2 100644
--- a/src/main/java/domain/user/User.java
+++ b/src/main/java/domain/user/User.java
@@ -12,10 +12,6 @@ public User(String userName, String phoneNumber, String password, String eMail)
       throw new IllegalArgumentException("Username has to be filled in");
     }
 
-    if (eMail == null || eMail.isBlank()) {
-      throw new IllegalArgumentException("E-mail has to be filled in");
-    }
-
     if (phoneNumber == null || phoneNumber.isBlank()) {
       throw new IllegalArgumentException("Phonenumber has to be filled in");
     }
@@ -24,6 +20,10 @@ public User(String userName, String phoneNumber, String password, String eMail)
       throw new IllegalArgumentException("Fill in a phonenumber with 8 digits");
     }
 
+    if (!isValidEmail(eMail)) {
+      throw new IllegalArgumentException("Invalid email address: " + eMail);
+    }
+
     this.userName = userName;
     this.phoneNumber = phoneNumber;
     this.eMail = eMail.trim();
@@ -57,4 +57,9 @@ public void setUsername(String userName) {
   public void setPhonenumber (String phoneNumber) {
     this.phoneNumber = phoneNumber;
   }
+
+  private static boolean isValidEmail(String email) {
+    if (email == null || email.isBlank()) return false;
+    return email.matches("^[a-zA-Z0-9._%+\\-]+@[a-zA-Z0-9.\\-]+\\.[a-zA-Z]{2,}$");
+  }
 }
\ No newline at end of file

From c53f3bb2f78e16108860a8e3ab8d4cc4ee59d382 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Sat, 14 Mar 2026 15:29:36 +0100
Subject: [PATCH 016/101] Added email validation

---
 .gitignore | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/.gitignore b/.gitignore
index b272176..6015372 100644
--- a/.gitignore
+++ b/.gitignore
@@ -40,5 +40,5 @@ build/
 .DS_Store
 
 ### data ###
-*.db
+givehope.db
 /data/
\ No newline at end of file

From 22c7cf879d8a062fc821a38be2eb62047e76b1f3 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Sat, 14 Mar 2026 15:31:06 +0100
Subject: [PATCH 017/101] Made register page

---
 .../ui/controller/RegisterController.java     |  74 ++++++++++++
 .../java/ui/controller/SignInController.java  |  13 ++-
 src/main/resources/css/Register.css           | 108 ++++++++++++++++++
 src/main/resources/fxml/Register.fxml         |  94 +++++++++++++++
 src/main/resources/fxml/SignIn.fxml           |   7 +-
 5 files changed, 289 insertions(+), 7 deletions(-)
 create mode 100644 src/main/java/ui/controller/RegisterController.java
 create mode 100644 src/main/resources/css/Register.css
 create mode 100644 src/main/resources/fxml/Register.fxml

diff --git a/src/main/java/ui/controller/RegisterController.java b/src/main/java/ui/controller/RegisterController.java
new file mode 100644
index 0000000..075e642
--- /dev/null
+++ b/src/main/java/ui/controller/RegisterController.java
@@ -0,0 +1,74 @@
+package ui.controller;
+
+import app.SceneManager;
+import application.security.PasswordHasher;
+import application.user.UserRegister;
+import application.user.UserSignIn;
+import integration.security.Sha256PasswordHasher;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.PasswordField;
+import javafx.scene.control.TextField;
+import persistence.UserDao;
+
+import java.io.IOException;
+
+public class RegisterController {
+
+    @FXML private TextField usernameField;
+    @FXML private TextField emailField;
+    @FXML private TextField phoneNumberField;
+    @FXML private PasswordField passwordField;
+    @FXML private PasswordField confirmPasswordField;
+    @FXML private Label errorLabel;
+
+    private final UserRegister userRegister;
+
+    public RegisterController(UserRegister userRegister) {
+        this.userRegister = userRegister;
+    }
+
+    @FXML
+    private void handleRegister() {
+        String username = usernameField.getText().trim();
+        String email = emailField.getText().trim();
+        String phoneNr = phoneNumberField.getText().trim();
+        String password = passwordField.getText().trim();
+        String confirmPassword = confirmPasswordField.getText().trim();
+
+        if (username.isEmpty() || email.isEmpty() || phoneNr.isEmpty() || password.isEmpty() || confirmPassword.isEmpty()) {
+            errorLabel.setText("Please fill in all fields.");
+            return;
+        }
+
+        if (!password.equals(confirmPassword)) {
+            errorLabel.setText("Passwords do not match.");
+            return;
+        }
+
+        errorLabel.setText("");
+
+        try {
+            userRegister.execute(username, phoneNr, password, email);
+            SceneManager.switchTo("/fxml/signIn.fxml", new SignInController(
+                    new UserSignIn(new Sha256PasswordHasher(), new UserDao())
+            ));
+        } catch (IllegalArgumentException e) {
+            errorLabel.setText(e.getMessage());
+        } catch (IOException e) {
+            errorLabel.setText("Something went wrong, please try again.");
+        }
+    }
+
+    @FXML
+    private void handleSignIn() throws IOException {
+        PasswordHasher hasher = new Sha256PasswordHasher();
+        UserSignIn userSignIn = new UserSignIn(hasher, new UserDao());
+        SceneManager.switchTo("/fxml/signIn.fxml", new SignInController(userSignIn));
+    }
+
+    @FXML
+    private void handleGoHome() throws IOException {
+        SceneManager.switchTo("/fxml/Home.fxml");
+    }
+}
diff --git a/src/main/java/ui/controller/SignInController.java b/src/main/java/ui/controller/SignInController.java
index 994b4f0..4b1eb81 100644
--- a/src/main/java/ui/controller/SignInController.java
+++ b/src/main/java/ui/controller/SignInController.java
@@ -1,8 +1,11 @@
 package ui.controller;
 
 import app.SceneManager;
+import application.security.PasswordHasher;
+import application.user.UserRegister;
 import application.user.UserSignIn;
 import domain.user.User;
+import integration.security.Sha256PasswordHasher;
 import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
@@ -12,6 +15,7 @@
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
+import persistence.UserDao;
 
 import java.io.IOException;
 
@@ -64,8 +68,11 @@ private void handleGoHome(ActionEvent event) throws Exception {
     }
 
     @FXML
-    private void handleRegister() {
-        System.out.println("Go to Register clicked");
-        // Neste steg: bytte scene/view
+    private void handleRegister() throws IOException {
+        UserDao userDao = new UserDao();
+        PasswordHasher hasher = new Sha256PasswordHasher();
+        UserRegister userRegister = new UserRegister(hasher, userDao);
+
+        SceneManager.switchTo("/fxml/Register.fxml", new RegisterController(userRegister));
     }
 }
\ No newline at end of file
diff --git a/src/main/resources/css/Register.css b/src/main/resources/css/Register.css
new file mode 100644
index 0000000..0bc459c
--- /dev/null
+++ b/src/main/resources/css/Register.css
@@ -0,0 +1,108 @@
+/* =====================
+   GiveHope – register.css
+   Matches the sign-in page aesthetic
+   ===================== */
+
+/* Root / background */
+.root-pane {
+    -fx-background-color: #e8e8e8;
+}
+
+/* ── Top bar ── */
+.top-bar {
+    -fx-padding: 14 18 14 18;
+    -fx-alignment: CENTER_LEFT;
+    -fx-background-color: #e8e8e8;
+    -fx-spacing: 12;
+}
+
+.logo-label {
+    -fx-font-size: 15px;
+    -fx-font-family: "Segoe UI", sans-serif;
+    -fx-text-fill: #2c2c2c;
+    -fx-font-weight: normal;
+}
+
+.home-button {
+    -fx-background-color: #d4d4d4;
+    -fx-text-fill: #2c2c2c;
+    -fx-font-size: 14px;
+    -fx-font-family: "Segoe UI", sans-serif;
+    -fx-background-radius: 12px;
+    -fx-padding: 8 18 8 18;
+    -fx-cursor: hand;
+    -fx-border-color: transparent;
+}
+
+.home-button:hover {
+    -fx-background-color: #c4c4c4;
+}
+
+/* ── Form container ── */
+.form-container {
+    -fx-padding: 0 0 80 0;
+}
+
+/* ── Input fields ── */
+.input-field {
+    -fx-background-color: #ffffff;
+    -fx-background-radius: 24px;
+    -fx-border-radius: 24px;
+    -fx-border-color: transparent;
+    -fx-padding: 14 22 14 22;
+    -fx-font-size: 15px;
+    -fx-font-family: "Segoe UI", sans-serif;
+    -fx-prompt-text-fill: #b0b0b0;
+    -fx-text-fill: #2c2c2c;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.06), 6, 0, 0, 1);
+    -fx-pref-height: 50px;
+}
+
+.input-field:focused {
+    -fx-background-color: #ffffff;
+    -fx-border-color: #a8c4d4;
+    -fx-border-radius: 24px;
+    -fx-border-width: 1.5px;
+}
+
+/* ── Primary button ── */
+.primary-button {
+    -fx-background-color: #a8c4d4;
+    -fx-text-fill: #2c2c2c;
+    -fx-font-size: 16px;
+    -fx-font-family: "Segoe UI", sans-serif;
+    -fx-background-radius: 24px;
+    -fx-padding: 14 0 14 0;
+    -fx-cursor: hand;
+    -fx-pref-height: 54px;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.08), 6, 0, 0, 2);
+}
+
+.primary-button:hover {
+    -fx-background-color: #96b5c8;
+}
+
+.primary-button:pressed {
+    -fx-background-color: #84a6bb;
+}
+
+/* ── Footer ── */
+.footer-label {
+    -fx-font-size: 13px;
+    -fx-font-family: "Segoe UI", sans-serif;
+    -fx-text-fill: #888888;
+}
+
+.footer-link {
+    -fx-font-size: 13px;
+    -fx-font-family: "Segoe UI", sans-serif;
+    -fx-text-fill: #5a8fa8;
+    -fx-border-color: transparent;
+    -fx-padding: 0;
+    -fx-underline: false;
+}
+
+.footer-link:hover {
+    -fx-text-fill: #3d7290;
+    -fx-underline: true;
+}
\ No newline at end of file
diff --git a/src/main/resources/fxml/Register.fxml b/src/main/resources/fxml/Register.fxml
new file mode 100644
index 0000000..47336d8
--- /dev/null
+++ b/src/main/resources/fxml/Register.fxml
@@ -0,0 +1,94 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane xmlns:fx="http://javafx.com/fxml"
+            stylesheets="@/css/style.css"
+            prefWidth="1275" prefHeight="725.0"
+            style="-fx-background-color: #f4f4f4;">
+
+    <!-- TOP BAR -->
+    <top>
+        <HBox alignment="CENTER_LEFT" spacing="20">
+            <padding>
+                <Insets top="20" left="30"/>
+            </padding>
+
+            <Button text="Home"
+                    onAction="#handleGoHome"
+                    styleClass="nav-button"/>
+        </HBox>
+    </top>
+
+    <!-- REGISTER AREA -->
+    <center>
+
+        <VBox alignment="CENTER"
+              spacing="25"
+              maxWidth="500">
+
+            <TextField fx:id="usernameField"
+                       promptText="Enter Username"
+                       prefWidth="480"
+                       prefHeight="65"
+                       style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+            <TextField fx:id="emailField"
+                       promptText="Enter Email"
+                       prefWidth="480"
+                       prefHeight="65"
+                       style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+            <TextField fx:id="phoneNumberField"
+                       promptText="Enter Phone Number"
+                       prefWidth="480"
+                       prefHeight="65"
+                       style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+            <PasswordField fx:id="passwordField"
+                           promptText="Enter Password"
+                           prefWidth="480"
+                           prefHeight="65"
+                           style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+            <PasswordField fx:id="confirmPasswordField"
+                           promptText="Confirm Password"
+                           prefWidth="480"
+                           prefHeight="65"
+                           style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+            <Button text="Register"
+                    onAction="#handleRegister"
+                    styleClass="nav-button"
+                    prefWidth="280"
+                    prefHeight="70"
+                    style="-fx-font-size: 24px; -fx-background-color: #c3d6e6; -fx-background-radius: 14;" />
+
+            <Label fx:id="errorLabel"
+                   text=""
+                   style="-fx-text-fill: red; -fx-font-size: 16px;" />
+
+            <!-- SIGN IN LINK -->
+            <HBox alignment="CENTER" spacing="0">
+
+                <Label text="Already have an account? "
+                       style="-fx-font-size: 16px;"/>
+                <Hyperlink text="Sign in"
+                           onAction="#handleSignIn"
+                           style="-fx-font-size: 16px; -fx-padding: 0;"/>
+
+            </HBox>
+
+        </VBox>
+
+    </center>
+
+</BorderPane>
diff --git a/src/main/resources/fxml/SignIn.fxml b/src/main/resources/fxml/SignIn.fxml
index ca35ea5..982a3ef 100644
--- a/src/main/resources/fxml/SignIn.fxml
+++ b/src/main/resources/fxml/SignIn.fxml
@@ -7,7 +7,6 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 
 <?import javafx.scene.control.Label?>
@@ -60,10 +59,10 @@
                    style="-fx-text-fill: red; -fx-font-size: 16px;" />
 
             <!-- REGISTER LINK -->
-            <HBox alignment="CENTER" spacing="5">
+            <HBox alignment="CENTER">
 
-                <Hyperlink text="Don't have an account? Register"
-                           onAction="#handleRegister"/>
+                <Label text="Don't have an account? "/>
+                <Hyperlink text="Register" onAction="#handleRegister"/>
 
             </HBox>
 

From 40ce85f300c6b0a18edb41ce71b5e03468e6cda6 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 09:04:57 +0100
Subject: [PATCH 018/101] =?UTF-8?q?Slutt=20=C3=A5=20spore=20givehope.db?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 givehope.db | 0
 1 file changed, 0 insertions(+), 0 deletions(-)
 delete mode 100644 givehope.db

diff --git a/givehope.db b/givehope.db
deleted file mode 100644
index e69de29..0000000

From 79773d12bb16cc98480895db3e984657574f50f6 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 10:11:32 +0100
Subject: [PATCH 019/101] refactor: update organization table columns to match
 Innsamlingskontrollen API fields

---
 src/main/resources/schema.sql | 6 ++++--
 1 file changed, 4 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/schema.sql b/src/main/resources/schema.sql
index 9975777..d621863 100644
--- a/src/main/resources/schema.sql
+++ b/src/main/resources/schema.sql
@@ -10,9 +10,11 @@ CREATE TABLE IF NOT EXISTS user (
 );
 
 CREATE TABLE IF NOT EXISTS organization (
-    id INTEGER PRIMARY KEY AUTOINCREMENT,
+    org_number TEXT PRIMARY KEY,
     name TEXT NOT NULL,
-    description TEXT
+    status TEXT,
+    url TEXT,
+    is_pre_approved INTEGER
 );
 
 CREATE TABLE IF NOT EXISTS cause (

From a65b2ca97ddb27d0dcb81d3717a7ce17d72bff81 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 10:12:18 +0100
Subject: [PATCH 020/101] refactor: set initalize method to public

---
 src/main/java/persistence/db/Database.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/persistence/db/Database.java b/src/main/java/persistence/db/Database.java
index d4b51f2..889bba1 100644
--- a/src/main/java/persistence/db/Database.java
+++ b/src/main/java/persistence/db/Database.java
@@ -23,7 +23,7 @@ public static Connection getConnection() throws SQLException {
     return conn;
   }
 
-  private static void initializeDatabase() {
+  public static void initializeDatabase() {
     try (Connection conn = DriverManager.getConnection(URL);
          Statement stmt = conn.createStatement()) {
 

From 97beba5ef57bd8680221d4868a41c59432493348 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 10:12:59 +0100
Subject: [PATCH 021/101] refactor: Changed class to match
 Innsamlingskontrollen API

---
 .../domain/organization/Organization.java     | 89 ++++++-------------
 1 file changed, 26 insertions(+), 63 deletions(-)

diff --git a/src/main/java/domain/organization/Organization.java b/src/main/java/domain/organization/Organization.java
index c4d5d3c..c541252 100644
--- a/src/main/java/domain/organization/Organization.java
+++ b/src/main/java/domain/organization/Organization.java
@@ -1,81 +1,44 @@
 package domain.organization;
 
+import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
+import com.fasterxml.jackson.annotation.JsonProperty;
 import domain.donation.Cause;
 
 import java.util.Objects;
 
+@JsonIgnoreProperties(ignoreUnknown = true)
 public class Organization {
-    private final String name;
-    private final String orgNr;
-    private final Cause cause;
-    private final String description;
-    private final String contactEmail;
-    private final String website;
-    private final boolean verified;
 
+    @JsonProperty("org_number")
+    private String orgNumber;
 
-    public Organization(String name, String orgNr, Cause cause, String description, String contactEmail, String website, boolean verified) {
-      if (name == null || name.isBlank()) {
-        throw new IllegalArgumentException("Name cannot be null or blank");
-      }
-      if (orgNr == null || !orgNr.matches("\\d{9}")) {
-        throw new IllegalArgumentException("Organization number must be 9 digits");
-      }
-      if (contactEmail != null) {
-        contactEmail = contactEmail.trim();
+    @JsonProperty("name")
+    private String name;
 
-        if (contactEmail.isBlank()) {
-          throw new IllegalArgumentException("Email cannot be blank");
-        }
+    @JsonProperty("status")
+    private String status;
 
-        if (!contactEmail.matches("^[A-Za-z0-9+_.-]+@[A-Za-z0-9.-]+\\.[A-Za-z]{2,}$"
-        )) //Got help from ChatGPT on regex
-          {
-            throw new IllegalArgumentException("Invalid email format");
-          }
-        }
+    @JsonProperty("url")
+    private String url;
 
-      if (website != null) {
-        website = website.trim();
+    @JsonProperty("is_pre_approved")
+    private boolean isPreApproved;
 
-        if (website.isBlank()) {
-          throw new IllegalArgumentException("Website cannot be blank");
-        }
+    public Organization() {}
 
-        if (!website.matches("^https?://.+")) { //Got help from ChatGPT for regex
-          throw new IllegalArgumentException("Website must start with http:// or https://");
-        }
-      }
 
-      this.name = name.trim();
-      this.orgNr = orgNr.trim();
-      this.cause = Objects.requireNonNull(cause, "Cause cannot be null");
-      this.description = description;
-      this.contactEmail = contactEmail;
-      this.website = website;
-      this.verified = verified;
-    }
+    public String getOrgNumber() { return orgNumber; }
+    public void setOrgNumber(String orgNumber) { this.orgNumber = orgNumber; }
 
+    public String getName() { return name; }
+    public void setName(String name) { this.name = name; }
 
-    public String getName() {
-      return name;
-    }
-    public String getOrgNr() {
-      return orgNr;
-    }
-    public Cause getCause() {
-      return cause;
-    }
-    public String getDescription() {
-      return description;
-    }
-    public String getContactEmail() {
-      return contactEmail;
-    }
-    public String getWebsite() {
-      return website;
-    }
-    public boolean isVerified() {
-      return verified;
-    }
+    public String getStatus() { return status; }
+    public void setStatus(String status) { this.status = status; }
+
+    public String getUrl() { return url; }
+    public void setUrl(String url) { this.url = url; }
+
+    public boolean isPreApproved() { return isPreApproved; }
+    public void setPreApproved(boolean preApproved) { isPreApproved = preApproved; }
 }

From afe74c1794e4dd7a4bb138108f4c7ea93f46911d Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 10:13:36 +0100
Subject: [PATCH 022/101] feat: add OrganizationDAO for saving and retrieving
 organizations

---
 .../java/persistence/OrganizationDao.java     | 49 +++++++++++++++++++
 1 file changed, 49 insertions(+)

diff --git a/src/main/java/persistence/OrganizationDao.java b/src/main/java/persistence/OrganizationDao.java
index 8b45a05..e21c5c7 100644
--- a/src/main/java/persistence/OrganizationDao.java
+++ b/src/main/java/persistence/OrganizationDao.java
@@ -1,4 +1,53 @@
 package persistence;
 
+import domain.organization.Organization;
+
+import java.sql.*;
+import java.util.ArrayList;
+import java.util.List;
+
 public class OrganizationDao {
+
+    private static final String URL = "jdbc:sqlite:givehope.db";
+
+    public void insert(Organization org) throws SQLException {
+        String sql = """
+            INSERT OR IGNORE INTO organization
+            (org_number, name, status, url, is_pre_approved)
+            VALUES (?, ?, ?, ?, ?)
+        """;
+
+        try (Connection conn = DriverManager.getConnection(URL);
+             PreparedStatement stmt = conn.prepareStatement(sql)) {
+
+            stmt.setString(1, org.getOrgNumber());
+            stmt.setString(2, org.getName());
+            stmt.setString(3, org.getStatus());
+            stmt.setString(4, org.getUrl());
+            stmt.setInt(5, org.isPreApproved() ? 1 : 0);
+            stmt.executeUpdate();
+        }
+    }
+
+    public List<Organization> getAll() throws SQLException {
+        String sql = "SELECT * FROM organization";
+        List<Organization> list = new ArrayList<>();
+
+        try (Connection conn = DriverManager.getConnection(URL);
+             Statement stmt = conn.createStatement();
+             ResultSet rs = stmt.executeQuery(sql)) {
+
+            while (rs.next()) {
+                Organization org = new Organization();
+                org.setOrgNumber(rs.getString("org_number"));
+                org.setName(rs.getString("name"));
+                org.setStatus(rs.getString("status"));
+                org.setUrl(rs.getString("url"));
+                org.setPreApproved(rs.getInt("is_pre_approved") == 1);
+                list.add(org);
+            }
+        }
+        return list;
+    }
 }
+

From bfad5abd2353b9232336fceeaa424528e21b03cf Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 12:09:38 +0100
Subject: [PATCH 023/101] feat: connect explore organization button to
 OrganizationsView

---
 src/main/resources/fxml/Home.fxml | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/fxml/Home.fxml b/src/main/resources/fxml/Home.fxml
index 5fa39ad..bcd7a31 100644
--- a/src/main/resources/fxml/Home.fxml
+++ b/src/main/resources/fxml/Home.fxml
@@ -60,7 +60,8 @@
                <Button text="EXPLORE ORGANIZATIONS"
                        prefWidth="310"
                        prefHeight="105"
-                       style="-fx-background-color: #a9cce3; -fx-background-radius: 24; -fx-font-size: 24px;" />
+                       style="-fx-background-color: #a9cce3; -fx-background-radius: 24; -fx-font-size: 24px;"
+                       onAction="#handleBrowseOrganizations"/>
             </HBox>
          </VBox>
       </StackPane>

From 84c54dab252e034e435bcf967ae8e2a8ca8eae1e Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 12:09:57 +0100
Subject: [PATCH 024/101] feat: connect explore organization button to
 OrganizationsView

---
 src/main/java/ui/controller/HomeController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ui/controller/HomeController.java b/src/main/java/ui/controller/HomeController.java
index 34e02a2..a56fd9c 100644
--- a/src/main/java/ui/controller/HomeController.java
+++ b/src/main/java/ui/controller/HomeController.java
@@ -23,8 +23,8 @@ private void handleSignIn() throws IOException {
     }
 
     @FXML
-    private void handleBrowse() {
-        System.out.println("Browse button pressed");
+    private void handleBrowseOrganizations() throws IOException {
+        SceneManager.switchTo("/fxml/OrganizationsView.fxml");
     }
 
 }
\ No newline at end of file

From cd6a72fb5d43f00601fef550a8d3ba31a5c3a887 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 12:16:52 +0100
Subject: [PATCH 025/101] feat: created controller for OrganizationsView

---
 .../ui/controller/OrganizationController.java | 114 ++++++++++++++++++
 1 file changed, 114 insertions(+)
 create mode 100644 src/main/java/ui/controller/OrganizationController.java

diff --git a/src/main/java/ui/controller/OrganizationController.java b/src/main/java/ui/controller/OrganizationController.java
new file mode 100644
index 0000000..30b9108
--- /dev/null
+++ b/src/main/java/ui/controller/OrganizationController.java
@@ -0,0 +1,114 @@
+package ui.controller;
+
+import domain.organization.Organization;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.FlowPane;
+import javafx.scene.layout.VBox;
+import persistence.OrganizationDao;
+
+import java.sql.SQLException;
+import java.util.ArrayList;
+import java.util.List;
+import java.util.stream.Collectors;
+
+public class OrganizationController {
+
+    @FXML
+    private TextField searchField;
+    @FXML
+    private FlowPane organizationContainer;
+    @FXML
+    private Button previousPageBtn;
+    @FXML
+    private Button nextPageBtn;
+    @FXML
+    private Label pageLabel;
+
+    private List<Organization> allOrgs;
+    private List<Organization> filtrertOrgs;
+    private int page = 0;
+    private final int PER_PAGE = 15;
+
+    public void initialize() {
+        try {
+            System.out.println("initialize() started!");
+            OrganizationDao dao = new OrganizationDao();
+            allOrgs = dao.getAll();
+            System.out.println("Fetched: " + allOrgs.size() + " organizations");
+            filtrertOrgs = new ArrayList<>(allOrgs);
+            visSide();
+
+            searchField.textProperty().addListener((obs, old, nyTekst) -> {
+                filtrertOrgs = allOrgs.stream()
+                        .filter(org -> org.getName().toLowerCase()
+                                .contains(nyTekst.toLowerCase()))
+                        .collect(Collectors.toList());
+                page = 0;
+                visSide();
+            });
+
+        } catch (SQLException e) {
+            System.out.println("Feil ved henting: " + e.getMessage());
+        }
+    }
+
+    private void visSide() {
+        if (filtrertOrgs == null || filtrertOrgs.isEmpty()) {
+            System.out.println("No organizations to show!");
+            return;
+        }
+
+        organizationContainer.getChildren().clear();
+
+        int fra = page * PER_PAGE;
+        int til = Math.min(fra + PER_PAGE, filtrertOrgs.size());
+
+        for (int i = fra; i < til; i++) {
+            organizationContainer.getChildren().add(createCard(filtrertOrgs.get(i)));
+        }
+
+        int totalSider = (int) Math.ceil((double) filtrertOrgs.size() / PER_PAGE);
+        pageLabel.setText("Side " + (page + 1) + " av " + totalSider);
+        previousPageBtn.setDisable(page == 0);
+        nextPageBtn.setDisable(page >= totalSider - 1);
+    }
+
+    private VBox createCard(Organization org) {
+        VBox card = new VBox(8);
+        card.getStyleClass().add("org-card");
+        card.setPrefWidth(280);
+
+        Label name = new Label(org.getName());
+        name.getStyleClass().add("org-name");
+        name.setWrapText(true);
+
+        Label orgnr = new Label("Org.nr: " + org.getOrgNumber());
+        orgnr.getStyleClass().add("org-detail");
+
+        Label status = new Label(org.isPreApproved() ? "✓ Forhåndsgodkjent" : "✓ Godkjent");
+        status.getStyleClass().add("org-status");
+
+        Button donasjonBtn = new Button("Doner");
+        donasjonBtn.getStyleClass().add("donate-button");
+        donasjonBtn.setMaxWidth(Double.MAX_VALUE);
+
+        card.getChildren().addAll(name, orgnr, status, donasjonBtn);
+        return card;
+    }
+
+    @FXML
+    private void previousPage() {
+        page--;
+        visSide();
+    }
+
+    @FXML
+    private void nextPage() {
+        page++;
+        visSide();
+    }
+}

From 86087d71e163d1cd9ec513cab50be378bcc3f9e5 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 12:18:05 +0100
Subject: [PATCH 026/101] feat: add organization view with search and
 pagination

---
 .../resources/fxml/OrganizationsView.fxml     | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)
 create mode 100644 src/main/resources/fxml/OrganizationsView.fxml

diff --git a/src/main/resources/fxml/OrganizationsView.fxml b/src/main/resources/fxml/OrganizationsView.fxml
new file mode 100644
index 0000000..18691f6
--- /dev/null
+++ b/src/main/resources/fxml/OrganizationsView.fxml
@@ -0,0 +1,41 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.AnchorPane?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
+
+<AnchorPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.OrganizationController">
+   <children>
+      <ScrollPane fitToWidth="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" AnchorPane.bottomAnchor="0.0" AnchorPane.leftAnchor="0.0" AnchorPane.rightAnchor="0.0" AnchorPane.topAnchor="0.0">
+         <content>
+            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="30.0">
+               <children>
+                  <TextField fx:id="searchField" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" promptText="Search for organizations">
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                  </TextField>
+                  <FlowPane fx:id="organizationContainer" hgap="20.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWrapLength="900.0" vgap="20.0" />
+                  <HBox alignment="CENTER" spacing="15.0">
+                     <children>
+                        <Button fx:id="previousPageBtn" mnemonicParsing="false" onAction="#previousPage" text="←" />
+                        <Label fx:id="pageLabel" alignment="CENTER" prefHeight="17.0" prefWidth="122.0" text="Page 1 of 13" textAlignment="CENTER" />
+                        <Button fx:id="nextPageBtn" mnemonicParsing="false" onAction="#nextPage" text="→" />
+                     </children>
+                  </HBox>
+               </children>
+               <padding>
+                  <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+               </padding>
+            </VBox>
+         </content>
+      </ScrollPane>
+   </children>
+</AnchorPane>

From eed6746864af2fe22dc00bfab3dfa4d98ae1918a Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 15:19:16 +0100
Subject: [PATCH 027/101] style: apply consistent design system across all
 pages

---
 src/main/resources/css/Global.css | 60 +++++++++++++++++++++++++++++++
 1 file changed, 60 insertions(+)
 create mode 100644 src/main/resources/css/Global.css

diff --git a/src/main/resources/css/Global.css b/src/main/resources/css/Global.css
new file mode 100644
index 0000000..a4a7154
--- /dev/null
+++ b/src/main/resources/css/Global.css
@@ -0,0 +1,60 @@
+.root {
+    -fx-background-color: #f5f5f5;
+    -fx-font-family: "Segoe UI";
+}
+
+.nav-button {
+    -fx-background-color: #d9d9d9;
+    -fx-background-radius: 20;
+    -fx-font-size: 22px;
+    -fx-cursor: hand;
+    -fx-padding: 10 20 10 20;
+}
+.nav-button:hover {
+    -fx-background-color: #bfc3c7;
+    -fx-scale-x: 1.05;
+    -fx-scale-y: 1.05;
+}
+.nav-button:pressed {
+    -fx-background-color: #a5a8ab;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
+}
+
+.page-button {
+    -fx-background-color: #d9d9d9;
+    -fx-background-radius: 50;
+    -fx-font-size: 16px;
+    -fx-cursor: hand;
+    -fx-padding: 8px 20px;
+}
+
+.page-button:hover {
+    -fx-background-color: #bfc3c7;
+    -fx-scale-x: 1.05;
+    -fx-scale-y: 1.05;
+}
+
+.page-button:pressed {
+    -fx-background-color: #a5a8ab;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
+}
+
+.page-button:disabled {
+    -fx-background-color: #eeeeee;
+    -fx-text-fill: #aaaaaa;
+    -fx-cursor: default;
+}
+
+.page-label {
+    -fx-font-size: 14px;
+    -fx-text-fill: #555555;
+    -fx-padding: 8px 15px;
+}
+
+.logo-label {
+    -fx-font-size: 26px;
+    -fx-font-family: "Times New Roman";
+    -fx-text-fill: #1a1a1a;
+}
\ No newline at end of file

From dfd90cb214bbfe2387b5a07456a9f9d1b497eb51 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 15:31:06 +0100
Subject: [PATCH 028/101] feat: add SessionManager to track signed-in user
 state

---
 src/main/java/util/SessionManager.java | 26 ++++++++++++++++++++++++++
 1 file changed, 26 insertions(+)
 create mode 100644 src/main/java/util/SessionManager.java

diff --git a/src/main/java/util/SessionManager.java b/src/main/java/util/SessionManager.java
new file mode 100644
index 0000000..0a2f9b5
--- /dev/null
+++ b/src/main/java/util/SessionManager.java
@@ -0,0 +1,26 @@
+package util;
+
+import domain.user.User;
+
+public class SessionManager {
+    private static boolean SignedIn = false;
+    private static User currentUser = null;
+
+    public static void signIn(User user) {
+        SignedIn = true;
+        currentUser = user;
+    }
+
+    public static void logout() {
+        SignedIn = false;
+        currentUser = null;
+    }
+
+    public static boolean isSignedIn() {
+        return SignedIn;
+    }
+
+    public static User getCurrentUser() {
+        return currentUser;
+    }
+}

From b163b275073c1f5160a30e4747e5a35776122a5d Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 15:32:23 +0100
Subject: [PATCH 029/101] style: add OrganizationView stylesheet and update
 organizations layout

---
 .../resources/fxml/OrganizationsView.fxml     | 28 ++++++++++++++++---
 1 file changed, 24 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/fxml/OrganizationsView.fxml b/src/main/resources/fxml/OrganizationsView.fxml
index 18691f6..abd9ee8 100644
--- a/src/main/resources/fxml/OrganizationsView.fxml
+++ b/src/main/resources/fxml/OrganizationsView.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
@@ -8,6 +9,7 @@
 <?import javafx.scene.layout.AnchorPane?>
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
@@ -17,7 +19,21 @@
          <content>
             <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="30.0">
                <children>
-                  <TextField fx:id="searchField" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" promptText="Search for organizations">
+                  <HBox alignment="CENTER" prefHeight="51.0" prefWidth="900.0" spacing="15.0">
+                     <children>
+                        <Label styleClass="logo-label" text="GIVE HOPE" />
+                        <Region prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
+                        <Button mnemonicParsing="false" onAction="#goHome" styleClass="nav-button" text="Home" />
+                        <Button fx:id="signInAndMyProfileBtn" alignment="CENTER_RIGHT" contentDisplay="CENTER" mnemonicParsing="false" onAction="#goToSignIn" styleClass="nav-button" text="SIGN IN" textAlignment="CENTER" />
+                     </children>
+                  </HBox>
+                  <VBox prefHeight="19.0" prefWidth="900.0">
+                     <children>
+                        <Label styleClass="page-title" text="EXPLORE ORGANIZATIONS" />
+                        <Label styleClass="page-subtitle" text="Discover and support charitable organizations " />
+                     </children>
+                  </VBox>
+                  <TextField fx:id="searchField" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" promptText="Search for organizations" styleClass="search-field">
                      <font>
                         <Font size="16.0" />
                      </font>
@@ -25,9 +41,9 @@
                   <FlowPane fx:id="organizationContainer" hgap="20.0" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefWrapLength="900.0" vgap="20.0" />
                   <HBox alignment="CENTER" spacing="15.0">
                      <children>
-                        <Button fx:id="previousPageBtn" mnemonicParsing="false" onAction="#previousPage" text="←" />
-                        <Label fx:id="pageLabel" alignment="CENTER" prefHeight="17.0" prefWidth="122.0" text="Page 1 of 13" textAlignment="CENTER" />
-                        <Button fx:id="nextPageBtn" mnemonicParsing="false" onAction="#nextPage" text="→" />
+                        <Button fx:id="previousPageBtn" mnemonicParsing="false" onAction="#previousPage" styleClass="page-button" text="←" />
+                        <Label fx:id="pageLabel" alignment="CENTER" prefHeight="17.0" prefWidth="122.0" styleClass="page-label" text="Page 1 of 13" textAlignment="CENTER" />
+                        <Button fx:id="nextPageBtn" mnemonicParsing="false" onAction="#nextPage" styleClass="page-button" text="→" />
                      </children>
                   </HBox>
                </children>
@@ -38,4 +54,8 @@
          </content>
       </ScrollPane>
    </children>
+   <stylesheets>
+      <URL value="@../css/Global.css" />
+      <URL value="@../css/OrganizationView.css" />
+   </stylesheets>
 </AnchorPane>

From d45b04f5d54a432e445df0a8de35e6cbf1c77e35 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 15:34:03 +0100
Subject: [PATCH 030/101] style: add OrganizationView stylesheet for
 organization cards and search field

---
 src/main/resources/css/OrganizationView.css | 96 +++++++++++++++++++++
 1 file changed, 96 insertions(+)
 create mode 100644 src/main/resources/css/OrganizationView.css

diff --git a/src/main/resources/css/OrganizationView.css b/src/main/resources/css/OrganizationView.css
new file mode 100644
index 0000000..67c97ff
--- /dev/null
+++ b/src/main/resources/css/OrganizationView.css
@@ -0,0 +1,96 @@
+.org-card {
+    -fx-background-color: #e8e8e8;
+    -fx-background-radius: 12px;
+    -fx-padding: 20px;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.08), 8, 0, 0, 3);
+}
+
+.org-card:hover {
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.15), 12, 0, 0, 5);
+    -fx-cursor: hand;
+}
+
+.org-name {
+    -fx-font-size: 20px;
+}
+
+.donate-button {
+    -fx-background-color: #3a86ff;
+    -fx-text-fill: white;
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-background-radius: 8px;
+    -fx-padding: 10px;
+    -fx-cursor: hand;
+}
+
+.donate-button:hover {
+    -fx-background-color: #266ddf;
+    -fx-scale-x: 1.05;
+    -fx-scale-y: 1.05;
+}
+.donate-button:pressed {
+    -fx-background-color: #1a5bbf;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
+}
+
+.page-title {
+    -fx-font-size: 50px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #1a1a1a;
+}
+
+.page-subtitle {
+    -fx-font-size: 14px;
+    -fx-text-fill: #555555;
+}
+
+
+.scroll-pane {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.scroll-pane > .viewport {
+    -fx-background-color: transparent;
+}
+
+.scroll-bar:vertical {
+    -fx-background-color: transparent;
+    -fx-pref-width: 10px;
+}
+
+.scroll-bar:vertical .thumb {
+    -fx-background-color: #aaaaaa;
+    -fx-background-radius: 4px;
+}
+
+.scroll-bar:vertical .thumb:hover {
+    -fx-background-color: #3a86ff;
+}
+
+.scroll-bar:vertical .track {
+    -fx-background-color: transparent;
+}
+
+.scroll-bar .increment-button,
+.scroll-bar .decrement-button {
+    -fx-pref-height: 0;
+    -fx-pref-width: 0;
+    -fx-opacity: 0;
+}
+
+.search-field {
+    -fx-background-color: white;
+    -fx-border-color: #e0e0e0;
+    -fx-border-radius: 8px;
+    -fx-background-radius: 8px;
+    -fx-padding: 12px 15px;
+    -fx-font-size: 14px;
+    -fx-prompt-text-fill: #aaaaaa;
+}
+
+.search-field:focused {
+    -fx-border-color: #3a86ff;
+}
\ No newline at end of file

From 2a45c0af28ec64fb6dd94a6a16015db3eb840c0c Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 15:36:40 +0100
Subject: [PATCH 031/101] refactor: delete style.css

---
 src/main/resources/css/style.css | 17 -----------------
 1 file changed, 17 deletions(-)
 delete mode 100644 src/main/resources/css/style.css

diff --git a/src/main/resources/css/style.css b/src/main/resources/css/style.css
deleted file mode 100644
index 187e81d..0000000
--- a/src/main/resources/css/style.css
+++ /dev/null
@@ -1,17 +0,0 @@
-.nav-button {
-    -fx-background-color: #d9d9d9;
-    -fx-background-radius: 20;
-    -fx-font-size: 22px;
-    -fx-cursor: hand;
-    -fx-padding: 10 20 10 20;
-}
-.nav-button:hover {
-    -fx-background-color: #bfc3c7;
-    -fx-scale-x: 1.05;
-    -fx-scale-y: 1.05;
-}
-.nav-button:pressed {
-    -fx-background-color: #a5a8ab;
-    -fx-scale-x: 0.97;
-    -fx-scale-y: 0.97;
-}
\ No newline at end of file

From 61d4cab3c4ba01d844ee4a6b513fb46c96fc0f9a Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 15:37:23 +0100
Subject: [PATCH 032/101] chore: update Home.fxml to use Global.css stylesheet

---
 src/main/resources/fxml/Home.fxml | 5 ++---
 1 file changed, 2 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/fxml/Home.fxml b/src/main/resources/fxml/Home.fxml
index bcd7a31..1599edf 100644
--- a/src/main/resources/fxml/Home.fxml
+++ b/src/main/resources/fxml/Home.fxml
@@ -12,9 +12,8 @@
 
 <BorderPane xmlns:fx="http://javafx.com/fxml"
             fx:controller="ui.controller.HomeController"
-            stylesheets="@/css/style.css"
-            prefWidth="1275" prefHeight="725.0"
-            style="-fx-background-color: #f4f4f4;">
+            stylesheets="@/css/Global.css"
+            prefWidth="1275" prefHeight="725.0">
 
    <top>
       <HBox alignment="CENTER_LEFT"

From 12d14e963d8e56cd1b974381d1f0c3a2e7b7465b Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 15:38:10 +0100
Subject: [PATCH 033/101] feat: add session-aware navigation and responsive
 card layout in OrganizationController

---
 .../ui/controller/OrganizationController.java | 68 ++++++++++++++++---
 1 file changed, 59 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ui/controller/OrganizationController.java b/src/main/java/ui/controller/OrganizationController.java
index 30b9108..5009be3 100644
--- a/src/main/java/ui/controller/OrganizationController.java
+++ b/src/main/java/ui/controller/OrganizationController.java
@@ -1,7 +1,11 @@
 package ui.controller;
 
+import app.SceneManager;
+import application.security.PasswordHasher;
+import application.user.UserSignIn;
 import domain.organization.Organization;
 
+import integration.security.Sha256PasswordHasher;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -9,7 +13,10 @@
 import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.VBox;
 import persistence.OrganizationDao;
+import persistence.UserDao;
+import util.SessionManager;
 
+import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
@@ -27,6 +34,8 @@ public class OrganizationController {
     private Button nextPageBtn;
     @FXML
     private Label pageLabel;
+    @FXML
+    private Button signInAndMyProfileBtn;
 
     private List<Organization> allOrgs;
     private List<Organization> filtrertOrgs;
@@ -35,12 +44,28 @@ public class OrganizationController {
 
     public void initialize() {
         try {
-            System.out.println("initialize() started!");
+            if (SessionManager.isSignedIn()) {
+                signInAndMyProfileBtn.setText("My profile");
+                //signInAndMyProfileBtn.setOnAction(e -> SceneManager.switchTo("/fxml/Profile.fxml"));
+            } else {
+                signInAndMyProfileBtn.setText("Sign In");
+                UserDao userDao = new UserDao();
+                PasswordHasher hasher = new Sha256PasswordHasher();
+                UserSignIn userSignIn = new UserSignIn(hasher, userDao);
+                signInAndMyProfileBtn.setOnAction(e -> {
+                    try {
+                        SceneManager.switchTo("/fxml/signIn.fxml", new SignInController(userSignIn));
+                    } catch (IOException ex) {
+                        throw new RuntimeException(ex);
+                    }
+                });
+            }
+
             OrganizationDao dao = new OrganizationDao();
             allOrgs = dao.getAll();
             System.out.println("Fetched: " + allOrgs.size() + " organizations");
             filtrertOrgs = new ArrayList<>(allOrgs);
-            visSide();
+            showPage();
 
             searchField.textProperty().addListener((obs, old, nyTekst) -> {
                 filtrertOrgs = allOrgs.stream()
@@ -48,7 +73,16 @@ public void initialize() {
                                 .contains(nyTekst.toLowerCase()))
                         .collect(Collectors.toList());
                 page = 0;
-                visSide();
+                showPage();
+            });
+
+            organizationContainer.widthProperty().addListener((obs, oldWidth, newWidth) -> {
+                double cardWidth = (newWidth.doubleValue() - 60) / 3;
+                for (var node : organizationContainer.getChildren()) {
+                    if (node instanceof VBox card) {
+                        card.setPrefWidth(cardWidth);
+                    }
+                }
             });
 
         } catch (SQLException e) {
@@ -56,7 +90,7 @@ public void initialize() {
         }
     }
 
-    private void visSide() {
+    private void showPage() {
         if (filtrertOrgs == null || filtrertOrgs.isEmpty()) {
             System.out.println("No organizations to show!");
             return;
@@ -80,7 +114,8 @@ private void visSide() {
     private VBox createCard(Organization org) {
         VBox card = new VBox(8);
         card.getStyleClass().add("org-card");
-        card.setPrefWidth(280);
+        double width = organizationContainer.getWidth();
+        card.setPrefWidth(width > 0 ? (width - 60) / 3 : 400);
 
         Label name = new Label(org.getName());
         name.getStyleClass().add("org-name");
@@ -89,10 +124,10 @@ private VBox createCard(Organization org) {
         Label orgnr = new Label("Org.nr: " + org.getOrgNumber());
         orgnr.getStyleClass().add("org-detail");
 
-        Label status = new Label(org.isPreApproved() ? "✓ Forhåndsgodkjent" : "✓ Godkjent");
+        Label status = new Label(org.isPreApproved() ? "✓ Forhåndsgodkjent" : "✓ Verified");
         status.getStyleClass().add("org-status");
 
-        Button donasjonBtn = new Button("Doner");
+        Button donasjonBtn = new Button("Donate");
         donasjonBtn.getStyleClass().add("donate-button");
         donasjonBtn.setMaxWidth(Double.MAX_VALUE);
 
@@ -103,12 +138,27 @@ private VBox createCard(Organization org) {
     @FXML
     private void previousPage() {
         page--;
-        visSide();
+        showPage();
     }
 
     @FXML
     private void nextPage() {
         page++;
-        visSide();
+        showPage();
+    }
+
+    @FXML
+    private void goHome() throws IOException {
+        SceneManager.switchTo("/fxml/Home.fxml");
+    }
+
+    @FXML
+    private void goToSignIn() throws IOException {
+        UserDao userDao = new UserDao();
+        PasswordHasher hasher = new Sha256PasswordHasher();
+        UserSignIn userSignIn = new UserSignIn(hasher, userDao);
+
+        SceneManager.switchTo("/fxml/signIn.fxml", new SignInController(userSignIn));
     }
+
 }

From b8cac2a7f8760b452c0b773b1cb6e2e72c4acb70 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 19 Mar 2026 15:39:42 +0100
Subject: [PATCH 034/101] feat: store signed-in user in SessionManager after
 successful sign-in

---
 src/main/java/ui/controller/SignInController.java | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/src/main/java/ui/controller/SignInController.java b/src/main/java/ui/controller/SignInController.java
index 4b1eb81..ac0b314 100644
--- a/src/main/java/ui/controller/SignInController.java
+++ b/src/main/java/ui/controller/SignInController.java
@@ -16,6 +16,7 @@
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
 import persistence.UserDao;
+import util.SessionManager;
 
 import java.io.IOException;
 
@@ -47,6 +48,7 @@ private void handleSignIn() {
 
         try {
             User user = userSignIn.execute(login, password);
+            SessionManager.signIn(user);
             SceneManager.switchTo("/fxml/Home.fxml");
         } catch (IllegalArgumentException e) {
             errorLabel.setText(e.getMessage());

From f1b8d2fe77af87e36af2c7cf0d5bd67c0d63be1b Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 24 Mar 2026 15:41:20 +0100
Subject: [PATCH 035/101] refactor: moved scrollbar style from OrganizationView
 to Global

---
 src/main/resources/css/OrganizationView.css | 38 ---------------------
 1 file changed, 38 deletions(-)

diff --git a/src/main/resources/css/OrganizationView.css b/src/main/resources/css/OrganizationView.css
index 67c97ff..b756b98 100644
--- a/src/main/resources/css/OrganizationView.css
+++ b/src/main/resources/css/OrganizationView.css
@@ -35,11 +35,6 @@
     -fx-scale-y: 0.97;
 }
 
-.page-title {
-    -fx-font-size: 50px;
-    -fx-font-weight: bold;
-    -fx-text-fill: #1a1a1a;
-}
 
 .page-subtitle {
     -fx-font-size: 14px;
@@ -47,39 +42,6 @@
 }
 
 
-.scroll-pane {
-    -fx-background-color: transparent;
-    -fx-border-color: transparent;
-}
-
-.scroll-pane > .viewport {
-    -fx-background-color: transparent;
-}
-
-.scroll-bar:vertical {
-    -fx-background-color: transparent;
-    -fx-pref-width: 10px;
-}
-
-.scroll-bar:vertical .thumb {
-    -fx-background-color: #aaaaaa;
-    -fx-background-radius: 4px;
-}
-
-.scroll-bar:vertical .thumb:hover {
-    -fx-background-color: #3a86ff;
-}
-
-.scroll-bar:vertical .track {
-    -fx-background-color: transparent;
-}
-
-.scroll-bar .increment-button,
-.scroll-bar .decrement-button {
-    -fx-pref-height: 0;
-    -fx-pref-width: 0;
-    -fx-opacity: 0;
-}
 
 .search-field {
     -fx-background-color: white;

From ff8a60a73282508ae83dcaa85a7b64c4a2d6d3f4 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 24 Mar 2026 15:41:26 +0100
Subject: [PATCH 036/101] refactor: moved scrollbar style from OrganizationView
 to Global

---
 src/main/resources/css/Global.css | 46 +++++++++++++++++++++++++++++++
 1 file changed, 46 insertions(+)

diff --git a/src/main/resources/css/Global.css b/src/main/resources/css/Global.css
index a4a7154..816b1f1 100644
--- a/src/main/resources/css/Global.css
+++ b/src/main/resources/css/Global.css
@@ -57,4 +57,50 @@
     -fx-font-size: 26px;
     -fx-font-family: "Times New Roman";
     -fx-text-fill: #1a1a1a;
+}
+
+.page-title {
+    -fx-font-size: 36px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #1a1a1a;
+}
+
+.scroll-pane {
+    -fx-background-color: transparent;
+    -fx-border-color: transparent;
+}
+
+.scroll-pane > .viewport {
+    -fx-background-color: transparent;
+}
+
+.scroll-bar:vertical {
+    -fx-background-color: transparent;
+    -fx-pref-width: 10px;
+}
+
+.scroll-bar:vertical .thumb {
+    -fx-background-color: #aaaaaa;
+    -fx-background-radius: 4px;
+}
+
+.scroll-bar:vertical .thumb:hover {
+    -fx-background-color: #888888;
+    -fx-cursor: hand;
+}
+
+.scroll-bar:vertical .track {
+    -fx-background-color: transparent;
+}
+
+.scroll-bar .increment-button,
+.scroll-bar .decrement-button {
+    -fx-pref-height: 0;
+    -fx-pref-width: 0;
+    -fx-opacity: 0;
+}
+
+.section-title {
+    -fx-font-size: 22px;
+    -fx-text-fill: #1a1a1a;
 }
\ No newline at end of file

From 5fb186f12e5898317e3dde615d780bc85b805702 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 24 Mar 2026 15:42:31 +0100
Subject: [PATCH 037/101] style: add profile-label styles

---
 src/main/resources/css/MyProfile.css | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/main/resources/css/MyProfile.css

diff --git a/src/main/resources/css/MyProfile.css b/src/main/resources/css/MyProfile.css
new file mode 100644
index 0000000..a9b04ec
--- /dev/null
+++ b/src/main/resources/css/MyProfile.css
@@ -0,0 +1,4 @@
+
+.profile-label{
+    -fx-font-size: 16px;
+}
\ No newline at end of file

From 6ea7bf1264befdb51f3c13ff20666cde1a4619e3 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 24 Mar 2026 15:43:05 +0100
Subject: [PATCH 038/101] feat: add MyProfile view with profile info,
 statistics, donation history and saved organizations

---
 src/main/resources/fxml/MyProfile.fxml | 106 +++++++++++++++++++++++++
 1 file changed, 106 insertions(+)
 create mode 100644 src/main/resources/fxml/MyProfile.fxml

diff --git a/src/main/resources/fxml/MyProfile.fxml b/src/main/resources/fxml/MyProfile.fxml
new file mode 100644
index 0000000..7e2aaaa
--- /dev/null
+++ b/src/main/resources/fxml/MyProfile.fxml
@@ -0,0 +1,106 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.net.URL?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
+<?import javafx.scene.control.TableColumn?>
+<?import javafx.scene.control.TableView?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.FlowPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="692.0" prefWidth="620.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.MyProfileController">
+   <top>
+       <fx:include source="Navbar.fxml" />
+   </top>
+   <center>
+      <ScrollPane fitToWidth="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" BorderPane.alignment="CENTER">
+         <content>
+            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="25.0">
+               <children>
+                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
+                     <children>
+                        <Label styleClass="section-title" text="My Profile" />
+                        <VBox fx:id="MyProfile" prefHeight="100.0" prefWidth="187.0" spacing="10.0" styleClass="org-card">
+                           <children>
+                              <Label fx:id="nameLabel" styleClass="profile-label" text="Name: " />
+                              <Label fx:id="emailLabel" styleClass="profile-label" text="Email:" />
+                              <Label fx:id="phoneLabel" styleClass="profile-label" text="Phone:" />
+                              <Button mnemonicParsing="false" styleClass="page-button" text="Edit Profile" />
+                           </children>
+                           <padding>
+                              <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                           </padding>
+                        </VBox>
+                     </children>
+                  </VBox>
+                  <VBox fx:id="Statistics" prefHeight="100.0" prefWidth="173.0">
+                     <children>
+                        <Label styleClass="section-title" text="Statistics" />
+                        <HBox prefHeight="100.0" prefWidth="200.0" spacing="15.0">
+                           <children>
+                              <VBox prefHeight="200.0" prefWidth="100.0" styleClass="org-card">
+                                 <children>
+                                    <Label text="Total donation amount" />
+                                    <Label fx:id="totalDonatedLabel" styleClass="org-name" text="500 kr" />
+                                 </children>
+                              </VBox>
+                              <VBox prefHeight="200.0" prefWidth="100.0" styleClass="org-card">
+                                 <children>
+                                    <Label text="Number of donations" />
+                                    <Label fx:id="numberOfDonationsLabel" styleClass="org-name" text="&quot;7&quot;" />
+                                 </children>
+                              </VBox>
+                              <VBox prefHeight="200.0" prefWidth="100.0" styleClass="org-card">
+                                 <children>
+                                    <Label text="Label" />
+                                    <Label styleClass="org-name" text="Label" />
+                                 </children>
+                              </VBox>
+                           </children>
+                           <padding>
+                              <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                           </padding>
+                        </HBox>
+                     </children>
+                  </VBox>
+                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
+                     <children>
+                        <Label styleClass="section-title" text="Donation history" />
+                        <TableView fx:id="donationTable" prefHeight="200.0" prefWidth="200.0">
+                          <columns>
+                            <TableColumn prefWidth="250.00003564357758" text="Organizations" />
+                            <TableColumn minWidth="0.0" prefWidth="131.99998474121094" text="Amount" />
+                              <TableColumn prefWidth="116.0" text="Date" />
+                          </columns>
+                        </TableView>
+                     </children>
+                  </VBox>
+                  <VBox fx:id="MyOrganizations" prefHeight="100.0" prefWidth="184.0">
+                     <children>
+                        <Label styleClass="section-title" text="Saved Organizations" />
+                        <FlowPane fx:id="savedOrgsPane" prefHeight="200.0" prefWidth="200.0" />
+                     </children>
+                  </VBox>
+                  <Button mnemonicParsing="false" styleClass="page-button" text="Log out">
+                     <VBox.margin>
+                        <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
+                     </VBox.margin>
+                  </Button>
+               </children>
+               <padding>
+                  <Insets bottom="15.0" left="15.0" right="15.0" />
+               </padding>
+            </VBox>
+         </content>
+      </ScrollPane>
+   </center>
+   <stylesheets>
+      <URL value="@../css/Global.css" />
+      <URL value="@../css/MyProfile.css" />
+      <URL value="@../css/OrganizationView.css" />
+   </stylesheets>
+</BorderPane>

From 84cf18f38d93dfd1593188a4590f96baee86b09e Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 24 Mar 2026 15:43:28 +0100
Subject: [PATCH 039/101] feat: add MyProfileController

---
 src/main/java/ui/controller/MyProfileController.java | 4 ++++
 1 file changed, 4 insertions(+)
 create mode 100644 src/main/java/ui/controller/MyProfileController.java

diff --git a/src/main/java/ui/controller/MyProfileController.java b/src/main/java/ui/controller/MyProfileController.java
new file mode 100644
index 0000000..133f5eb
--- /dev/null
+++ b/src/main/java/ui/controller/MyProfileController.java
@@ -0,0 +1,4 @@
+package ui.controller;
+
+public class MyProfileController {
+}

From b80dbbfd619fc221add50f498bb6af1075479895 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 24 Mar 2026 15:45:32 +0100
Subject: [PATCH 040/101] feat: add NavbarController with navigation and Navbar
 FXML layout

---
 .../java/ui/controller/NavbarController.java  | 12 ++++++++++++
 src/main/resources/fxml/Navbar.fxml           | 19 +++++++++++++++++++
 2 files changed, 31 insertions(+)
 create mode 100644 src/main/java/ui/controller/NavbarController.java
 create mode 100644 src/main/resources/fxml/Navbar.fxml

diff --git a/src/main/java/ui/controller/NavbarController.java b/src/main/java/ui/controller/NavbarController.java
new file mode 100644
index 0000000..751de42
--- /dev/null
+++ b/src/main/java/ui/controller/NavbarController.java
@@ -0,0 +1,12 @@
+package ui.controller;
+
+import app.SceneManager;
+import javafx.event.ActionEvent;
+
+public class NavbarController {
+
+    @javafx.fxml.FXML
+    private void handleGoHome(ActionEvent event) throws Exception {
+        SceneManager.switchTo("/fxml/Home.fxml");
+    }
+}
diff --git a/src/main/resources/fxml/Navbar.fxml b/src/main/resources/fxml/Navbar.fxml
new file mode 100644
index 0000000..af9d6cd
--- /dev/null
+++ b/src/main/resources/fxml/Navbar.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+
+
+
+ <HBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="15.0" stylesheets="@../css/Global.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.NavbarController">
+     <Label styleClass="logo-label" text="Give Hope" />
+     <Region maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS" />
+
+        <Button onAction="#handleGoHome" styleClass="nav-button" text="Home" />
+     <padding>
+         <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+     </padding>
+ </HBox>

From 939e58e11f2e741091d890a37b8d0b2e95322431 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 24 Mar 2026 15:47:40 +0100
Subject: [PATCH 041/101] feat: update SignIn view to use shared Navbar and add
 button styles

---
 src/main/resources/css/SignIn.css   |  20 +++++
 src/main/resources/fxml/SignIn.fxml | 118 +++++++++++++++-------------
 2 files changed, 82 insertions(+), 56 deletions(-)
 create mode 100644 src/main/resources/css/SignIn.css

diff --git a/src/main/resources/css/SignIn.css b/src/main/resources/css/SignIn.css
new file mode 100644
index 0000000..36cdbb8
--- /dev/null
+++ b/src/main/resources/css/SignIn.css
@@ -0,0 +1,20 @@
+.signIn-button{
+    -fx-font-size: 24px;
+    -fx-background-color: #3a86ff;
+    -fx-text-fill: white;
+    -fx-font-family: "Segoe UI", sans-serif;
+    -fx-cursor: hand;
+    -fx-border-color: transparent;
+    -fx-background-radius: 14px;
+}
+
+.signIn-button:hover {
+    -fx-background-color: #266ddf;
+    -fx-scale-x: 1.05;
+    -fx-scale-y: 1.05;
+}
+.signIn-button:pressed {
+    -fx-background-color: #1a5bbf;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
+}
\ No newline at end of file
diff --git a/src/main/resources/fxml/SignIn.fxml b/src/main/resources/fxml/SignIn.fxml
index 982a3ef..b40cf7f 100644
--- a/src/main/resources/fxml/SignIn.fxml
+++ b/src/main/resources/fxml/SignIn.fxml
@@ -1,73 +1,79 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Label?>
 <?import javafx.scene.control.PasswordField?>
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
 
-<?import javafx.scene.control.Label?>
-<BorderPane xmlns:fx="http://javafx.com/fxml"
-            stylesheets="@/css/style.css"
-            prefWidth="1275" prefHeight="725.0"
-            style="-fx-background-color: #f4f4f4;">
 
-    <!-- TOP BAR -->
-    <top>
-        <HBox alignment="CENTER_LEFT" spacing="20">
-            <padding>
-                <Insets top="20" left="30"/>
-            </padding>
+<BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" style="-fx-background-color: #f4f4f4;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1">
 
-            <Button text="Home"
-                    onAction="#handleGoHome"
-                    styleClass="nav-button"/>
-        </HBox>
+          <!-- TOP BAR -->
+    <top>
+        <fx:include source="/fxml/Navbar.fxml"/>
     </top>
 
-    <!-- LOGIN AREA -->
+          <!-- LOGIN AREA -->
     <center>
 
-        <VBox alignment="CENTER"
-              spacing="25"
-              maxWidth="500">
-
-            <TextField fx:id="loginField"
-                       promptText="Enter Username or Email"
-                       prefWidth="480"
-                       prefHeight="65"
-                       style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-            <PasswordField fx:id="passwordField"
-                           promptText="Enter Password"
-                           prefWidth="480"
-                           prefHeight="65"
-                           style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-            <Button text="Sign in"
-                    onAction="#handleSignIn"
-                    styleClass="nav-button"
-                    prefWidth="280"
-                    prefHeight="70"
-                    style="-fx-font-size: 24px; -fx-background-color: #c3d6e6; -fx-background-radius: 14;" />
-
-            <Label fx:id="errorLabel"
-                   text=""
-                   style="-fx-text-fill: red; -fx-font-size: 16px;" />
-
-            <!-- REGISTER LINK -->
-            <HBox alignment="CENTER">
-
-                <Label text="Don't have an account? "/>
-                <Hyperlink text="Register" onAction="#handleRegister"/>
-
-            </HBox>
-
-        </VBox>
-
-    </center>
-
-</BorderPane>
\ No newline at end of file
+                    <VBox alignment="CENTER" maxWidth="500.0" spacing="20.0">
+         <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308">
+            <children>
+               <Label maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" styleClass="page-title" text="Sign In" />
+      
+                                          <!-- REGISTER LINK -->
+                  <HBox alignment="CENTER_LEFT">
+      
+                                              <Label text="or">
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                  </Label>
+                      <Hyperlink onAction="#handleRegister" text="create an account">
+                     <font>
+                        <Font size="16.0" />
+                     </font>
+                  </Hyperlink>
+      
+                                          </HBox>
+            </children>
+         </VBox>
+         <VBox prefHeight="200.0" prefWidth="100.0" spacing="25.0">
+            <children>
+      
+                              <TextField fx:id="loginField" prefHeight="65" prefWidth="480" promptText="Username or Email" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+      
+                              <PasswordField fx:id="passwordField" prefHeight="65" prefWidth="480" promptText="Password" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+      
+                              <Button maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" onAction="#handleSignIn" styleClass="signIn-button" text="Sign in" />
+            </children>
+         </VBox>
+         <HBox alignment="CENTER_LEFT">
+            <children>
+               <Hyperlink onAction="#handleRegister" text="Forgot your password?">
+                  <font>
+                     <Font size="16.0" />
+                  </font>
+               </Hyperlink>
+            </children>
+         </HBox>
+
+                                          <Label fx:id="errorLabel" maxWidth="1.7976931348623157E308" style="-fx-text-fill: red; -fx-font-size: 16px;" text="" />
+
+                    </VBox>
+
+          </center>
+   <stylesheets>
+      <URL value="@../css/Global.css" />
+      <URL value="@../css/SignIn.css" />
+   </stylesheets>
+
+      </BorderPane>

From 618b21b2efef507c699c9bd3ba8b19cf3874c2ed Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 24 Mar 2026 15:47:52 +0100
Subject: [PATCH 042/101] feat: update Register view to use shared Navbar and
 add button styles

---
 src/main/resources/css/Register.css   |  21 +++++
 src/main/resources/fxml/Register.fxml | 117 ++++++++++----------------
 2 files changed, 66 insertions(+), 72 deletions(-)

diff --git a/src/main/resources/css/Register.css b/src/main/resources/css/Register.css
index 0bc459c..a51cd40 100644
--- a/src/main/resources/css/Register.css
+++ b/src/main/resources/css/Register.css
@@ -105,4 +105,25 @@
 .footer-link:hover {
     -fx-text-fill: #3d7290;
     -fx-underline: true;
+}
+
+.register-button{
+    -fx-font-size: 24px;
+    -fx-background-color: #3a86ff;
+    -fx-text-fill: white;
+    -fx-font-family: "Segoe UI", sans-serif;
+    -fx-cursor: hand;
+    -fx-border-color: transparent;
+    -fx-background-radius: 14px;
+}
+
+.register-button:hover {
+    -fx-background-color: #266ddf;
+    -fx-scale-x: 1.05;
+    -fx-scale-y: 1.05;
+}
+.register-button:pressed {
+    -fx-background-color: #1a5bbf;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
 }
\ No newline at end of file
diff --git a/src/main/resources/fxml/Register.fxml b/src/main/resources/fxml/Register.fxml
index 47336d8..d736dfb 100644
--- a/src/main/resources/fxml/Register.fxml
+++ b/src/main/resources/fxml/Register.fxml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
+<?import java.net.URL?>
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
@@ -8,87 +9,59 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
+<?import javafx.scene.text.Font?>
 
-<BorderPane xmlns:fx="http://javafx.com/fxml"
-            stylesheets="@/css/style.css"
-            prefWidth="1275" prefHeight="725.0"
-            style="-fx-background-color: #f4f4f4;">
-
-    <!-- TOP BAR -->
-    <top>
-        <HBox alignment="CENTER_LEFT" spacing="20">
-            <padding>
-                <Insets top="20" left="30"/>
-            </padding>
-
-            <Button text="Home"
-                    onAction="#handleGoHome"
-                    styleClass="nav-button"/>
-        </HBox>
-    </top>
+<BorderPane prefHeight="725.0" prefWidth="1275" style="-fx-background-color: #f4f4f4;" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/25">
 
     <!-- REGISTER AREA -->
     <center>
 
-        <VBox alignment="CENTER"
-              spacing="25"
-              maxWidth="500">
-
-            <TextField fx:id="usernameField"
-                       promptText="Enter Username"
-                       prefWidth="480"
-                       prefHeight="65"
-                       style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-            <TextField fx:id="emailField"
-                       promptText="Enter Email"
-                       prefWidth="480"
-                       prefHeight="65"
-                       style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-            <TextField fx:id="phoneNumberField"
-                       promptText="Enter Phone Number"
-                       prefWidth="480"
-                       prefHeight="65"
-                       style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-            <PasswordField fx:id="passwordField"
-                           promptText="Enter Password"
-                           prefWidth="480"
-                           prefHeight="65"
-                           style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-            <PasswordField fx:id="confirmPasswordField"
-                           promptText="Confirm Password"
-                           prefWidth="480"
-                           prefHeight="65"
-                           style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-            <Button text="Register"
-                    onAction="#handleRegister"
-                    styleClass="nav-button"
-                    prefWidth="280"
-                    prefHeight="70"
-                    style="-fx-font-size: 24px; -fx-background-color: #c3d6e6; -fx-background-radius: 14;" />
-
-            <Label fx:id="errorLabel"
-                   text=""
-                   style="-fx-text-fill: red; -fx-font-size: 16px;" />
-
-            <!-- SIGN IN LINK -->
-            <HBox alignment="CENTER" spacing="0">
-
-                <Label text="Already have an account? "
-                       style="-fx-font-size: 16px;"/>
-                <Hyperlink text="Sign in"
-                           onAction="#handleSignIn"
-                           style="-fx-font-size: 16px; -fx-padding: 0;"/>
-
-            </HBox>
+        <VBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="500" spacing="25.0">
+         <Label styleClass="page-title" text="Register" />
+
+                  <TextField fx:id="usernameField" prefHeight="40.0" prefWidth="480" promptText="Enter Username" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+                  <TextField fx:id="emailField" prefHeight="40.0" prefWidth="480" promptText="Enter Email" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+                  <TextField fx:id="phoneNumberField" prefHeight="40.0" prefWidth="480" promptText="Enter Phone Number" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+                  <PasswordField fx:id="passwordField" prefHeight="40.0" prefWidth="480" promptText="Enter Password" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+                  <PasswordField fx:id="confirmPasswordField" prefHeight="40.0" prefWidth="480" promptText="Confirm Password" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
+
+                  <Button maxWidth="1.7976931348623157E308" onAction="#handleRegister" styleClass="register-button" text="Register" />
+
+                              <!-- SIGN IN LINK -->
+            <HBox alignment="CENTER_LEFT" spacing="0">
+            <children>
+      
+                                     <Label style="-fx-font-size: 16px;" text="Already have an account? ">
+                  <font>
+                     <Font size="16.0" />
+                  </font>
+               </Label>
+                   <Hyperlink onAction="#handleSignIn" style="-fx-font-size: 16px; -fx-padding: 0;" text="Sign in">
+                  <font>
+                     <Font size="16.0" />
+                  </font>
+               </Hyperlink>
+            </children>
+
+                              </HBox>
+
+                  <Label fx:id="errorLabel" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" style="-fx-text-fill: red; -fx-font-size: 16px;" text="" />
 
         </VBox>
 
     </center>
+   <top>
+       <fx:include source="/fxml/Navbar.fxml"/>
+   </top>
+   <stylesheets>
+      <URL value="@../css/Register.css" />
+      <URL value="@../css/Global.css" />
+   </stylesheets>
 
 </BorderPane>

From ac9ef75011180214df699c807b638cbac202ab56 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 24 Mar 2026 15:48:27 +0100
Subject: [PATCH 043/101] feat: navigate to MyProfile when user is signed in

---
 src/main/java/ui/controller/OrganizationController.java | 8 +++++++-
 1 file changed, 7 insertions(+), 1 deletion(-)

diff --git a/src/main/java/ui/controller/OrganizationController.java b/src/main/java/ui/controller/OrganizationController.java
index 5009be3..076d35d 100644
--- a/src/main/java/ui/controller/OrganizationController.java
+++ b/src/main/java/ui/controller/OrganizationController.java
@@ -46,7 +46,13 @@ public void initialize() {
         try {
             if (SessionManager.isSignedIn()) {
                 signInAndMyProfileBtn.setText("My profile");
-                //signInAndMyProfileBtn.setOnAction(e -> SceneManager.switchTo("/fxml/Profile.fxml"));
+                signInAndMyProfileBtn.setOnAction(e -> {
+                    try {
+                        SceneManager.switchTo("/fxml/MyProfile.fxml");
+                    } catch (IOException ex) {
+                        throw new RuntimeException(ex);
+                    }
+                });
             } else {
                 signInAndMyProfileBtn.setText("Sign In");
                 UserDao userDao = new UserDao();

From f17cb5bc846da900913457c5e3a57779d1768b99 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 24 Mar 2026 15:49:23 +0100
Subject: [PATCH 044/101] chore: initialize database and seed organizations on
 app startup

---
 src/main/java/app/Main.java | 16 +++++++++++++++-
 1 file changed, 15 insertions(+), 1 deletion(-)

diff --git a/src/main/java/app/Main.java b/src/main/java/app/Main.java
index 2462b45..7bfc57c 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/app/Main.java
@@ -1,17 +1,31 @@
 package app;
 
+import domain.organization.Organization;
+import integration.InnsamlingskontrollenClient;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
+import persistence.OrganizationDao;
+import persistence.db.Database;
 
+import javax.xml.crypto.Data;
 import java.io.IOException;
+import java.util.List;
 
 public class Main extends Application {
 
   @Override
-  public void start(Stage stage) throws IOException {
+  public void start(Stage stage) throws Exception {
+    Database.initializeDatabase();
+
+    OrganizationDao orgDao = new OrganizationDao();
+    Organization[] orgs = InnsamlingskontrollenClient.fetchOrganizations();
+    for (Organization org : orgs) {
+      orgDao.insert(org);
+      }
+
     SceneManager.setStage(stage);
 
     Parent root = FXMLLoader.load(getClass().getResource("/fxml/Home.fxml"));

From 5713a1a69b28b3aaa9a11bd51b1247ad08ec5d91 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 09:16:33 +0200
Subject: [PATCH 045/101] feat: add shared Navbar with MainView and
 MainController for unified navigation

---
 src/main/java/app/Main.java                   |  6 +-
 src/main/java/app/SceneManager.java           | 28 ---------
 src/main/java/ui/Page.java                    | 21 +++++++
 .../java/ui/controller/MainController.java    | 62 +++++++++++++++++++
 .../java/ui/controller/NavbarController.java  | 53 ++++++++++++++--
 src/main/resources/view/MainView.fxml         | 21 +++++++
 src/main/resources/view/Navbar.fxml           | 19 ++++++
 7 files changed, 172 insertions(+), 38 deletions(-)
 delete mode 100644 src/main/java/app/SceneManager.java
 create mode 100644 src/main/java/ui/Page.java
 create mode 100644 src/main/java/ui/controller/MainController.java
 create mode 100644 src/main/resources/view/MainView.fxml
 create mode 100644 src/main/resources/view/Navbar.fxml

diff --git a/src/main/java/app/Main.java b/src/main/java/app/Main.java
index 7bfc57c..0b94641 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/app/Main.java
@@ -10,10 +10,6 @@
 import persistence.OrganizationDao;
 import persistence.db.Database;
 
-import javax.xml.crypto.Data;
-import java.io.IOException;
-import java.util.List;
-
 public class Main extends Application {
 
   @Override
@@ -28,7 +24,7 @@ public void start(Stage stage) throws Exception {
 
     SceneManager.setStage(stage);
 
-    Parent root = FXMLLoader.load(getClass().getResource("/fxml/Home.fxml"));
+    Parent root = FXMLLoader.load(getClass().getResource("/view/MainView.fxml"));
     Scene scene = new Scene(root, 1275, 725);
 
     stage.setTitle("GiveHope");
diff --git a/src/main/java/app/SceneManager.java b/src/main/java/app/SceneManager.java
deleted file mode 100644
index 9632b35..0000000
--- a/src/main/java/app/SceneManager.java
+++ /dev/null
@@ -1,28 +0,0 @@
-package app;
-
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Parent;
-import javafx.stage.Stage;
-
-import java.io.IOException;
-
-public class SceneManager {
-
-    private static Stage stage;
-
-    public static void setStage(Stage s) {
-        stage = s;
-    }
-
-    public static void switchTo(String fxmlPath) throws IOException {
-        Parent root = FXMLLoader.load(SceneManager.class.getResource(fxmlPath));
-        stage.getScene().setRoot(root);
-    }
-
-    public static void switchTo(String fxmlPath, Object controller) throws IOException {
-        FXMLLoader loader = new FXMLLoader(SceneManager.class.getResource(fxmlPath));
-        loader.setController(controller);
-        Parent root = loader.load();
-        stage.getScene().setRoot(root);
-    }
-}
\ No newline at end of file
diff --git a/src/main/java/ui/Page.java b/src/main/java/ui/Page.java
new file mode 100644
index 0000000..e2066c8
--- /dev/null
+++ b/src/main/java/ui/Page.java
@@ -0,0 +1,21 @@
+package ui;
+
+public enum Page {
+    HOME("Home.fxml"),
+    PROFILE("MyProfile.fxml"),
+    SIGNIN("SignIn.fxml"),
+    REGISTER("Register.fxml"),
+    ORGANIZATIONS("OrganizationsView.fxml"),
+    MYPROFILE("MyProfile.fxml");
+
+
+    private final String fileName;
+
+    Page(String fileName) {
+        this.fileName = fileName;
+    }
+
+    public String getFileName() {
+        return fileName;
+    }
+}
diff --git a/src/main/java/ui/controller/MainController.java b/src/main/java/ui/controller/MainController.java
new file mode 100644
index 0000000..2bcc6cc
--- /dev/null
+++ b/src/main/java/ui/controller/MainController.java
@@ -0,0 +1,62 @@
+package ui.controller;
+
+import application.user.UserRegister;
+import application.user.UserSignIn;
+import integration.security.Sha256PasswordHasher;
+import javafx.fxml.FXML;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.layout.BorderPane;
+import persistence.UserDao;
+import ui.Page;
+
+import java.io.IOException;
+
+public class MainController {
+
+    @FXML
+    private BorderPane mainPane;
+
+    @FXML
+    private NavbarController navbarController;
+
+    public void initialize() {
+        try {
+            navbarController.setOnNavigate(page -> {
+                try {
+                    loadPage(page);
+                } catch (IOException e) {
+
+                }
+            });
+            loadPage(Page.HOME);
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
+
+    public void loadPage(Page page) throws IOException {
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/" + page.getFileName()));
+        Parent root = loader.load();
+
+        Object controller = loader.getController();
+        if (controller instanceof NavigationAware navigationAware) {
+            navigationAware.setOnNavigate(p -> {
+                try {
+                    loadPage(p);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+        }
+        if (controller instanceof SignInController c) {
+            c.setUserSignIn(new UserSignIn(new Sha256PasswordHasher(), new UserDao()));
+        }
+        if (controller instanceof RegisterController c) {
+            c.setUserRegister(new UserRegister(new Sha256PasswordHasher(), new UserDao()));
+        }
+
+        mainPane.setCenter(root);
+        navbarController.setActivePage(page);
+    }
+}
diff --git a/src/main/java/ui/controller/NavbarController.java b/src/main/java/ui/controller/NavbarController.java
index 751de42..7523c33 100644
--- a/src/main/java/ui/controller/NavbarController.java
+++ b/src/main/java/ui/controller/NavbarController.java
@@ -1,12 +1,55 @@
 package ui.controller;
 
-import app.SceneManager;
-import javafx.event.ActionEvent;
+import java.util.function.Consumer;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import ui.Page;
 
 public class NavbarController {
 
-    @javafx.fxml.FXML
-    private void handleGoHome(ActionEvent event) throws Exception {
-        SceneManager.switchTo("/fxml/Home.fxml");
+    private Consumer<Page> onNavigate;
+    @FXML
+    private Button homeBtn;
+    @FXML
+    private Button orgBtn;
+    @FXML
+    private Button signInBtn;
+
+    public void setOnNavigate(Consumer<Page> onNavigate) {
+        this.onNavigate = onNavigate;
+    }
+
+    public void setActivePage(Page page) {
+        homeBtn.getStyleClass().remove("nav-button-active");
+        orgBtn.getStyleClass().remove("nav-button-active");
+        signInBtn.getStyleClass().remove("nav-button-active");
+
+        Button buttonForPage = switch (page) {
+            case HOME -> homeBtn;
+            case ORGANIZATIONS -> orgBtn;
+            case SIGNIN -> signInBtn;
+            default -> null;
+        };
+
+        if (buttonForPage != null) {
+            buttonForPage.getStyleClass().add("nav-button-active");
+        }
+    }
+
+    public void goHome() {
+        onNavigate.accept(Page.HOME);
+    }
+
+    public void goToSignIn() {
+        onNavigate.accept(Page.SIGNIN);
+    }
+
+    public void goToOrganizations() {
+        onNavigate.accept(Page.ORGANIZATIONS);
+    }
+
+    public void goToMyProfile() {
+        onNavigate.accept(Page.PROFILE);
     }
 }
diff --git a/src/main/resources/view/MainView.fxml b/src/main/resources/view/MainView.fxml
new file mode 100644
index 0000000..6b655b0
--- /dev/null
+++ b/src/main/resources/view/MainView.fxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.lang.*?>
+<?import java.util.*?>
+<?import javafx.scene.*?>
+<?import javafx.scene.control.*?>
+<?import javafx.scene.layout.*?>
+
+<!-- MainView.fxml -->
+<BorderPane fx:id="mainPane"
+            fx:controller="ui.controller.MainController"
+            stylesheets="@../css/Global.css"
+            xmlns="http://javafx.com/javafx/25"
+            xmlns:fx="http://javafx.com/fxml/1">
+    <top>
+        <fx:include fx:id="navbar" source="Navbar.fxml" />
+    </top>
+    <center>
+        <!-- her swapper du inn Home, Donate, Profile osv -->
+    </center>
+</BorderPane>
diff --git a/src/main/resources/view/Navbar.fxml b/src/main/resources/view/Navbar.fxml
new file mode 100644
index 0000000..21a512e
--- /dev/null
+++ b/src/main/resources/view/Navbar.fxml
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+
+<HBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="89.0" prefWidth="595.0" spacing="15.0" styleClass="navbar" stylesheets="@../css/Global.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.NavbarController">
+     <Label styleClass="logo-label" text="Give Hope" />
+     <Region maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS" />
+
+        <Button fx:id="homeBtn" onAction="#goHome" styleClass="nav-button" text="Home" />
+   <Button fx:id="orgBtn" mnemonicParsing="false" onAction="#goToOrganizations" styleClass="nav-button" text="Organizations" />
+   <Button fx:id="signInBtn" mnemonicParsing="false" onAction="#goToSignIn" styleClass="nav-button" text="Sign In" />
+     <padding>
+         <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
+     </padding>
+ </HBox>

From 6bb4cb80707c130519541095969f12ee901f15fd Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 09:17:44 +0200
Subject: [PATCH 046/101] refactor: add NavigationAware interface to simplify
 page navigation in controllers

---
 .../java/ui/controller/HomeController.java    | 21 ++++++-----
 .../java/ui/controller/NavigationAware.java   |  9 +++++
 .../ui/controller/RegisterController.java     | 29 +++++++--------
 .../java/ui/controller/SignInController.java  | 35 +++++++------------
 4 files changed, 49 insertions(+), 45 deletions(-)
 create mode 100644 src/main/java/ui/controller/NavigationAware.java

diff --git a/src/main/java/ui/controller/HomeController.java b/src/main/java/ui/controller/HomeController.java
index a56fd9c..c65c6a4 100644
--- a/src/main/java/ui/controller/HomeController.java
+++ b/src/main/java/ui/controller/HomeController.java
@@ -7,24 +7,29 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import persistence.UserDao;
+import ui.Page;
+
 import java.io.IOException;
+import java.util.function.Consumer;
+
+public class HomeController implements NavigationAware {
 
-public class HomeController {
+    private Consumer<Page> onNavigate;
+
+    public void setOnNavigate(Consumer<Page> onNavigate) {
+        this.onNavigate = onNavigate;
+    }
 
     public Button signInButton;
 
     @FXML
     private void handleSignIn() throws IOException {
-        UserDao userDao = new UserDao();
-        PasswordHasher hasher = new Sha256PasswordHasher();
-        UserSignIn userSignIn = new UserSignIn(hasher, userDao);
-
-        SceneManager.switchTo("/fxml/signIn.fxml", new SignInController(userSignIn));
+        onNavigate.accept(Page.SIGNIN);
     }
 
     @FXML
-    private void handleBrowseOrganizations() throws IOException {
-        SceneManager.switchTo("/fxml/OrganizationsView.fxml");
+    private void handleBrowseOrganizations() {
+        onNavigate.accept(Page.ORGANIZATIONS);
     }
 
 }
\ No newline at end of file
diff --git a/src/main/java/ui/controller/NavigationAware.java b/src/main/java/ui/controller/NavigationAware.java
new file mode 100644
index 0000000..a04623e
--- /dev/null
+++ b/src/main/java/ui/controller/NavigationAware.java
@@ -0,0 +1,9 @@
+package ui.controller;
+
+import ui.Page;
+
+import java.util.function.Consumer;
+
+public interface NavigationAware {
+    void setOnNavigate(Consumer<Page> onNavigate);
+}
\ No newline at end of file
diff --git a/src/main/java/ui/controller/RegisterController.java b/src/main/java/ui/controller/RegisterController.java
index 075e642..681b353 100644
--- a/src/main/java/ui/controller/RegisterController.java
+++ b/src/main/java/ui/controller/RegisterController.java
@@ -10,10 +10,12 @@
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
 import persistence.UserDao;
+import ui.Page;
 
 import java.io.IOException;
+import java.util.function.Consumer;
 
-public class RegisterController {
+public class RegisterController implements NavigationAware {
 
     @FXML private TextField usernameField;
     @FXML private TextField emailField;
@@ -22,12 +24,17 @@ public class RegisterController {
     @FXML private PasswordField confirmPasswordField;
     @FXML private Label errorLabel;
 
-    private final UserRegister userRegister;
+    private UserRegister userRegister;
+    private Consumer<Page> onNavigate;
 
-    public RegisterController(UserRegister userRegister) {
+    public void setUserRegister(UserRegister userRegister) {
         this.userRegister = userRegister;
     }
 
+    public void setOnNavigate(Consumer<Page> onNavigate) {
+        this.onNavigate = onNavigate;
+    }
+
     @FXML
     private void handleRegister() {
         String username = usernameField.getText().trim();
@@ -50,25 +57,19 @@ private void handleRegister() {
 
         try {
             userRegister.execute(username, phoneNr, password, email);
-            SceneManager.switchTo("/fxml/signIn.fxml", new SignInController(
-                    new UserSignIn(new Sha256PasswordHasher(), new UserDao())
-            ));
+            onNavigate.accept(Page.SIGNIN);
         } catch (IllegalArgumentException e) {
             errorLabel.setText(e.getMessage());
-        } catch (IOException e) {
-            errorLabel.setText("Something went wrong, please try again.");
         }
     }
 
     @FXML
-    private void handleSignIn() throws IOException {
-        PasswordHasher hasher = new Sha256PasswordHasher();
-        UserSignIn userSignIn = new UserSignIn(hasher, new UserDao());
-        SceneManager.switchTo("/fxml/signIn.fxml", new SignInController(userSignIn));
+    private void handleSignIn() {
+        onNavigate.accept(Page.SIGNIN);
     }
 
     @FXML
-    private void handleGoHome() throws IOException {
-        SceneManager.switchTo("/fxml/Home.fxml");
+    private void handleGoHome() {
+        onNavigate.accept(Page.HOME);
     }
 }
diff --git a/src/main/java/ui/controller/SignInController.java b/src/main/java/ui/controller/SignInController.java
index ac0b314..f8ebe4c 100644
--- a/src/main/java/ui/controller/SignInController.java
+++ b/src/main/java/ui/controller/SignInController.java
@@ -16,22 +16,29 @@
 import javafx.scene.control.TextField;
 import javafx.stage.Stage;
 import persistence.UserDao;
+import ui.Page;
 import util.SessionManager;
 
 import java.io.IOException;
+import java.util.function.Consumer;
 
-public class SignInController {
+public class SignInController implements NavigationAware {
 
     @FXML private TextField loginField;
     @FXML private PasswordField passwordField;
     @FXML private Label errorLabel;
 
-    private final UserSignIn userSignIn;
+    private  UserSignIn userSignIn;
+    private Consumer<Page> onNavigate;
 
-    public SignInController(UserSignIn userSignIn) {
+    public void setUserSignIn(UserSignIn userSignIn) {
         this.userSignIn = userSignIn;
     }
 
+    public void setOnNavigate(Consumer<Page> onNavigate) {
+        this.onNavigate = onNavigate;
+    }
+
     @FXML
     private void handleSignIn() {
 
@@ -49,32 +56,14 @@ private void handleSignIn() {
         try {
             User user = userSignIn.execute(login, password);
             SessionManager.signIn(user);
-            SceneManager.switchTo("/fxml/Home.fxml");
+            onNavigate.accept(Page.HOME);
         } catch (IllegalArgumentException e) {
             errorLabel.setText(e.getMessage());
-        } catch (IOException e) {
-            errorLabel.setText("Noe gikk galt, prøv igjen.");
         }
-
-        // Her skal senere login service kalles
-    }
-
-    @FXML
-    private void handleGoHome(ActionEvent event) throws Exception {
-
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/fxml/Home.fxml"));
-        Scene scene = new Scene(loader.load());
-
-        Stage stage = (Stage)((Node)event.getSource()).getScene().getWindow();
-        stage.setScene(scene);
     }
 
     @FXML
     private void handleRegister() throws IOException {
-        UserDao userDao = new UserDao();
-        PasswordHasher hasher = new Sha256PasswordHasher();
-        UserRegister userRegister = new UserRegister(hasher, userDao);
-
-        SceneManager.switchTo("/fxml/Register.fxml", new RegisterController(userRegister));
+        onNavigate.accept(Page.REGISTER);
     }
 }
\ No newline at end of file

From 42cd9248640385957e307ebb2b4a97f32f23fbb1 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 09:17:58 +0200
Subject: [PATCH 047/101] style: update navbar and organization view styles

---
 src/main/resources/css/Global.css           | 44 +++++++++++++++------
 src/main/resources/css/OrganizationView.css |  6 +--
 2 files changed, 35 insertions(+), 15 deletions(-)

diff --git a/src/main/resources/css/Global.css b/src/main/resources/css/Global.css
index 816b1f1..c39569e 100644
--- a/src/main/resources/css/Global.css
+++ b/src/main/resources/css/Global.css
@@ -3,13 +3,7 @@
     -fx-font-family: "Segoe UI";
 }
 
-.nav-button {
-    -fx-background-color: #d9d9d9;
-    -fx-background-radius: 20;
-    -fx-font-size: 22px;
-    -fx-cursor: hand;
-    -fx-padding: 10 20 10 20;
-}
+
 .nav-button:hover {
     -fx-background-color: #bfc3c7;
     -fx-scale-x: 1.05;
@@ -53,11 +47,6 @@
     -fx-padding: 8px 15px;
 }
 
-.logo-label {
-    -fx-font-size: 26px;
-    -fx-font-family: "Times New Roman";
-    -fx-text-fill: #1a1a1a;
-}
 
 .page-title {
     -fx-font-size: 36px;
@@ -103,4 +92,35 @@
 .section-title {
     -fx-font-size: 22px;
     -fx-text-fill: #1a1a1a;
+}
+
+
+/*NavigationBar*/
+.navbar {
+    -fx-background-color: #1e3a8a;
+    -fx-padding: 12 20 12 20;
+}
+
+.nav-button {
+    -fx-background-color: transparent;
+    -fx-border-color: rgba(255,255,255,0.4);
+    -fx-border-radius: 20;
+    -fx-background-radius: 20;
+    -fx-text-fill: white;
+    -fx-font-size: 13px;
+    -fx-cursor: hand;
+    -fx-padding: 6 16 6 16;
+}
+
+.nav-button-active {
+    -fx-background-color: white;
+    -fx-text-fill: #1a1a2e;
+    -fx-font-weight: bold;
+}
+
+.logo-label {
+    -fx-font-size: 22px;
+    -fx-font-family: "Times New Roman";
+    -fx-text-fill: white;
+    -fx-font-weight: bold;
 }
\ No newline at end of file
diff --git a/src/main/resources/css/OrganizationView.css b/src/main/resources/css/OrganizationView.css
index b756b98..6904bfd 100644
--- a/src/main/resources/css/OrganizationView.css
+++ b/src/main/resources/css/OrganizationView.css
@@ -15,7 +15,7 @@
 }
 
 .donate-button {
-    -fx-background-color: #3a86ff;
+    -fx-background-color: #1e3a8a;
     -fx-text-fill: white;
     -fx-font-size: 14px;
     -fx-font-weight: bold;
@@ -25,12 +25,12 @@
 }
 
 .donate-button:hover {
-    -fx-background-color: #266ddf;
+    -fx-background-color: #2649a8;
     -fx-scale-x: 1.05;
     -fx-scale-y: 1.05;
 }
 .donate-button:pressed {
-    -fx-background-color: #1a5bbf;
+    -fx-background-color: #162d6e;
     -fx-scale-x: 0.97;
     -fx-scale-y: 0.97;
 }

From 57cea2055685fed7c27156963c51dd5950102ff7 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 09:18:10 +0200
Subject: [PATCH 048/101] feat: update OrganizationController to use new
 navigation setup

---
 .../ui/controller/OrganizationController.java | 43 ++++++-------------
 1 file changed, 12 insertions(+), 31 deletions(-)

diff --git a/src/main/java/ui/controller/OrganizationController.java b/src/main/java/ui/controller/OrganizationController.java
index 076d35d..a0b85d9 100644
--- a/src/main/java/ui/controller/OrganizationController.java
+++ b/src/main/java/ui/controller/OrganizationController.java
@@ -14,12 +14,14 @@
 import javafx.scene.layout.VBox;
 import persistence.OrganizationDao;
 import persistence.UserDao;
+import ui.Page;
 import util.SessionManager;
 
 import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
+import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
 public class OrganizationController {
@@ -42,31 +44,14 @@ public class OrganizationController {
     private int page = 0;
     private final int PER_PAGE = 15;
 
+    private Consumer<Page> onNavigate;
+
+    public void setOnNavigate(Consumer<Page> onNavigate) {
+        this.onNavigate = onNavigate;
+    }
+
     public void initialize() {
         try {
-            if (SessionManager.isSignedIn()) {
-                signInAndMyProfileBtn.setText("My profile");
-                signInAndMyProfileBtn.setOnAction(e -> {
-                    try {
-                        SceneManager.switchTo("/fxml/MyProfile.fxml");
-                    } catch (IOException ex) {
-                        throw new RuntimeException(ex);
-                    }
-                });
-            } else {
-                signInAndMyProfileBtn.setText("Sign In");
-                UserDao userDao = new UserDao();
-                PasswordHasher hasher = new Sha256PasswordHasher();
-                UserSignIn userSignIn = new UserSignIn(hasher, userDao);
-                signInAndMyProfileBtn.setOnAction(e -> {
-                    try {
-                        SceneManager.switchTo("/fxml/signIn.fxml", new SignInController(userSignIn));
-                    } catch (IOException ex) {
-                        throw new RuntimeException(ex);
-                    }
-                });
-            }
-
             OrganizationDao dao = new OrganizationDao();
             allOrgs = dao.getAll();
             System.out.println("Fetched: " + allOrgs.size() + " organizations");
@@ -154,17 +139,13 @@ private void nextPage() {
     }
 
     @FXML
-    private void goHome() throws IOException {
-        SceneManager.switchTo("/fxml/Home.fxml");
+    private void handleGoHome() {
+        onNavigate.accept(Page.HOME);
     }
 
     @FXML
-    private void goToSignIn() throws IOException {
-        UserDao userDao = new UserDao();
-        PasswordHasher hasher = new Sha256PasswordHasher();
-        UserSignIn userSignIn = new UserSignIn(hasher, userDao);
-
-        SceneManager.switchTo("/fxml/signIn.fxml", new SignInController(userSignIn));
+    private void handleSignIn() {
+        onNavigate.accept(Page.SIGNIN);
     }
 
 }

From 33671d93dd63647460ca18cbc76dadec46ab5067 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 09:18:39 +0200
Subject: [PATCH 049/101] refactor: move FXML resources from fxml/ to view/
 directory

---
 src/main/resources/{fxml => view}/Home.fxml   | 21 -------------------
 .../resources/{fxml => view}/MyProfile.fxml   |  0
 .../{fxml => view}/OrganizationsView.fxml     |  8 -------
 .../resources/{fxml => view}/Register.fxml    |  5 +----
 src/main/resources/{fxml => view}/SignIn.fxml |  8 +------
 5 files changed, 2 insertions(+), 40 deletions(-)
 rename src/main/resources/{fxml => view}/Home.fxml (76%)
 rename src/main/resources/{fxml => view}/MyProfile.fxml (100%)
 rename src/main/resources/{fxml => view}/OrganizationsView.fxml (80%)
 rename src/main/resources/{fxml => view}/Register.fxml (92%)
 rename src/main/resources/{fxml => view}/SignIn.fxml (90%)

diff --git a/src/main/resources/fxml/Home.fxml b/src/main/resources/view/Home.fxml
similarity index 76%
rename from src/main/resources/fxml/Home.fxml
rename to src/main/resources/view/Home.fxml
index 1599edf..7eb6293 100644
--- a/src/main/resources/fxml/Home.fxml
+++ b/src/main/resources/view/Home.fxml
@@ -14,27 +14,6 @@
             fx:controller="ui.controller.HomeController"
             stylesheets="@/css/Global.css"
             prefWidth="1275" prefHeight="725.0">
-
-   <top>
-      <HBox alignment="CENTER_LEFT"
-            spacing="20"
-            prefHeight="120.0"
-            style="-fx-background-color: #c9dce5;">
-         <padding>
-            <Insets top="20" right="30" bottom="20" left="30"/>
-         </padding>
-
-         <Label text="GiveHope"
-                style="-fx-font-size: 36px; -fx-text-fill: black;-fx-font-weight: bold;" />
-
-         <Region HBox.hgrow="ALWAYS"/>
-
-         <Button text="Sign in"
-                 styleClass="nav-button"
-                 onAction="#handleSignIn"/>
-      </HBox>
-   </top>
-
    <center>
       <StackPane style="-fx-background-color: #3f5fb8;" alignment="CENTER_LEFT">
          <padding>
diff --git a/src/main/resources/fxml/MyProfile.fxml b/src/main/resources/view/MyProfile.fxml
similarity index 100%
rename from src/main/resources/fxml/MyProfile.fxml
rename to src/main/resources/view/MyProfile.fxml
diff --git a/src/main/resources/fxml/OrganizationsView.fxml b/src/main/resources/view/OrganizationsView.fxml
similarity index 80%
rename from src/main/resources/fxml/OrganizationsView.fxml
rename to src/main/resources/view/OrganizationsView.fxml
index abd9ee8..c755d78 100644
--- a/src/main/resources/fxml/OrganizationsView.fxml
+++ b/src/main/resources/view/OrganizationsView.fxml
@@ -19,14 +19,6 @@
          <content>
             <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="30.0">
                <children>
-                  <HBox alignment="CENTER" prefHeight="51.0" prefWidth="900.0" spacing="15.0">
-                     <children>
-                        <Label styleClass="logo-label" text="GIVE HOPE" />
-                        <Region prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
-                        <Button mnemonicParsing="false" onAction="#goHome" styleClass="nav-button" text="Home" />
-                        <Button fx:id="signInAndMyProfileBtn" alignment="CENTER_RIGHT" contentDisplay="CENTER" mnemonicParsing="false" onAction="#goToSignIn" styleClass="nav-button" text="SIGN IN" textAlignment="CENTER" />
-                     </children>
-                  </HBox>
                   <VBox prefHeight="19.0" prefWidth="900.0">
                      <children>
                         <Label styleClass="page-title" text="EXPLORE ORGANIZATIONS" />
diff --git a/src/main/resources/fxml/Register.fxml b/src/main/resources/view/Register.fxml
similarity index 92%
rename from src/main/resources/fxml/Register.fxml
rename to src/main/resources/view/Register.fxml
index d736dfb..4753596 100644
--- a/src/main/resources/fxml/Register.fxml
+++ b/src/main/resources/view/Register.fxml
@@ -13,7 +13,7 @@
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<BorderPane prefHeight="725.0" prefWidth="1275" style="-fx-background-color: #f4f4f4;" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/25">
+<BorderPane fx:controller="ui.controller.RegisterController" prefHeight="725.0" prefWidth="1275" style="-fx-background-color: #f4f4f4;" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/25">
 
     <!-- REGISTER AREA -->
     <center>
@@ -56,9 +56,6 @@
         </VBox>
 
     </center>
-   <top>
-       <fx:include source="/fxml/Navbar.fxml"/>
-   </top>
    <stylesheets>
       <URL value="@../css/Register.css" />
       <URL value="@../css/Global.css" />
diff --git a/src/main/resources/fxml/SignIn.fxml b/src/main/resources/view/SignIn.fxml
similarity index 90%
rename from src/main/resources/fxml/SignIn.fxml
rename to src/main/resources/view/SignIn.fxml
index b40cf7f..fda7a96 100644
--- a/src/main/resources/fxml/SignIn.fxml
+++ b/src/main/resources/view/SignIn.fxml
@@ -14,13 +14,7 @@
 <?import javafx.scene.text.Font?>
 
 
-<BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" style="-fx-background-color: #f4f4f4;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1">
-
-          <!-- TOP BAR -->
-    <top>
-        <fx:include source="/fxml/Navbar.fxml"/>
-    </top>
-
+<BorderPane fx:controller="ui.controller.SignInController" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" style="-fx-background-color: #f4f4f4;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1">
           <!-- LOGIN AREA -->
     <center>
 

From b7ba8bf59dbce9fa499a4d9dfc726c08f02368ac Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 09:19:07 +0200
Subject: [PATCH 050/101] moved

---
 src/main/resources/fxml/Navbar.fxml | 19 -------------------
 1 file changed, 19 deletions(-)
 delete mode 100644 src/main/resources/fxml/Navbar.fxml

diff --git a/src/main/resources/fxml/Navbar.fxml b/src/main/resources/fxml/Navbar.fxml
deleted file mode 100644
index af9d6cd..0000000
--- a/src/main/resources/fxml/Navbar.fxml
+++ /dev/null
@@ -1,19 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
-
-
-
- <HBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="15.0" stylesheets="@../css/Global.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.NavbarController">
-     <Label styleClass="logo-label" text="Give Hope" />
-     <Region maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS" />
-
-        <Button onAction="#handleGoHome" styleClass="nav-button" text="Home" />
-     <padding>
-         <Insets bottom="20.0" left="20.0" right="20.0" top="20.0" />
-     </padding>
- </HBox>

From 56d7d5efe32d03351619dbc8761b24cf269d770f Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 11:07:21 +0200
Subject: [PATCH 051/101]  feat: redesign Home view with hero section, stats
 stripe, and feature cards

---
 src/main/resources/css/Global.css |   5 +-
 src/main/resources/css/Home.css   |  98 +++++++++++++++++++++++++
 src/main/resources/view/Home.fxml | 118 +++++++++++++++++++++---------
 3 files changed, 184 insertions(+), 37 deletions(-)
 create mode 100644 src/main/resources/css/Home.css

diff --git a/src/main/resources/css/Global.css b/src/main/resources/css/Global.css
index c39569e..5de6600 100644
--- a/src/main/resources/css/Global.css
+++ b/src/main/resources/css/Global.css
@@ -57,6 +57,8 @@
 .scroll-pane {
     -fx-background-color: transparent;
     -fx-border-color: transparent;
+    -fx-border-width: 0;
+    -fx-padding: 0;
 }
 
 .scroll-pane > .viewport {
@@ -123,4 +125,5 @@
     -fx-font-family: "Times New Roman";
     -fx-text-fill: white;
     -fx-font-weight: bold;
-}
\ No newline at end of file
+}
+
diff --git a/src/main/resources/css/Home.css b/src/main/resources/css/Home.css
new file mode 100644
index 0000000..d1a1b64
--- /dev/null
+++ b/src/main/resources/css/Home.css
@@ -0,0 +1,98 @@
+.hero-section {
+    -fx-background-color: #1e3a8a;
+    -fx-padding: 56 48 48 48;
+}
+
+.hero-tag {
+    -fx-background-color: rgba(255,255,255,0.15);
+    -fx-text-fill: white;
+    -fx-font-size: 12px;
+    -fx-background-radius: 20;
+    -fx-padding: 4 12 4 12;
+}
+
+.hero-title {
+    -fx-font-size: 28px;
+    -fx-text-fill: white;
+    -fx-font-weight: bold;
+}
+
+.hero-subtitle {
+    -fx-font-size: 16px;
+    -fx-text-fill: white;
+    -fx-wrap-text: true;
+    -fx-max-width: 440;
+}
+
+.hero-button-primary {
+    -fx-background-color: white;
+    -fx-text-fill: #1e3a8a;
+    -fx-font-weight: bold;
+    -fx-background-radius: 6;
+    -fx-padding: 10 22 10 22;
+    -fx-cursor: hand;
+}
+
+.hero-button-secondary {
+    -fx-background-color: transparent;
+    -fx-text-fill: white;
+    -fx-border-color: rgba(255,255,255,0.6);
+    -fx-border-radius: 6;
+    -fx-background-radius: 6;
+    -fx-padding: 10 22 10 22;
+    -fx-cursor: hand;
+}
+
+.stats-stripe {
+    -fx-background-color: #162d6e;
+    -fx-padding: 20 48 20 48;
+}
+
+.stats-number {
+    -fx-font-size: 24px;
+    -fx-font-weight: bold;
+    -fx-text-fill: white;
+}
+
+.stats-label {
+    -fx-font-size: 14px;
+    -fx-text-fill: rgba(255,255,255,0.7);
+}
+
+.features-section {
+    -fx-background-color: #f8faff;
+    -fx-padding: 32 48 48 48;
+}
+
+.features-title {
+    -fx-font-size: 18px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #1a1a2e;
+}
+
+.features-grid {
+    -fx-spacing: 16;
+}
+
+.feature-card {
+    -fx-background-color: white;
+    -fx-border-color: #dde3f0;
+    -fx-border-width: 1;
+    -fx-border-radius: 10;
+    -fx-background-radius: 10;
+    -fx-min-height: 120;
+    -fx-padding: 20;
+    -fx-spacing: 8;
+}
+
+.feature-card-title {
+    -fx-font-size: 14px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #1a1a2e;
+}
+
+.feature-card-desc {
+    -fx-font-size: 13px;
+    -fx-text-fill: #666666;
+    -fx-wrap-text: true;
+}
\ No newline at end of file
diff --git a/src/main/resources/view/Home.fxml b/src/main/resources/view/Home.fxml
index 7eb6293..65a5f49 100644
--- a/src/main/resources/view/Home.fxml
+++ b/src/main/resources/view/Home.fxml
@@ -1,48 +1,94 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import javafx.geometry.Insets?>
+<?import java.net.URL?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 
-
-<BorderPane xmlns:fx="http://javafx.com/fxml"
-            fx:controller="ui.controller.HomeController"
-            stylesheets="@/css/Global.css"
-            prefWidth="1275" prefHeight="725.0">
+<BorderPane prefHeight="725.0" prefWidth="1275" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/25" fx:controller="ui.controller.HomeController">
    <center>
-      <StackPane style="-fx-background-color: #3f5fb8;" alignment="CENTER_LEFT">
-         <padding>
-            <Insets top="40" right="50" bottom="40" left="50"/>
-         </padding>
-
-         <VBox alignment="CENTER_LEFT" spacing="35" maxWidth="900">
-            <Label text="MAKE A DIFFERENCE TODAY"
-                   wrapText="true"
-                   style="-fx-font-size: 42px; -fx-text-fill: white; -fx-font-weight: bold;" />
-
-            <Label text="Support trusted charitable organizations and create a lasting impact on communities around the world"
-                   wrapText="true"
-                   style="-fx-font-size: 20px; -fx-text-fill: white;" />
-
-            <HBox spacing="25">
-               <Button text="LEARN MORE"
-                       prefWidth="260"
-                       prefHeight="105"
-                       style="-fx-background-color: #a9cce3; -fx-background-radius: 24; -fx-font-size: 24px;" />
-
-               <Button text="EXPLORE ORGANIZATIONS"
-                       prefWidth="310"
-                       prefHeight="105"
-                       style="-fx-background-color: #a9cce3; -fx-background-radius: 24; -fx-font-size: 24px;"
-                       onAction="#handleBrowseOrganizations"/>
-            </HBox>
-         </VBox>
-      </StackPane>
+      <ScrollPane fitToWidth="true" BorderPane.alignment="CENTER">
+         <content>
+            <VBox>
+               <children>
+                  <StackPane alignment="CENTER_LEFT" prefWidth="1273.0" styleClass="hero-section" VBox.vgrow="ALWAYS">
+                     <children>
+                        <VBox alignment="CENTER_LEFT" spacing="20.0">
+                           <children>
+                              <Label styleClass="hero-tag" text="Verified by Innsamlingskontrollen" />
+                              <Label styleClass="hero-title" text="Make a difference today" />
+                              <Label styleClass="hero-subtitle" text="Support trusted charitable organizations and create a lasting impact on communities around the world." />
+                              <HBox spacing="12.0">
+                                 <children>
+                                    <Button mnemonicParsing="false" styleClass="hero-button-primary" text="Explore Organizations" />
+                                    <Button mnemonicParsing="false" styleClass="hero-button-secondary" text="Learn More" />
+                                 </children>
+                              </HBox>
+                           </children>
+                        </VBox>
+                     </children>
+                  </StackPane>
+                  <HBox alignment="CENTER" styleClass="stats-stripe">
+                     <children>
+                        <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
+                           <children>
+                              <Label styleClass="stats-number" text="150+ " />
+                              <Label styleClass="stats-label" text="Verified organizations" />
+                           </children>
+                        </VBox>
+                        <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
+                           <children>
+                              <Label styleClass="stats-number" text="Free " />
+                              <Label styleClass="stats-label" text="No hidden fees" />
+                           </children>
+                        </VBox>
+                        <VBox alignment="CENTER" HBox.hgrow="ALWAYS">
+                           <children>
+                              <Label styleClass="stats-number" text="Simple" />
+                              <Label styleClass="stats-label" text="Donate in seconds" />
+                           </children>
+                        </VBox>
+                     </children>
+                  </HBox>
+                  <VBox prefWidth="1273.0" spacing="20.0" styleClass="features-section">
+                     <children>
+                        <Label styleClass="features-title" text="Why GiveHope?" />
+                        <HBox alignment="CENTER" styleClass="features-grid">
+                           <children>
+                              <VBox alignment="CENTER" styleClass="feature-card" HBox.hgrow="ALWAYS">
+                                 <children>
+                                    <Label styleClass="feature-card-title" text="Verified organizations" />
+                                    <Label styleClass="feature-card-desc" text="All organizations are verified by Innsamlingskontrollen" />
+                                 </children>
+                              </VBox>
+                              <VBox alignment="CENTER" styleClass="feature-card" HBox.hgrow="ALWAYS">
+                                 <children>
+                                    <Label styleClass="feature-card-title" text="Track your donations" />
+                                    <Label styleClass="feature-card-desc" text="Keep a full history of every donation you have made" />
+                                 </children>
+                              </VBox>
+                              <VBox alignment="CENTER" styleClass="feature-card" HBox.hgrow="ALWAYS">
+                                 <children>
+                                    <Label styleClass="feature-card-title" text="Your profile" />
+                                    <Label styleClass="feature-card-desc" text="Create a personal profile to manage your giving preferences" />
+                                 </children>
+                              </VBox>
+                           </children>
+                        </HBox>
+                     </children>
+                  </VBox>
+               </children>
+            </VBox>
+         </content>
+      </ScrollPane>
    </center>
+   <stylesheets>
+      <URL value="@../css/Home.css" />
+      <URL value="@../css/Global.css" />
+   </stylesheets>
 
-</BorderPane>
\ No newline at end of file
+</BorderPane>

From e739553949d14773a04bfd773281ac410163f12f Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 11:07:46 +0200
Subject: [PATCH 052/101] fix: remove test code from Main, restore setId on
 User, and fix DonationDao mapping

---
 src/main/java/app/Main.java                | 56 +---------------------
 src/main/java/domain/user/User.java        |  5 +-
 src/main/java/persistence/DonationDao.java |  1 -
 3 files changed, 3 insertions(+), 59 deletions(-)

diff --git a/src/main/java/app/Main.java b/src/main/java/app/Main.java
index aed51cc..c30aa59 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/app/Main.java
@@ -5,9 +5,7 @@
 import application.security.PasswordHasher;
 import application.user.UserRegister;
 import domain.donation.Donation;
-import domain.organization.Organization;
 import domain.user.User;
-import integration.InnsamlingskontrollenClient;
 import integration.security.Sha256PasswordHasher;
 import java.math.BigDecimal;
 import java.util.List;
@@ -21,59 +19,11 @@
 import javafx.scene.Parent;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
-import persistence.OrganizationDao;
-import persistence.db.Database;
-
-public class Main extends Application {
-
-import javax.xml.crypto.Data;
-import java.io.IOException;
-import java.util.List;
 
 public class Main extends Application{
   public static void main(String[] args) {
-    try {
-      Database.getConnection();
-      System.out.println("Database connected");
-
-      UserDao userDao = new UserDao();
-      OrganizationDao orgDao = new OrganizationDao();
-      DonationDao donationDao = new DonationDao();
-
-      PasswordHasher hasher = new Sha256PasswordHasher();
-      UserRepository userRepo = new UserDao();
-      UserRegister userReg = new UserRegister(hasher, userRepo);
-
-      // Test brukerregistrering
-      userReg.execute("testuser", "12345678", "passord123", "test@example.com");
-      System.out.println("Inserted user!");
-
-      User user = userDao.findByEmail("test@example.com").orElseThrow();
-      System.out.println("Hentet bruker: " + user.getUsername() + ", id=" + user.getID());
-
-      // Hent og lagre organisasjoner fra Innsamlingskontrollen
-      System.out.println("Henter organisasjoner fra Innsamlingskontrollen...");
-      Organization[] fetchedOrgs = InnsamlingskontrollenClient.fetchOrganizations();
-      for (Organization org : fetchedOrgs) {
-        orgDao.insert(org);
-      }
-      System.out.println("Lastet inn " + fetchedOrgs.length + " organisasjoner");
-
-      List<Organization> orgs = orgDao.getAll();
-      System.out.println("Organisasjoner i DB: " + orgs.size());
-      System.out.println("Første org: " + orgs.get(0).getName() + ", org_number=" + orgs.get(0).getOrgNumber());
-
-      // Test donasjon med første org fra DB
-      Donation donation = new Donation(new BigDecimal("100.00"), user, orgs.get(0));
-      donationDao.insert(donation);
-      System.out.println("Inserted donation, id=" + donation.getId());
-
-      List<Donation> donations = donationDao.findByUser(user.getID());
-      System.out.println("Antall donasjoner for bruker: " + donations.size());
-
-    } catch (Exception e) {
-      e.printStackTrace();
-    }
+    launch(args);
+  }
 
   @Override
   public void start(Stage stage) throws Exception {
@@ -85,8 +35,6 @@ public void start(Stage stage) throws Exception {
       orgDao.insert(org);
       }
 
-    SceneManager.setStage(stage);
-
     Parent root = FXMLLoader.load(getClass().getResource("/view/MainView.fxml"));
     Scene scene = new Scene(root, 1275, 725);
 
diff --git a/src/main/java/domain/user/User.java b/src/main/java/domain/user/User.java
index 7386967..69a51b8 100644
--- a/src/main/java/domain/user/User.java
+++ b/src/main/java/domain/user/User.java
@@ -29,7 +29,6 @@ public User(String userName, String phoneNumber, String password, String eMail)
     this.phoneNumber = phoneNumber;
     this.eMail = eMail.trim();
     this.password = password;
-    this.id = id;
   }
 
   public String getUsername() {
@@ -62,14 +61,12 @@ public void setPhonenumber (String phoneNumber) {
     this.phoneNumber = phoneNumber;
   }
 
-
   public void setId(Long id) {
-    if (this.id != null) throw new IllegalStateException("ID already set");
     this.id = id;
+  }
 
   private static boolean isValidEmail(String email) {
     if (email == null || email.isBlank()) return false;
     return email.matches("^[a-zA-Z0-9._%+\\-]+@[a-zA-Z0-9.\\-]+\\.[a-zA-Z]{2,}$");
-
   }
 }
\ No newline at end of file
diff --git a/src/main/java/persistence/DonationDao.java b/src/main/java/persistence/DonationDao.java
index 70ddba6..646dba5 100644
--- a/src/main/java/persistence/DonationDao.java
+++ b/src/main/java/persistence/DonationDao.java
@@ -45,7 +45,6 @@ private Donation mapRow(ResultSet rs) throws SQLException {
         rs.getString("password_hash"),
         rs.getString("e_mail")
     );
-    user.setId(rs.getLong("user_id"));
 
     Organization org = new Organization();
     org.setOrgNumber(rs.getString("org_number"));

From 3a2a168d183f8768f2146fb5c3a6e18e7c73aeff Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 11:08:06 +0200
Subject: [PATCH 053/101] chore: remove unused SceneManager imports from
 controllers

---
 src/main/java/ui/controller/HomeController.java         | 1 -
 src/main/java/ui/controller/OrganizationController.java | 1 -
 src/main/java/ui/controller/RegisterController.java     | 1 -
 src/main/java/ui/controller/SignInController.java       | 1 -
 4 files changed, 4 deletions(-)

diff --git a/src/main/java/ui/controller/HomeController.java b/src/main/java/ui/controller/HomeController.java
index c65c6a4..8aafbd2 100644
--- a/src/main/java/ui/controller/HomeController.java
+++ b/src/main/java/ui/controller/HomeController.java
@@ -1,6 +1,5 @@
 package ui.controller;
 
-import app.SceneManager;
 import application.security.PasswordHasher;
 import application.user.UserSignIn;
 import integration.security.Sha256PasswordHasher;
diff --git a/src/main/java/ui/controller/OrganizationController.java b/src/main/java/ui/controller/OrganizationController.java
index a0b85d9..547c746 100644
--- a/src/main/java/ui/controller/OrganizationController.java
+++ b/src/main/java/ui/controller/OrganizationController.java
@@ -1,6 +1,5 @@
 package ui.controller;
 
-import app.SceneManager;
 import application.security.PasswordHasher;
 import application.user.UserSignIn;
 import domain.organization.Organization;
diff --git a/src/main/java/ui/controller/RegisterController.java b/src/main/java/ui/controller/RegisterController.java
index 681b353..9db9bb4 100644
--- a/src/main/java/ui/controller/RegisterController.java
+++ b/src/main/java/ui/controller/RegisterController.java
@@ -1,6 +1,5 @@
 package ui.controller;
 
-import app.SceneManager;
 import application.security.PasswordHasher;
 import application.user.UserRegister;
 import application.user.UserSignIn;
diff --git a/src/main/java/ui/controller/SignInController.java b/src/main/java/ui/controller/SignInController.java
index f8ebe4c..6541460 100644
--- a/src/main/java/ui/controller/SignInController.java
+++ b/src/main/java/ui/controller/SignInController.java
@@ -1,6 +1,5 @@
 package ui.controller;
 
-import app.SceneManager;
 import application.security.PasswordHasher;
 import application.user.UserRegister;
 import application.user.UserSignIn;

From 430cfb0d8a28106dde42da1ad96d7b53801795b8 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 11:16:10 +0200
Subject: [PATCH 054/101] feature: connect explore organizations button

---
 src/main/resources/css/Home.css   | 23 +++++++++++++++++++++++
 src/main/resources/view/Home.fxml |  2 +-
 2 files changed, 24 insertions(+), 1 deletion(-)

diff --git a/src/main/resources/css/Home.css b/src/main/resources/css/Home.css
index d1a1b64..616c23c 100644
--- a/src/main/resources/css/Home.css
+++ b/src/main/resources/css/Home.css
@@ -43,6 +43,29 @@
     -fx-cursor: hand;
 }
 
+.hero-button-primary:hover {
+    -fx-background-color: #f0f0f0;
+    -fx-scale-x: 1.03;
+    -fx-scale-y: 1.03;
+}
+
+.hero-button-primary:pressed {
+    -fx-background-color: #e0e0e0;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
+}
+
+.hero-button-secondary:hover {
+    -fx-background-color: rgba(255,255,255,0.15);
+    -fx-scale-x: 1.03;
+    -fx-scale-y: 1.03;
+}
+
+.hero-button-secondary:pressed {
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
+}
+
 .stats-stripe {
     -fx-background-color: #162d6e;
     -fx-padding: 20 48 20 48;
diff --git a/src/main/resources/view/Home.fxml b/src/main/resources/view/Home.fxml
index 65a5f49..92941f1 100644
--- a/src/main/resources/view/Home.fxml
+++ b/src/main/resources/view/Home.fxml
@@ -24,7 +24,7 @@
                               <Label styleClass="hero-subtitle" text="Support trusted charitable organizations and create a lasting impact on communities around the world." />
                               <HBox spacing="12.0">
                                  <children>
-                                    <Button mnemonicParsing="false" styleClass="hero-button-primary" text="Explore Organizations" />
+                                    <Button mnemonicParsing="false" onAction="#handleBrowseOrganizations" styleClass="hero-button-primary" text="Explore Organizations" />
                                     <Button mnemonicParsing="false" styleClass="hero-button-secondary" text="Learn More" />
                                  </children>
                               </HBox>

From c46854f80dab38cc497831cbfec295233ee96972 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 12:20:10 +0200
Subject: [PATCH 055/101] bug: fixed sizing and scrolling on my profile page

---
 src/main/resources/view/MyProfile.fxml | 13 +++++--------
 1 file changed, 5 insertions(+), 8 deletions(-)

diff --git a/src/main/resources/view/MyProfile.fxml b/src/main/resources/view/MyProfile.fxml
index 7e2aaaa..2d28b05 100644
--- a/src/main/resources/view/MyProfile.fxml
+++ b/src/main/resources/view/MyProfile.fxml
@@ -12,14 +12,11 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.VBox?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="692.0" prefWidth="620.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.MyProfileController">
-   <top>
-       <fx:include source="Navbar.fxml" />
-   </top>
+<BorderPane xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.MyProfileController">
    <center>
-      <ScrollPane fitToWidth="true" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" BorderPane.alignment="CENTER">
+      <ScrollPane fitToWidth="true" hbarPolicy="NEVER" BorderPane.alignment="CENTER">
          <content>
-            <VBox maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" spacing="25.0">
+            <VBox prefHeight="800.0" spacing="25.0">
                <children>
                   <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
                      <children>
@@ -85,14 +82,14 @@
                         <FlowPane fx:id="savedOrgsPane" prefHeight="200.0" prefWidth="200.0" />
                      </children>
                   </VBox>
-                  <Button mnemonicParsing="false" styleClass="page-button" text="Log out">
+                  <Button mnemonicParsing="false" onAction="#handleSignOut" styleClass="page-button" text="Log out">
                      <VBox.margin>
                         <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
                      </VBox.margin>
                   </Button>
                </children>
                <padding>
-                  <Insets bottom="15.0" left="15.0" right="15.0" />
+                  <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
                </padding>
             </VBox>
          </content>

From b07619bb6795d5f2e733d1c62e017b9dd75192be Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 12:21:41 +0200
Subject: [PATCH 056/101] feature: sign-in button changes to my-profile button
 when logged in

---
 src/main/java/ui/controller/MainController.java |  1 +
 .../java/ui/controller/NavbarController.java    | 17 +++++++++++++++--
 2 files changed, 16 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ui/controller/MainController.java b/src/main/java/ui/controller/MainController.java
index 2bcc6cc..1586f28 100644
--- a/src/main/java/ui/controller/MainController.java
+++ b/src/main/java/ui/controller/MainController.java
@@ -58,5 +58,6 @@ public void loadPage(Page page) throws IOException {
 
         mainPane.setCenter(root);
         navbarController.setActivePage(page);
+        navbarController.updateAuthButton();
     }
 }
diff --git a/src/main/java/ui/controller/NavbarController.java b/src/main/java/ui/controller/NavbarController.java
index 7523c33..24e7aac 100644
--- a/src/main/java/ui/controller/NavbarController.java
+++ b/src/main/java/ui/controller/NavbarController.java
@@ -5,6 +5,7 @@
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import ui.Page;
+import util.SessionManager;
 
 public class NavbarController {
 
@@ -28,7 +29,7 @@ public void setActivePage(Page page) {
         Button buttonForPage = switch (page) {
             case HOME -> homeBtn;
             case ORGANIZATIONS -> orgBtn;
-            case SIGNIN -> signInBtn;
+            case SIGNIN, PROFILE -> signInBtn;
             default -> null;
         };
 
@@ -42,7 +43,11 @@ public void goHome() {
     }
 
     public void goToSignIn() {
-        onNavigate.accept(Page.SIGNIN);
+        if (SessionManager.isSignedIn()) {
+            onNavigate.accept(Page.PROFILE);
+        } else {
+            onNavigate.accept(Page.SIGNIN);
+        }
     }
 
     public void goToOrganizations() {
@@ -52,4 +57,12 @@ public void goToOrganizations() {
     public void goToMyProfile() {
         onNavigate.accept(Page.PROFILE);
     }
+
+    public void updateAuthButton() {
+        if (SessionManager.isSignedIn()) {
+            signInBtn.setText("My Profile");
+        } else {
+            signInBtn.setText("Sign In");
+        }
+    }
 }

From 8d097eca4deee43da5c3c0e7696826992683d8b4 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 9 Apr 2026 12:21:58 +0200
Subject: [PATCH 057/101] feature: Added logout feature

---
 .../ui/controller/MyProfileController.java    | 21 ++++++++++++++++++-
 src/main/java/util/SessionManager.java        |  2 +-
 2 files changed, 21 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ui/controller/MyProfileController.java b/src/main/java/ui/controller/MyProfileController.java
index 133f5eb..b2a9d0c 100644
--- a/src/main/java/ui/controller/MyProfileController.java
+++ b/src/main/java/ui/controller/MyProfileController.java
@@ -1,4 +1,23 @@
 package ui.controller;
 
-public class MyProfileController {
+import javafx.fxml.FXML;
+import ui.Page;
+import util.SessionManager;
+
+import java.util.function.Consumer;
+
+public class MyProfileController implements NavigationAware {
+
+    private Consumer<Page> onNavigate;
+
+    public void setOnNavigate(Consumer<Page> onNavigate) {
+        this.onNavigate = onNavigate;
+    }
+
+
+    @FXML
+    private void handleSignOut() {
+        SessionManager.signOut();
+        onNavigate.accept(Page.HOME);
+    }
 }
diff --git a/src/main/java/util/SessionManager.java b/src/main/java/util/SessionManager.java
index 0a2f9b5..9d020c3 100644
--- a/src/main/java/util/SessionManager.java
+++ b/src/main/java/util/SessionManager.java
@@ -11,7 +11,7 @@ public static void signIn(User user) {
         currentUser = user;
     }
 
-    public static void logout() {
+    public static void signOut() {
         SignedIn = false;
         currentUser = null;
     }

From 7de73d0cde145775307930483b8279d1c5dd6835 Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Tue, 7 Apr 2026 15:11:07 +0200
Subject: [PATCH 058/101] Added javadoc to DonationDao and UserStatistics

---
 .../java/application/user/UserStatistics.java | 35 ++++++++
 src/main/java/persistence/DonationDao.java    | 87 ++++++++++++++++++-
 2 files changed, 121 insertions(+), 1 deletion(-)

diff --git a/src/main/java/application/user/UserStatistics.java b/src/main/java/application/user/UserStatistics.java
index 64333f1..5fe67d4 100644
--- a/src/main/java/application/user/UserStatistics.java
+++ b/src/main/java/application/user/UserStatistics.java
@@ -5,28 +5,63 @@
 import java.util.List;
 import persistence.DonationDao;
 
+/**
+ * Provides statistical information about a user's donation activity.
+ * Acts as a service layer between the application and {@link DonationDao},
+ * exposing user-friendly methods for retrieving donation history,
+ * total amounts, and favorite organizations.
+ */
 public class UserStatistics {
   private DonationDao donationDao;
 
+  /**
+   * Constructs a new {@code UserStatistics} instance with a default {@link DonationDao}.
+   */
   public UserStatistics() {
     this.donationDao = new DonationDao();
   }
 
+  /**
+   * Returns the top three organizations that the user has donated to most frequently.
+   *
+   * @param user the user whose favorite organizations are to be retrieved; must not be null
+   * @return a list of up to three formatted strings, each representing an organization
+   *         and its donation count; empty list if the user has no donations
+   */
   public List<String> userFavoriteOrganizations(User user) {
     List<String> favoriteOrganizations = donationDao.getFavoriteOrganizations(user.getID());
     return favoriteOrganizations;
   }
 
+  /**
+   * Returns a formatted list of all donations made by the user.
+   * Each entry contains the donation amount, date, and organization.
+   *
+   * @param user the user whose donation history is to be retrieved; must not be null
+   * @return a list of formatted donation strings; empty list if the user has no donations
+   */
   public List<String> userDonations(User user) {
     List<String> userDonationList = donationDao.getUserDonations(user.getID());
     return userDonationList;
   }
 
+  /**
+   * Returns the total amount donated by the user across all donations.
+   *
+   * @param user the user whose total donation amount is to be calculated; must not be null
+   * @return a string representation of the total donated amount; {@code "0"} if no donations exist
+   */
   public String userTotalDonationAmount(User user) {
     String totalDonations = donationDao.getTotalDonationAmount(user.getID());
     return totalDonations;
   }
 
+  /**
+   * Returns the total number of donations made by the user.
+   *
+   * @param user the user whose donation count is to be retrieved; must not be null
+   * @return a string representation of the total number of donations; {@code "0"} if none exist
+   */
   public String getTotalDonationsMade(User user) {
     String totalDonationsMade = donationDao.getTotalDonationsMade(user.getID());
     return totalDonationsMade;
diff --git a/src/main/java/persistence/DonationDao.java b/src/main/java/persistence/DonationDao.java
index 646dba5..d7737b1 100644
--- a/src/main/java/persistence/DonationDao.java
+++ b/src/main/java/persistence/DonationDao.java
@@ -13,8 +13,20 @@
 import java.util.List;
 import persistence.db.Database;
 
+/**
+ * Data Access Object for donation-related database operations.
+ * Provides methods for inserting donations and retrieving donation statistics
+ * such as history, total amounts, and favorite organizations for a given user.
+ */
 public class DonationDao {
-
+  /**
+   * Inserts a new donation record into the database.
+   * Upon successful insertion, the generated database ID is set on the donation object.
+   *
+   * @param donation the {@link Donation} to insert; must not be null and must have
+   *                 a valid amount, user, and organization
+   * @throws RuntimeException if a database error occurs during the insert
+   */
   public void insert(Donation donation) {
     String sql = "INSERT INTO donation(amount, donation_date" +
         ", user_id, organization_id) VALUES(?, ?, ?, ?)";
@@ -38,6 +50,15 @@ public void insert(Donation donation) {
     }
   }
 
+  /**
+   * Maps a single row from the provided {@code ResultSet} into a {@link Donation} object.
+   * The method extracts information about the donation, user, and organization
+   * from the {@code ResultSet} and constructs corresponding objects.
+   *
+   * @param rs the {@code ResultSet} containing the data for a single row; must not be null
+   * @return a {@code Donation} object populated with data from the row in the {@code ResultSet}
+   * @throws SQLException if a database access error occurs or if the column labels cannot be found
+   */
   private Donation mapRow(ResultSet rs) throws SQLException {
     User user = new User(
         rs.getString("user_name"),
@@ -63,6 +84,15 @@ private Donation mapRow(ResultSet rs) throws SQLException {
     return donation;
   }
 
+  /**
+   * Retrieves a list of donations made by a specific user, based on the user ID.
+   * The donations include details such as the donation amount, date, associated user,
+   * and organization.
+   *
+   * @param userId the unique identifier of the user whose donations are to be retrieved
+   * @return a list of {@code Donation} objects representing donations made by the user
+   * @throws RuntimeException if an error occurs during the database operation
+   */
   public List<Donation> findByUser(long userId) {
     String sql = """
         SELECT d.id, d.amount, d.donation_date,
@@ -87,6 +117,14 @@ public List<Donation> findByUser(long userId) {
     }
   }
 
+  /**
+   * Retrieves a formatted list of donations made by a specific user.
+   * Each entry is a string on the form {@code "Amount: X, Date: Y, Organization: Z"}.
+   *
+   * @param userId the unique identifier of the user whose donations are to be retrieved
+   * @return a list of formatted strings, one per donation; empty list if none found
+   * @throws RuntimeException if a database error occurs during the query
+   */
   public List<String> getUserDonations(long userId) {
     String sql = """
         SELECT amount, donation_date, organization_id
@@ -107,6 +145,16 @@ public List<String> getUserDonations(long userId) {
     }
   }
 
+  /**
+   * Retrieves a list of the user's favorite organizations based on donation history.
+   * The method queries the database to find the organizations the user has donated to most frequently
+   * and limits the result to the top three organizations.
+   *
+   * @param userId the unique identifier of the user whose favorite organizations are to be retrieved
+   * @return a list of strings representing the top three organizations donated to by the user,
+   *         ordered by the number of donations in descending order
+   * @throws RuntimeException if an error occurs while querying the database
+   */
   public List<String> getFavoriteOrganizations(long userId) {
     String sql = """
         SELECT organization_id, COUNT(*) AS donation_count
@@ -130,6 +178,15 @@ SELECT organization_id, COUNT(*) AS donation_count
     }
   }
 
+  /**
+   * Retrieves the total donation amount made by a specific user.
+   * The method calculates the sum of all donations associated with the given user ID.
+   *
+   * @param userId the unique identifier of the user whose total donation amount is to be retrieved
+   * @return a string representing the total donation amount made by the user; if no donations exist,
+   *         the method returns "0"
+   * @throws RuntimeException if an error occurs during database access
+   */
   public String getTotalDonationAmount(long userId) {
     String sql = """
         SELECT SUM(CAST(amount as REAL)) 
@@ -152,6 +209,17 @@ SELECT SUM(CAST(amount as REAL))
     }
   }
 
+  /**
+   * Retrieves the total number of donations made by a specific user.
+   * The method counts the number of donation records associated with the provided user ID
+   * in the database and returns the total count as a string.
+   *
+   * @param userId the unique identifier of the user whose total number of donations
+   *               is to be retrieved
+   * @return a string representing the total count of donations made by the user;
+   *         returns "0" if no donations exist
+   * @throws RuntimeException if a database access error occurs
+   */
   public String getTotalDonationsMade(long userId) {
     String sql = """
   SELECT COUNT(*)
@@ -176,12 +244,29 @@ SELECT COUNT(*)
 
   }
 
+  /**
+   * Maps a single row from the provided {@code ResultSet} into a string representation
+   * consisting of the donation amount, date, and organization ID.
+   *
+   * @param rs the {@code ResultSet} containing the data for a single row; must not be null
+   * @return a string representing the donation with details such as amount, date,
+   *         and organization ID
+   * @throws SQLException if a database access error occurs or if the column labels cannot be found
+   */
   private String mapRowSimple(ResultSet rs) throws SQLException {
     return "Amount: " + rs.getString("amount") +
         ", Date: " + rs.getString("donation_date") +
         ", Organization: " + rs.getString("organization_id");
   }
 
+  /**
+   * Maps a single row from the provided {@code ResultSet} into a formatted string
+   * combining the organization ID and its donation count.
+   *
+   * @param rs the {@code ResultSet} containing the data for a single row; must not be null
+   * @return a string on the form {@code "organization_id (N donations)"}
+   * @throws SQLException if a database access error occurs or a column label cannot be found
+   */
   private String mapRowFavorite(ResultSet rs) throws SQLException {
     return rs.getString("organization_id")
         + " (" + rs.getInt("donation_count") + " donasjoner)";

From 7ae6ae58e8ea5753f83a74ea2c0cbaa31be699da Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Fri, 10 Apr 2026 10:51:52 +0200
Subject: [PATCH 059/101] Mde changes to FavoriteOrganization, so that the
 statistcs page shows organization name instead of org ID.

---
 src/main/java/persistence/DonationDao.java | 15 ++++++++-------
 1 file changed, 8 insertions(+), 7 deletions(-)

diff --git a/src/main/java/persistence/DonationDao.java b/src/main/java/persistence/DonationDao.java
index d7737b1..d467e99 100644
--- a/src/main/java/persistence/DonationDao.java
+++ b/src/main/java/persistence/DonationDao.java
@@ -155,14 +155,15 @@ public List<String> getUserDonations(long userId) {
    *         ordered by the number of donations in descending order
    * @throws RuntimeException if an error occurs while querying the database
    */
-  public List<String> getFavoriteOrganizations(long userId) {
+  public List<String> getFavoriteOrganization(long userId) {
     String sql = """
-        SELECT organization_id, COUNT(*) AS donation_count
-        FROM donation
-        WHERE user_Id = ?
-        GROUP BY organization_id
+        SELECT o.name, COUNT(*) AS donation_count
+        FROM donation d
+        JOIN organization o ON d.organization_id = o.org_number
+        WHERE d.user_id = ?
+        GROUP BY d.organization_id
         ORDER BY donation_count DESC
-        LIMIT 3
+        LIMIT 1
         """;
 
     try (Connection conn = Database.getConnection()) {
@@ -268,7 +269,7 @@ private String mapRowSimple(ResultSet rs) throws SQLException {
    * @throws SQLException if a database access error occurs or a column label cannot be found
    */
   private String mapRowFavorite(ResultSet rs) throws SQLException {
-    return rs.getString("organization_id")
+    return rs.getString("name")
         + " (" + rs.getInt("donation_count") + " donasjoner)";
   }
 

From 3a6839ba5ad4504fb3524c6304e36789750c1a9c Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Fri, 10 Apr 2026 10:52:22 +0200
Subject: [PATCH 060/101] Added addTestData function to add test date for
 testing implemented features

---
 src/main/java/app/Main.java | 38 +++++++++++++++++++++++++++++++++++++
 1 file changed, 38 insertions(+)

diff --git a/src/main/java/app/Main.java b/src/main/java/app/Main.java
index c30aa59..a1c0d3e 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/app/Main.java
@@ -8,6 +8,7 @@
 import domain.user.User;
 import integration.security.Sha256PasswordHasher;
 import java.math.BigDecimal;
+import java.sql.SQLException;
 import java.util.List;
 import persistence.DonationDao;
 import persistence.OrganizationDao;
@@ -35,6 +36,8 @@ public void start(Stage stage) throws Exception {
       orgDao.insert(org);
       }
 
+    addTestdata();
+
     Parent root = FXMLLoader.load(getClass().getResource("/view/MainView.fxml"));
     Scene scene = new Scene(root, 1275, 725);
 
@@ -42,4 +45,39 @@ public void start(Stage stage) throws Exception {
     stage.setScene(scene);
     stage.show();
   }
+
+  private void addTestdata() throws SQLException {
+    UserDao userDao = new UserDao();
+    DonationDao donationDao = new DonationDao();
+    OrganizationDao orgDao = new OrganizationDao();
+
+    if (userDao.existsByEmail("test@test.no")) return;
+
+    PasswordHasher hasher = new Sha256PasswordHasher();
+    String hashedPassword = hasher.hash("test");
+    User user = new User("test", "12345678", hashedPassword, "test@test.no");
+    userDao.insert(user);
+
+    Organization org = orgDao.getAll().get(0);
+
+    donationDao.insert(new Donation(new BigDecimal(100), user, org));
+    donationDao.insert(new Donation(new BigDecimal(250), user, org));
+    donationDao.insert(new Donation(new BigDecimal(500), user, org));
+    donationDao.insert(new Donation(new BigDecimal(300), user, org));
+    donationDao.insert(new Donation(new BigDecimal(1000), user, org));
+    donationDao.insert(new Donation(new BigDecimal(700), user, org));
+    donationDao.insert(new Donation(new BigDecimal(250), user, org));
+
+    if (!userDao.existsByEmail("test2@test.no")) {
+      String hashedPassword2 = hasher.hash("test2");
+      User user2 = new User("test2", "87654321", hashedPassword2, "test2@test.no");
+      userDao.insert(user2);
+
+      Organization org2 = orgDao.getAll().get(1);
+
+      donationDao.insert(new Donation(new BigDecimal(150), user2, org2));
+      donationDao.insert(new Donation(new BigDecimal(400), user2, org2));
+      donationDao.insert(new Donation(new BigDecimal(600), user2, org2));
+    }
+    }
 }

From 8d6adb9fa2a2d792eb855cc6a2283a0bb51fc38a Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Fri, 10 Apr 2026 10:53:44 +0200
Subject: [PATCH 061/101] Made changes to labeling, design and size of parts of
 MyProfile page

---
 src/main/resources/view/MyProfile.fxml | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

diff --git a/src/main/resources/view/MyProfile.fxml b/src/main/resources/view/MyProfile.fxml
index 2d28b05..40ec2de 100644
--- a/src/main/resources/view/MyProfile.fxml
+++ b/src/main/resources/view/MyProfile.fxml
@@ -39,22 +39,22 @@
                         <Label styleClass="section-title" text="Statistics" />
                         <HBox prefHeight="100.0" prefWidth="200.0" spacing="15.0">
                            <children>
-                              <VBox prefHeight="200.0" prefWidth="100.0" styleClass="org-card">
+                              <VBox prefHeight="200.0" styleClass="org-card" HBox.hgrow="ALWAYS">
                                  <children>
                                     <Label text="Total donation amount" />
-                                    <Label fx:id="totalDonatedLabel" styleClass="org-name" text="500 kr" />
+                                    <Label fx:id="totalDonatedLabel" styleClass="org-name" text="" />
                                  </children>
                               </VBox>
-                              <VBox prefHeight="200.0" prefWidth="100.0" styleClass="org-card">
+                              <VBox prefHeight="200.0" styleClass="org-card" HBox.hgrow="ALWAYS">
                                  <children>
                                     <Label text="Number of donations" />
-                                    <Label fx:id="numberOfDonationsLabel" styleClass="org-name" text="&quot;7&quot;" />
+                                    <Label fx:id="numberOfDonationsLabel" styleClass="org-name" text="" />
                                  </children>
                               </VBox>
-                              <VBox prefHeight="200.0" prefWidth="100.0" styleClass="org-card">
+                              <VBox prefHeight="200.0" styleClass="org-card" HBox.hgrow="ALWAYS">
                                  <children>
-                                    <Label text="Label" />
-                                    <Label styleClass="org-name" text="Label" />
+                                     <Label text="Favorite organization" />
+                                     <Label fx:id="favoriteOrgLabel" styleClass="org-name" text="" />
                                  </children>
                               </VBox>
                            </children>
@@ -69,9 +69,9 @@
                         <Label styleClass="section-title" text="Donation history" />
                         <TableView fx:id="donationTable" prefHeight="200.0" prefWidth="200.0">
                           <columns>
-                            <TableColumn prefWidth="250.00003564357758" text="Organizations" />
-                            <TableColumn minWidth="0.0" prefWidth="131.99998474121094" text="Amount" />
-                              <TableColumn prefWidth="116.0" text="Date" />
+                              <TableColumn fx:id="orgColumn"    prefWidth="250.00003564357758" text="Organizations" />
+                              <TableColumn fx:id="amountColumn" minWidth="0.0" prefWidth="131.99998474121094" text="Amount" />
+                              <TableColumn fx:id="dateColumn"   prefWidth="116.0" text="Date" />
                           </columns>
                         </TableView>
                      </children>

From 371ff8999568ffaf306beff1d14a4a47a66d189c Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Fri, 10 Apr 2026 10:54:45 +0200
Subject: [PATCH 062/101] Added functions and methodsm that connects Backend
 methods for user statistics, to front end page.

---
 .../ui/controller/MyProfileController.java    | 50 +++++++++++++++++++
 1 file changed, 50 insertions(+)

diff --git a/src/main/java/ui/controller/MyProfileController.java b/src/main/java/ui/controller/MyProfileController.java
index b2a9d0c..f6b82ff 100644
--- a/src/main/java/ui/controller/MyProfileController.java
+++ b/src/main/java/ui/controller/MyProfileController.java
@@ -1,6 +1,17 @@
 package ui.controller;
 
+import application.user.UserStatistics;
+import domain.donation.Donation;
+import domain.user.User;
+import java.util.List;
+import javafx.beans.property.SimpleStringProperty;
+import javafx.collections.FXCollections;
+import javafx.collections.ObservableList;
 import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.TableColumn;
+import javafx.scene.control.TableView;
+import persistence.DonationDao;
 import ui.Page;
 import util.SessionManager;
 
@@ -9,11 +20,50 @@
 public class MyProfileController implements NavigationAware {
 
     private Consumer<Page> onNavigate;
+    @FXML private Label totalDonatedLabel;
+    @FXML private Label numberOfDonationsLabel;
+    @FXML private Label favoriteOrgLabel;
+    @FXML private Label nameLabel;
+    @FXML private Label emailLabel;
+    @FXML private Label phoneLabel;
+    @FXML private TableView<Donation> donationTable;
+    @FXML private TableColumn<Donation, String> orgColumn;
+    @FXML private TableColumn<Donation, String> amountColumn;
+    @FXML private TableColumn<Donation, String> dateColumn;
 
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
 
+    @FXML
+    public void initialize() {
+        User user = SessionManager.getCurrentUser();
+        if (user == null) return;
+
+        nameLabel.setText("Name: " + user.getUsername());
+        emailLabel.setText("E-mail: " + user.getEMail());
+        phoneLabel.setText("Phonenumber: " + user.getPhoneNumber());
+
+        UserStatistics stats = new UserStatistics();
+        totalDonatedLabel.setText(stats.userTotalDonationAmount(user) + " kr");
+        numberOfDonationsLabel.setText(stats.getTotalDonationsMade(user));
+
+        List<String> favOrg = stats.userFavoriteOrganization(user);
+        favoriteOrgLabel.setText(favOrg.isEmpty() ? "None" : favOrg.get(0));
+
+        orgColumn.setCellValueFactory(cell ->
+            new SimpleStringProperty(cell.getValue().getOrganization().getName()));
+        amountColumn.setCellValueFactory(cell ->
+            new SimpleStringProperty(cell.getValue().getAmount().toString() + " kr"));
+        dateColumn.setCellValueFactory(cell ->
+            new SimpleStringProperty(cell.getValue().getDateTime().toLocalDate().toString()));
+
+        DonationDao donationDao = new DonationDao();
+        ObservableList<Donation> data = FXCollections.observableArrayList(
+            donationDao.findByUser(user.getID())
+        );
+        donationTable.setItems(data);
+    }
 
     @FXML
     private void handleSignOut() {

From 0c88339d56e1988efd22fad185cd2ef9d1d9b3af Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Fri, 10 Apr 2026 10:55:41 +0200
Subject: [PATCH 063/101] changed name of method, to match what methods
 actually returns (one organization).

---
 src/main/java/application/user/UserStatistics.java | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/java/application/user/UserStatistics.java b/src/main/java/application/user/UserStatistics.java
index 5fe67d4..b78f18f 100644
--- a/src/main/java/application/user/UserStatistics.java
+++ b/src/main/java/application/user/UserStatistics.java
@@ -28,9 +28,9 @@ public UserStatistics() {
    * @return a list of up to three formatted strings, each representing an organization
    *         and its donation count; empty list if the user has no donations
    */
-  public List<String> userFavoriteOrganizations(User user) {
-    List<String> favoriteOrganizations = donationDao.getFavoriteOrganizations(user.getID());
-    return favoriteOrganizations;
+  public List<String> userFavoriteOrganization(User user) {
+    List<String> favoriteOrganization = donationDao.getFavoriteOrganization(user.getID());
+    return favoriteOrganization;
   }
 
   /**

From 69dc43b2f836450a1d41a3f54aea3738d6b26168 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 10 Apr 2026 18:36:35 +0200
Subject: [PATCH 064/101] feat: add multi-step donation flow with session state

---
 .../java/application/user/UserDonate.java     |  21 +++
 src/main/java/persistence/DonationDao.java    |  11 +-
 src/main/java/ui/DonationSession.java         |  52 ++++++++
 src/main/java/ui/DonationSessionAware.java    |   5 +
 src/main/java/ui/Page.java                    |   9 +-
 .../donation/DonationAmountController.java    |  76 +++++++++++
 .../DonationConfirmationController.java       |  36 ++++++
 .../donation/DonationFlowController.java      | 120 ++++++++++++++++++
 .../donation/DonationPaymentController.java   |  65 ++++++++++
 .../donation/DonationUserInfoController.java  | 109 ++++++++++++++++
 src/main/resources/css/Donation.css           | 114 +++++++++++++++++
 src/main/resources/view/DonationAmount.fxml   |  46 +++++++
 .../resources/view/DonationConfirmation.fxml  |  21 +++
 src/main/resources/view/DonationPayment.fxml  |  58 +++++++++
 src/main/resources/view/DonationUserInfo.fxml |  75 +++++++++++
 15 files changed, 807 insertions(+), 11 deletions(-)
 create mode 100644 src/main/java/application/user/UserDonate.java
 create mode 100644 src/main/java/ui/DonationSession.java
 create mode 100644 src/main/java/ui/DonationSessionAware.java
 create mode 100644 src/main/java/ui/controller/donation/DonationAmountController.java
 create mode 100644 src/main/java/ui/controller/donation/DonationConfirmationController.java
 create mode 100644 src/main/java/ui/controller/donation/DonationFlowController.java
 create mode 100644 src/main/java/ui/controller/donation/DonationPaymentController.java
 create mode 100644 src/main/java/ui/controller/donation/DonationUserInfoController.java
 create mode 100644 src/main/resources/css/Donation.css
 create mode 100644 src/main/resources/view/DonationAmount.fxml
 create mode 100644 src/main/resources/view/DonationConfirmation.fxml
 create mode 100644 src/main/resources/view/DonationPayment.fxml
 create mode 100644 src/main/resources/view/DonationUserInfo.fxml

diff --git a/src/main/java/application/user/UserDonate.java b/src/main/java/application/user/UserDonate.java
new file mode 100644
index 0000000..bf8f187
--- /dev/null
+++ b/src/main/java/application/user/UserDonate.java
@@ -0,0 +1,21 @@
+package application.user;
+
+import domain.donation.Donation;
+import domain.organization.Organization;
+import domain.user.User;
+import persistence.DonationDao;
+
+import java.math.BigDecimal;
+
+public class UserDonate {
+    private final DonationDao donationDao;
+
+    public UserDonate() {
+        this.donationDao = new DonationDao();
+    }
+
+    public void execute(User user, Organization org, BigDecimal amount) {
+        Donation donation = new Donation(amount, user, org);
+        donationDao.insert(donation);
+    }
+}
diff --git a/src/main/java/persistence/DonationDao.java b/src/main/java/persistence/DonationDao.java
index d467e99..2d8c0e3 100644
--- a/src/main/java/persistence/DonationDao.java
+++ b/src/main/java/persistence/DonationDao.java
@@ -29,7 +29,7 @@ public class DonationDao {
    */
   public void insert(Donation donation) {
     String sql = "INSERT INTO donation(amount, donation_date" +
-        ", user_id, organization_id) VALUES(?, ?, ?, ?)";
+        ", user_id, cause_id) VALUES(?, ?, ?, ?)";
 
     try (Connection conn = Database.getConnection()) {
       PreparedStatement stmt = conn.prepareStatement(sql,
@@ -272,11 +272,4 @@ private String mapRowFavorite(ResultSet rs) throws SQLException {
     return rs.getString("name")
         + " (" + rs.getInt("donation_count") + " donasjoner)";
   }
-
-
-
-
-
-
-
-}
\ No newline at end of file
+}
diff --git a/src/main/java/ui/DonationSession.java b/src/main/java/ui/DonationSession.java
new file mode 100644
index 0000000..991f91a
--- /dev/null
+++ b/src/main/java/ui/DonationSession.java
@@ -0,0 +1,52 @@
+package ui;
+
+import domain.organization.Organization;
+
+public class DonationSession {
+    private Organization organization;
+    private int amount;
+    private String name;
+    private String email;
+    private String phone;
+
+    public Organization getOrganization() {
+        return organization;
+    }
+
+    public int getAmount() {
+        return amount;
+    }
+
+    public String getName() {
+        return name;
+    }
+
+    public String getEmail() {
+        return email;
+    }
+
+    public String getPhone() {
+        return phone;
+    }
+
+    public void setOrganization(Organization organization) {
+        this.organization = organization;
+    }
+
+    public void setAmount(int amount) {
+        this.amount = amount;
+    }
+
+    public void setName(String name) {
+        this.name = name;
+    }
+
+    public void setEmail(String email) {
+        this.email = email;
+    }
+
+    public void setPhone(String phone) {
+        this.phone = phone;
+    }
+}
+
diff --git a/src/main/java/ui/DonationSessionAware.java b/src/main/java/ui/DonationSessionAware.java
new file mode 100644
index 0000000..8ceab22
--- /dev/null
+++ b/src/main/java/ui/DonationSessionAware.java
@@ -0,0 +1,5 @@
+package ui;
+
+public interface DonationSessionAware {
+    void setDonationSession(DonationSession session);
+}
diff --git a/src/main/java/ui/Page.java b/src/main/java/ui/Page.java
index e2066c8..a7878b9 100644
--- a/src/main/java/ui/Page.java
+++ b/src/main/java/ui/Page.java
@@ -3,10 +3,15 @@
 public enum Page {
     HOME("Home.fxml"),
     PROFILE("MyProfile.fxml"),
-    SIGNIN("SignIn.fxml"),
+    SIGN_IN("SignIn.fxml"),
     REGISTER("Register.fxml"),
     ORGANIZATIONS("OrganizationsView.fxml"),
-    MYPROFILE("MyProfile.fxml");
+    MY_PROFILE("MyProfile.fxml"),
+    DONATION_USER_INFO("DonationUserInfo.fxml"),
+    DONATION_AMOUNT("DonationAmount.fxml"),
+    DONATION_PAYMENT("DonationPayment.fxml"),
+    DONATION_CONFIRMATION("DonationConfirmation.fxml");
+
 
 
     private final String fileName;
diff --git a/src/main/java/ui/controller/donation/DonationAmountController.java b/src/main/java/ui/controller/donation/DonationAmountController.java
new file mode 100644
index 0000000..3a35fc2
--- /dev/null
+++ b/src/main/java/ui/controller/donation/DonationAmountController.java
@@ -0,0 +1,76 @@
+package ui.controller.donation;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import ui.DonationSession;
+import ui.DonationSessionAware;
+import ui.Page;
+import ui.controller.NavigationAware;
+
+import java.util.function.Consumer;
+
+public class DonationAmountController implements DonationSessionAware {
+
+   @FXML private Label orgLabel;
+   @FXML private TextField amountField;
+   @FXML private Label errorLabel;
+
+   private DonationSession donationSession;
+   private Consumer<DonationSession> onContinue;
+   private Runnable onBack;
+
+    @Override
+    public void setDonationSession(DonationSession donationSession) {
+        this.donationSession = donationSession;
+        orgLabel.setText("Donating to: " + donationSession.getOrganization().getName());
+    }
+
+    public void setOnContinue(Consumer<DonationSession> onContinue) {
+        this.onContinue = onContinue;
+    }
+
+    public void setOnBack(Runnable onBack) {
+        this.onBack = onBack;
+    }
+
+    @FXML
+    public void handleContinue() {
+        if (amountField.getText().isBlank()) {
+            errorLabel.setText("Please enter an amount.");
+            return;
+        }
+        try {
+            int amount = Integer.parseInt(amountField.getText().trim());
+            donationSession.setAmount(amount);
+            onContinue.accept(donationSession);
+        } catch (NumberFormatException e) {
+            errorLabel.setText("Please enter a valid number.");
+        }
+    }
+
+    @FXML
+    private void handleBack() {
+        onBack.run();
+    }
+
+    @FXML
+    private void handleSelect50() {
+        amountField.setText("50");
+    }
+
+    @FXML
+    private void handleSelect100() {
+        amountField.setText("100");
+    }
+
+    @FXML
+    private void handleSelect500() {
+        amountField.setText("500");
+    }
+
+    @FXML
+    private void handleSelect1000() {
+        amountField.setText("1000");
+    }
+}
diff --git a/src/main/java/ui/controller/donation/DonationConfirmationController.java b/src/main/java/ui/controller/donation/DonationConfirmationController.java
new file mode 100644
index 0000000..7fe397c
--- /dev/null
+++ b/src/main/java/ui/controller/donation/DonationConfirmationController.java
@@ -0,0 +1,36 @@
+package ui.controller.donation;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import ui.DonationSession;
+import ui.DonationSessionAware;
+import ui.Page;
+import ui.controller.NavigationAware;
+
+import java.util.function.Consumer;
+
+public class DonationConfirmationController implements NavigationAware, DonationSessionAware {
+
+    @FXML private Label orgLabel;
+    @FXML private Label amountLabel;
+
+    private Consumer<Page> onNavigate;
+    private DonationSession donationSession;
+
+    @Override
+    public void setOnNavigate(Consumer<Page> onNavigate) {
+        this.onNavigate = onNavigate;
+    }
+
+    @Override
+    public void setDonationSession(DonationSession session) {
+        this.donationSession = session;
+        orgLabel.setText(session.getOrganization().getName());
+        amountLabel.setText(session.getAmount() + " kr");
+    }
+
+    @FXML
+    private void handleBackToHome() {
+        onNavigate.accept(Page.HOME);
+    }
+}
diff --git a/src/main/java/ui/controller/donation/DonationFlowController.java b/src/main/java/ui/controller/donation/DonationFlowController.java
new file mode 100644
index 0000000..bb9545e
--- /dev/null
+++ b/src/main/java/ui/controller/donation/DonationFlowController.java
@@ -0,0 +1,120 @@
+package ui.controller.donation;
+
+import application.user.UserDonate;
+import domain.organization.Organization;
+import javafx.fxml.FXMLLoader;
+import javafx.scene.Parent;
+import javafx.scene.layout.BorderPane;
+import ui.DonationSession;
+import ui.Page;
+import ui.controller.NavbarController;
+import util.SessionManager;
+
+import java.io.IOException;
+import java.math.BigDecimal;
+import java.util.function.Consumer;
+
+public class DonationFlowController {
+    private final BorderPane mainPane;
+    private final NavbarController navbarController;
+    private DonationSession session;
+    private Consumer<Page> onNavigate;
+    private final UserDonate userDonate = new UserDonate();
+
+    public DonationFlowController(BorderPane mainPane, NavbarController navbarController) {
+        this.mainPane = mainPane;
+        this.navbarController = navbarController;
+    }
+
+    public void start(Organization org) throws IOException {
+        session = new DonationSession();
+        session.setOrganization(org);
+        navbarController.hideNavbar();
+        loadStep1();
+    }
+
+    private void loadStep1() throws IOException {
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationUserInfo.fxml"));
+        Parent root = loader.load();
+
+        DonationUserInfoController controller = loader.getController();
+        controller.setDonationSession(session);
+        controller.setOnContinue(updatedSession -> {
+            session = updatedSession;
+            try { loadStep2(); }
+            catch (IOException e) { throw new RuntimeException(e); }
+        });
+
+        controller.setOnNavigate(onNavigate);
+        mainPane.setCenter(root);
+    }
+    private void loadStep2() throws IOException {
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationAmount.fxml"));
+        Parent root = loader.load();
+
+        DonationAmountController controller = loader.getController();
+        controller.setDonationSession(session);
+
+
+        controller.setOnContinue(updatedSession -> {
+            session = updatedSession;
+            try {
+                loadStep3();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        controller.setOnBack(() ->  {
+            try { loadStep1(); }
+            catch (IOException e) { throw new RuntimeException(e); }
+        });
+
+        mainPane.setCenter(root);
+    }
+
+    private void loadStep3() throws IOException {
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationPayment.fxml"));
+        Parent root = loader.load();
+
+        DonationPaymentController controller = loader.getController();
+        controller.setDonationSession(session);
+
+
+        controller.setOnContinue(updatedSession -> {
+            session = updatedSession;
+            userDonate.execute(
+                    SessionManager.getSignedInUser(),
+                    session.getOrganization(),
+                    new BigDecimal(session.getAmount())
+            );
+            try {
+                loadStep4();
+            } catch (IOException e) {
+                throw new RuntimeException(e);
+            }
+        });
+
+        controller.setOnBack(() ->  {
+            try { loadStep2(); }
+            catch (IOException e) { throw new RuntimeException(e); }
+        });
+
+        mainPane.setCenter(root);
+    }
+    private void loadStep4() throws IOException {
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationConfirmation.fxml"));
+        Parent root = loader.load();
+
+        DonationConfirmationController controller = loader.getController();
+        controller.setDonationSession(session);
+
+        controller.setOnNavigate(onNavigate);
+
+        mainPane.setCenter(root);
+    }
+
+    public void setOnNavigate(Consumer<Page> onNavigate) {
+        this.onNavigate = onNavigate;
+    }
+}
\ No newline at end of file
diff --git a/src/main/java/ui/controller/donation/DonationPaymentController.java b/src/main/java/ui/controller/donation/DonationPaymentController.java
new file mode 100644
index 0000000..ece65d7
--- /dev/null
+++ b/src/main/java/ui/controller/donation/DonationPaymentController.java
@@ -0,0 +1,65 @@
+package ui.controller.donation;
+
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import ui.DonationSession;
+import ui.DonationSessionAware;
+
+import java.util.function.Consumer;
+
+public class DonationPaymentController implements DonationSessionAware {
+
+    @FXML private Label orgLabel;
+    @FXML private Label amountLabel;
+    @FXML private Label errorLabel;
+    @FXML private TextField cardNumberField;
+    @FXML private TextField expiryField;
+    @FXML private TextField cvcField;
+
+    private DonationSession donationSession;
+    private Consumer<DonationSession> onContinue;
+    private Runnable onBack;
+
+    @Override
+    public void setDonationSession(DonationSession donationSession) {
+        this.donationSession = donationSession;
+        orgLabel.setText("Donating to: " + donationSession.getOrganization().getName());
+        amountLabel.setText("Amount: " + donationSession.getAmount() + " kr");
+    }
+
+    public void setOnContinue(Consumer<DonationSession> onContinue) {
+        this.onContinue = onContinue;
+    }
+
+    @FXML
+    public void handleConfirmDonation() {
+        String cardNumber = cardNumberField.getText().trim().replace(" ", "");
+        if (!cardNumber.matches("\\d{16}")) {
+            errorLabel.setText("Please enter a valid 16-digit card number.");
+            return;
+        }
+        String expiry = expiryField.getText().trim();
+        if (!expiry.matches("\\d{2}/\\d{2}")) {
+            errorLabel.setText("Please enter expiry date in MM/YY format.");
+            return;
+        }
+        String cvc = cvcField.getText().trim();
+        if (!cvc.matches("\\d{3}")) {
+            errorLabel.setText("Please enter a valid 3-digit CVC.");
+            return;
+        }
+
+        onContinue.accept(donationSession);
+    }
+
+    public void setOnBack(Runnable onBack) {
+        this.onBack = onBack;
+    }
+
+    @FXML
+    private void handleBack() {
+        onBack.run();
+    }
+
+}
diff --git a/src/main/java/ui/controller/donation/DonationUserInfoController.java b/src/main/java/ui/controller/donation/DonationUserInfoController.java
new file mode 100644
index 0000000..52e1310
--- /dev/null
+++ b/src/main/java/ui/controller/donation/DonationUserInfoController.java
@@ -0,0 +1,109 @@
+package ui.controller.donation;
+
+import domain.organization.Organization;
+import domain.user.User;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import javafx.scene.control.TextField;
+import javafx.scene.layout.VBox;
+import ui.DonationSession;
+import ui.DonationSessionAware;
+import ui.Page;
+import ui.controller.NavbarController;
+import ui.controller.NavigationAware;
+import util.SessionManager;
+
+import java.util.function.Consumer;
+
+public class DonationUserInfoController implements NavigationAware, DonationSessionAware {
+
+    @FXML private Label loggedInLabel;
+    @FXML private VBox notLoggedInBox;
+    @FXML private Label orgLabel;
+    @FXML private TextField nameField;
+    @FXML private TextField emailField;
+    @FXML private TextField phoneField;
+    @FXML private Label errorLabel;
+
+    private Consumer<Page> onNavigate;
+    private Consumer<DonationSession> onContinue;
+    private DonationSession donationSession;
+    private Organization org;
+
+
+    public void setOrganization(Organization org) {
+        this.org = org;
+    }
+
+    @Override
+    public void setOnNavigate(Consumer<Page> onNavigate) {
+        this.onNavigate = onNavigate;
+    }
+
+    @Override
+    public void setDonationSession(DonationSession session) {
+        this.donationSession = session;
+        orgLabel.setText("Donating to: " + donationSession.getOrganization().getName());
+    }
+
+    public void setOnContinue(Consumer<DonationSession> onContinue) {
+        this.onContinue = onContinue;
+    }
+
+    @FXML
+    public void initialize() {
+        if (SessionManager.isSignedIn()) {
+            loggedInLabel.setVisible(true);
+            loggedInLabel.setManaged(true);
+            notLoggedInBox.setVisible(false);
+            notLoggedInBox.setManaged(false);
+
+            User user = SessionManager.getSignedInUser();
+            nameField.setText(user.getUsername());
+            emailField.setText(user.getEmail());
+            phoneField.setText(user.getPhoneNumber());
+
+        } else {
+            loggedInLabel.setVisible(false);
+            loggedInLabel.setManaged(false);
+            notLoggedInBox.setVisible(true);
+            notLoggedInBox.setManaged(true);
+        }
+    }
+
+
+
+    public void goToSignIn() {
+        onNavigate.accept(Page.SIGN_IN);
+    }
+
+    public void goToRegister() {
+        onNavigate.accept(Page.REGISTER);
+    }
+
+    public void handleBack() {
+        onNavigate.accept(Page.ORGANIZATIONS);
+    }
+
+    public void handleContinue() {
+        if (nameField.getText().isBlank()) {
+            errorLabel.setText("Please enter your full name");
+            return;
+        }
+        if (emailField.getText().isBlank()) {
+            errorLabel.setText("Please enter your email");
+            return;
+        }
+        if (phoneField.getText().isBlank()) {
+            errorLabel.setText("Please enter your phone number");
+            return;
+        }
+
+        donationSession.setName(nameField.getText());
+        donationSession.setEmail(emailField.getText());
+        donationSession.setPhone(phoneField.getText());
+        onContinue.accept(donationSession);
+    }
+
+}
+
diff --git a/src/main/resources/css/Donation.css b/src/main/resources/css/Donation.css
new file mode 100644
index 0000000..8aaf42c
--- /dev/null
+++ b/src/main/resources/css/Donation.css
@@ -0,0 +1,114 @@
+.info-box-success {
+    -fx-background-color: #f0f7ff;
+    -fx-border-color: #b8d4f5;
+    -fx-border-width: 1.5;
+    -fx-border-radius: 8;
+    -fx-background-radius: 8;
+    -fx-padding: 12 16 12 16;
+}
+
+.info-box-warning {
+    -fx-background-color: #fff8e1;
+    -fx-border-color: #ffe082;
+    -fx-border-width: 1.5;
+    -fx-border-radius: 8;
+    -fx-background-radius: 8;
+    -fx-padding: 12 16 12 16;
+}
+
+.donation-container {
+    -fx-alignment: center;
+    -fx-padding: 40 15% 40 15%;
+    -fx-spacing: 20;
+}
+
+.donation-title {
+    -fx-font-size: 22px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #1a1a2e;
+}
+
+.donation-subtitle {
+    -fx-font-size: 14px;
+    -fx-text-fill: #666666;
+}
+
+.donation-label {
+    -fx-font-size: 13px;
+    -fx-text-fill: #555555;
+    -fx-font-weight: bold;
+}
+
+.donation-field {
+    -fx-background-radius: 6;
+    -fx-border-radius: 6;
+    -fx-border-color: #c0c8dc;
+    -fx-border-width: 1.5;
+    -fx-padding: 8 12 8 12;
+    -fx-font-size: 13px;
+}
+
+.amount-button {
+    -fx-background-color: #f0f4ff;
+    -fx-border-color: #1e3a8a;
+    -fx-border-width: 1.5;
+    -fx-border-radius: 6;
+    -fx-background-radius: 6;
+    -fx-text-fill: #1e3a8a;
+    -fx-font-weight: bold;
+    -fx-cursor: hand;
+    -fx-padding: 8 16 8 16;
+}
+
+.amount-button:hover {
+    -fx-background-color: #dce6f7;
+    -fx-scale-x: 1.03;
+    -fx-scale-y: 1.03;
+}
+
+.confirm-button {
+    -fx-background-color: #1e3a8a;
+    -fx-text-fill: white;
+    -fx-font-weight: bold;
+    -fx-background-radius: 6;
+    -fx-padding: 10 24 10 24;
+    -fx-cursor: hand;
+    -fx-font-size: 14px;
+}
+
+.confirm-button:hover {
+    -fx-background-color: #2649a8;
+    -fx-scale-x: 1.03;
+    -fx-scale-y: 1.03;
+}
+
+.confirm-button:pressed {
+    -fx-background-color: #162d6e;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
+}
+
+.back-button {
+    -fx-background-color: transparent;
+    -fx-border-color: #c0c8dc;
+    -fx-border-width: 1.5;
+    -fx-border-radius: 6;
+    -fx-background-radius: 6;
+    -fx-text-fill: #555555;
+    -fx-cursor: hand;
+    -fx-padding: 6 14 6 14;
+}
+
+.back-button:hover {
+    -fx-background-color: #f0f0f0;
+}
+
+.error-label {
+    -fx-text-fill: #e63946;
+    -fx-font-size: 12px;
+}
+
+.success-icon {
+    -fx-font-size: 48px;
+    -fx-text-fill: #2d6a4f;
+}
\ No newline at end of file
diff --git a/src/main/resources/view/DonationAmount.fxml b/src/main/resources/view/DonationAmount.fxml
new file mode 100644
index 0000000..75459ae
--- /dev/null
+++ b/src/main/resources/view/DonationAmount.fxml
@@ -0,0 +1,46 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+
+
+<BorderPane minHeight="-Infinity" minWidth="-Infinity" stylesheets="@../css/Donation.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationAmountController">
+   <top>
+      <HBox spacing="5.0" BorderPane.alignment="CENTER">
+         <children>
+            <Button mnemonicParsing="false" onAction="#handleBack" styleClass="back-button" text="← Back" HBox.hgrow="ALWAYS" />
+            <Region HBox.hgrow="ALWAYS" />
+            <Label stylesheets="@../css/Donation.css" text="Step 2 of 4" HBox.hgrow="ALWAYS" />
+         </children>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </HBox>
+   </top>
+   <center>
+      <VBox alignment="CENTER" spacing="10.0" styleClass="donation-container" BorderPane.alignment="CENTER">
+         <children>
+            <Label styleClass="donation-title" text="Choose amount" />
+            <Label fx:id="orgLabel" styleClass="donation-subtitle" text="Donating to:" />
+            <HBox alignment="CENTER" spacing="20.0">
+               <children>
+                  <Button mnemonicParsing="false" onAction="#handleSelect50" styleClass="amount-button" text="50 kr" />
+                  <Button mnemonicParsing="false" onAction="#handleSelect100" styleClass="amount-button" text="100 kr" />
+                  <Button mnemonicParsing="false" onAction="#handleSelect500" styleClass="amount-button" text="500 kr" />
+                  <Button mnemonicParsing="false" onAction="#handleSelect1000" styleClass="amount-button" text="1000 kr" />
+               </children>
+            </HBox>
+            <Label styleClass="donation-label" text="Or enter amount (NOK)" />
+            <TextField fx:id="amountField" maxWidth="400.0" styleClass="donation-field" />
+            <Label fx:id="errorLabel" textFill="RED" />
+            <Button mnemonicParsing="false" onAction="#handleContinue" styleClass="confirm-button" text="Continue →" />
+         </children>
+      </VBox>
+   </center>
+</BorderPane>
diff --git a/src/main/resources/view/DonationConfirmation.fxml b/src/main/resources/view/DonationConfirmation.fxml
new file mode 100644
index 0000000..3b4a8a6
--- /dev/null
+++ b/src/main/resources/view/DonationConfirmation.fxml
@@ -0,0 +1,21 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.VBox?>
+
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationConfirmationController">
+   <center>
+      <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" stylesheets="@../css/Donation.css" BorderPane.alignment="CENTER">
+         <children>
+            <Label styleClass="success-icon" text="✓" />
+            <Label styleClass="donation-title" text="Thank you for your donation!" />
+            <Label fx:id="orgLabel" styleClass="donation-subtitle" />
+            <Label fx:id="amountLabel" styleClass="donation-subtitle" />
+            <Button mnemonicParsing="false" onAction="#handleBackToHome" styleClass="confirm-button" text="Back to home" />
+         </children>
+      </VBox>
+   </center>
+</BorderPane>
diff --git a/src/main/resources/view/DonationPayment.fxml b/src/main/resources/view/DonationPayment.fxml
new file mode 100644
index 0000000..de8fd98
--- /dev/null
+++ b/src/main/resources/view/DonationPayment.fxml
@@ -0,0 +1,58 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane minHeight="-Infinity" minWidth="-Infinity" stylesheets="@../css/Donation.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationPaymentController">
+   <top>
+      <HBox alignment="CENTER" spacing="5.0" BorderPane.alignment="CENTER">
+         <children>
+            <Button mnemonicParsing="false" onAction="#handleBack" styleClass="back-button" text="← Back" HBox.hgrow="ALWAYS" />
+            <Region HBox.hgrow="ALWAYS" />
+            <Label text="Step 3 of 4" HBox.hgrow="ALWAYS" />
+         </children>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </HBox>
+   </top>
+   <center>
+      <VBox styleClass="donation-container" BorderPane.alignment="CENTER">
+         <children>
+            <Label styleClass="donation-title" text="Payment information" />
+            <Label fx:id="orgLabel" styleClass="donation-subtitle" />
+            <Label fx:id="amountLabel" styleClass="donation-subtitle" />
+            <VBox maxWidth="500.0">
+               <children>
+                  <Label styleClass="donation-label" text="Card number" />
+                  <TextField fx:id="cardNumberField" styleClass="donation-field" />
+               </children>
+            </VBox>
+            <HBox maxWidth="500.0" spacing="10.0">
+               <children>
+                  <VBox>
+                     <children>
+                        <Label styleClass="donation-label" text="Expiry date" />
+                        <TextField fx:id="expiryField" styleClass="donation-field" />
+                     </children>
+                  </VBox>
+                  <VBox>
+                     <children>
+                        <Label styleClass="donation-label" text="CVC" />
+                        <TextField fx:id="cvcField" styleClass="donation-field" />
+                     </children>
+                  </VBox>
+               </children>
+            </HBox>
+            <Button mnemonicParsing="false" onAction="#handleConfirmDonation" styleClass="confirm-button" text="Confirm donation" />
+            <Label fx:id="errorLabel" textFill="RED" />
+         </children>
+      </VBox>
+   </center>
+</BorderPane>
diff --git a/src/main/resources/view/DonationUserInfo.fxml b/src/main/resources/view/DonationUserInfo.fxml
new file mode 100644
index 0000000..26e1a71
--- /dev/null
+++ b/src/main/resources/view/DonationUserInfo.fxml
@@ -0,0 +1,75 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.net.URL?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.TextField?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationUserInfoController">
+   <stylesheets>
+      <URL value="@../css/Global.css" />
+      <URL value="@../css/Donation.css" />
+   </stylesheets>
+   <center>
+      <VBox spacing="10.0" styleClass="donation-form" BorderPane.alignment="CENTER">
+         <children>
+            <Label text="Your information" />
+            <Label fx:id="orgLabel" text="Donating to:" />
+            <Label fx:id="loggedInLabel" styleClass="info-box-success" text="You are signed in – information is pre-filled" />
+            <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
+               <children>
+                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="5.0">
+                     <children>
+                        <Label styleClass="field-label" text="Full name" />
+                        <TextField fx:id="nameField" promptText="Enter your name" />
+                     </children>
+                  </VBox>
+                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="5.0">
+                     <children>
+                        <Label styleClass="field-label" text="Email" />
+                        <TextField fx:id="emailField" promptText="Enter your email" />
+                     </children>
+                  </VBox>
+                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="5.0">
+                     <children>
+                        <Label styleClass="field-label" text="Phone number" />
+                        <TextField fx:id="phoneField" promptText="Enter your phone number" />
+                     </children>
+                  </VBox>
+                  <Button mnemonicParsing="false" onAction="#handleContinue" text="Continue →" />
+                  <Label fx:id="errorLabel" textFill="RED" />
+               </children>
+            </VBox>
+            <VBox fx:id="notLoggedInBox" prefHeight="200.0" prefWidth="100.0" styleClass="info-box-warning">
+               <children>
+                  <Label text="You are not signed in" />
+                  <HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0">
+                     <children>
+                        <Hyperlink fx:id="goToSignIn" onAction="#goToSignIn" text="Sign in" />
+                        <Hyperlink fx:id="goToRegister" onAction="#goToRegister" text="Register" />
+                     </children>
+                  </HBox>
+               </children>
+            </VBox>
+         </children>
+      </VBox>
+   </center>
+   <top>
+      <HBox alignment="CENTER" spacing="5.0" BorderPane.alignment="CENTER">
+         <children>
+            <Button mnemonicParsing="false" onAction="#handleBack" text="← Back" HBox.hgrow="ALWAYS" />
+            <Region HBox.hgrow="ALWAYS" />
+            <Label text="Step 1 of 4" HBox.hgrow="ALWAYS" />
+         </children>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </HBox>
+   </top>
+</BorderPane>

From 5a184007d5b53e5b441dd8a49a1b46c6898ee8ed Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 10 Apr 2026 18:37:23 +0200
Subject: [PATCH 065/101] feat: wire donation flow into main navigation and
 organization view

---
 .../java/ui/controller/MainController.java    | 29 +++++++++++++++++++
 .../java/ui/controller/NavbarController.java  | 26 +++++++++++++----
 .../ui/controller/OrganizationController.java | 26 ++++++++---------
 src/main/resources/view/Home.fxml             |  2 +-
 src/main/resources/view/Navbar.fxml           |  2 +-
 5 files changed, 64 insertions(+), 21 deletions(-)

diff --git a/src/main/java/ui/controller/MainController.java b/src/main/java/ui/controller/MainController.java
index 1586f28..b7077fc 100644
--- a/src/main/java/ui/controller/MainController.java
+++ b/src/main/java/ui/controller/MainController.java
@@ -2,13 +2,17 @@
 
 import application.user.UserRegister;
 import application.user.UserSignIn;
+import domain.organization.Organization;
 import integration.security.Sha256PasswordHasher;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.layout.BorderPane;
 import persistence.UserDao;
+import ui.DonationSession;
 import ui.Page;
+import ui.DonationSessionAware;
+import ui.controller.donation.DonationFlowController;
 
 import java.io.IOException;
 
@@ -20,7 +24,17 @@ public class MainController {
     @FXML
     private NavbarController navbarController;
 
+    private DonationSession donationSession;
+    private DonationFlowController donationFlowController;
+
     public void initialize() {
+        donationFlowController = new DonationFlowController(mainPane, navbarController);
+        donationFlowController.setOnNavigate(page -> {
+            try { loadPage(page); }
+            catch (IOException e) { throw new RuntimeException(e); }
+        });
+
+
         try {
             navbarController.setOnNavigate(page -> {
                 try {
@@ -49,15 +63,30 @@ public void loadPage(Page page) throws IOException {
                 }
             });
         }
+        if (controller instanceof OrganizationController c) {
+            c.setOnDonate(org -> {
+                try { loadDonationPage(org); }
+                catch (IOException e) { throw new RuntimeException(e); }
+            });
+
+        }
         if (controller instanceof SignInController c) {
             c.setUserSignIn(new UserSignIn(new Sha256PasswordHasher(), new UserDao()));
         }
         if (controller instanceof RegisterController c) {
             c.setUserRegister(new UserRegister(new Sha256PasswordHasher(), new UserDao()));
         }
+        if (controller instanceof DonationSessionAware c) {
+            c.setDonationSession(donationSession);
+        }
 
         mainPane.setCenter(root);
         navbarController.setActivePage(page);
         navbarController.updateAuthButton();
+        navbarController.showNavbar();
+    }
+
+    public void loadDonationPage(Organization org) throws IOException {
+        donationFlowController.start(org);
     }
 }
diff --git a/src/main/java/ui/controller/NavbarController.java b/src/main/java/ui/controller/NavbarController.java
index 24e7aac..18a56ea 100644
--- a/src/main/java/ui/controller/NavbarController.java
+++ b/src/main/java/ui/controller/NavbarController.java
@@ -4,6 +4,7 @@
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.layout.HBox;
 import ui.Page;
 import util.SessionManager;
 
@@ -11,6 +12,8 @@ public class NavbarController {
 
     private Consumer<Page> onNavigate;
     @FXML
+    private HBox navBar;
+    @FXML
     private Button homeBtn;
     @FXML
     private Button orgBtn;
@@ -29,7 +32,7 @@ public void setActivePage(Page page) {
         Button buttonForPage = switch (page) {
             case HOME -> homeBtn;
             case ORGANIZATIONS -> orgBtn;
-            case SIGNIN, PROFILE -> signInBtn;
+            case SIGN_IN, PROFILE -> signInBtn;
             default -> null;
         };
 
@@ -46,7 +49,7 @@ public void goToSignIn() {
         if (SessionManager.isSignedIn()) {
             onNavigate.accept(Page.PROFILE);
         } else {
-            onNavigate.accept(Page.SIGNIN);
+            onNavigate.accept(Page.SIGN_IN);
         }
     }
 
@@ -54,9 +57,6 @@ public void goToOrganizations() {
         onNavigate.accept(Page.ORGANIZATIONS);
     }
 
-    public void goToMyProfile() {
-        onNavigate.accept(Page.PROFILE);
-    }
 
     public void updateAuthButton() {
         if (SessionManager.isSignedIn()) {
@@ -65,4 +65,20 @@ public void updateAuthButton() {
             signInBtn.setText("Sign In");
         }
     }
+
+    public void clearActivePage() {
+        homeBtn.getStyleClass().remove("nav-button-active");
+        orgBtn.getStyleClass().remove("nav-button-active");
+        signInBtn.getStyleClass().remove("nav-button-active");
+    }
+
+    public void hideNavbar() {
+        navBar.setVisible(false);
+        navBar.setManaged(false);
+    }
+
+    public void showNavbar() {
+        navBar.setVisible(true);
+        navBar.setManaged(true);
+    }
 }
diff --git a/src/main/java/ui/controller/OrganizationController.java b/src/main/java/ui/controller/OrganizationController.java
index 547c746..a166fdf 100644
--- a/src/main/java/ui/controller/OrganizationController.java
+++ b/src/main/java/ui/controller/OrganizationController.java
@@ -1,10 +1,7 @@
 package ui.controller;
 
-import application.security.PasswordHasher;
-import application.user.UserSignIn;
 import domain.organization.Organization;
 
-import integration.security.Sha256PasswordHasher;
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
@@ -12,18 +9,15 @@
 import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.VBox;
 import persistence.OrganizationDao;
-import persistence.UserDao;
 import ui.Page;
-import util.SessionManager;
 
-import java.io.IOException;
 import java.sql.SQLException;
 import java.util.ArrayList;
 import java.util.List;
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
-public class OrganizationController {
+public class OrganizationController implements NavigationAware{
 
     @FXML
     private TextField searchField;
@@ -35,8 +29,6 @@ public class OrganizationController {
     private Button nextPageBtn;
     @FXML
     private Label pageLabel;
-    @FXML
-    private Button signInAndMyProfileBtn;
 
     private List<Organization> allOrgs;
     private List<Organization> filtrertOrgs;
@@ -44,11 +36,16 @@ public class OrganizationController {
     private final int PER_PAGE = 15;
 
     private Consumer<Page> onNavigate;
+    private Consumer<Organization> onDonate;
 
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
 
+    public void setOnDonate(Consumer<Organization> onDonate) {
+        this.onDonate = onDonate;
+    }
+
     public void initialize() {
         try {
             OrganizationDao dao = new OrganizationDao();
@@ -117,11 +114,12 @@ private VBox createCard(Organization org) {
         Label status = new Label(org.isPreApproved() ? "✓ Forhåndsgodkjent" : "✓ Verified");
         status.getStyleClass().add("org-status");
 
-        Button donasjonBtn = new Button("Donate");
-        donasjonBtn.getStyleClass().add("donate-button");
-        donasjonBtn.setMaxWidth(Double.MAX_VALUE);
+        Button donateBtn = new Button("Donate");
+        donateBtn.getStyleClass().add("donate-button");
+        donateBtn.setMaxWidth(Double.MAX_VALUE);
+        donateBtn.setOnAction(e -> onDonate.accept(org));
 
-        card.getChildren().addAll(name, orgnr, status, donasjonBtn);
+        card.getChildren().addAll(name, orgnr, status, donateBtn);
         return card;
     }
 
@@ -144,7 +142,7 @@ private void handleGoHome() {
 
     @FXML
     private void handleSignIn() {
-        onNavigate.accept(Page.SIGNIN);
+        onNavigate.accept(Page.SIGN_IN);
     }
 
 }
diff --git a/src/main/resources/view/Home.fxml b/src/main/resources/view/Home.fxml
index 92941f1..342e975 100644
--- a/src/main/resources/view/Home.fxml
+++ b/src/main/resources/view/Home.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 
-<BorderPane prefHeight="725.0" prefWidth="1275" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/25" fx:controller="ui.controller.HomeController">
+<BorderPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/25" fx:controller="ui.controller.HomeController">
    <center>
       <ScrollPane fitToWidth="true" BorderPane.alignment="CENTER">
          <content>
diff --git a/src/main/resources/view/Navbar.fxml b/src/main/resources/view/Navbar.fxml
index 21a512e..1dd0fd7 100644
--- a/src/main/resources/view/Navbar.fxml
+++ b/src/main/resources/view/Navbar.fxml
@@ -6,7 +6,7 @@
 <?import javafx.scene.layout.HBox?>
 <?import javafx.scene.layout.Region?>
 
-<HBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="89.0" prefWidth="595.0" spacing="15.0" styleClass="navbar" stylesheets="@../css/Global.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.NavbarController">
+<HBox fx:id="navBar" alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="89.0" prefWidth="595.0" spacing="15.0" styleClass="navbar" stylesheets="@../css/Global.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.NavbarController">
      <Label styleClass="logo-label" text="Give Hope" />
      <Region maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS" />
 

From fef6b861ac35ccde84e9a706e9e27c35acfe270a Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Fri, 10 Apr 2026 18:38:23 +0200
Subject: [PATCH 066/101] refactor: rename and remove inconsistent method and
 enum names for clarity

---
 src/main/java/app/Main.java                         | 1 -
 src/main/java/domain/user/User.java                 | 2 +-
 src/main/java/persistence/UserDao.java              | 2 +-
 src/main/java/ui/controller/HomeController.java     | 7 -------
 src/main/java/ui/controller/RegisterController.java | 9 ++-------
 src/main/java/util/SessionManager.java              | 2 +-
 6 files changed, 5 insertions(+), 18 deletions(-)

diff --git a/src/main/java/app/Main.java b/src/main/java/app/Main.java
index a1c0d3e..fcfcd9c 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/app/Main.java
@@ -28,7 +28,6 @@ public static void main(String[] args) {
 
   @Override
   public void start(Stage stage) throws Exception {
-    Database.initializeDatabase();
 
     OrganizationDao orgDao = new OrganizationDao();
     Organization[] orgs = InnsamlingskontrollenClient.fetchOrganizations();
diff --git a/src/main/java/domain/user/User.java b/src/main/java/domain/user/User.java
index 69a51b8..10c5efb 100644
--- a/src/main/java/domain/user/User.java
+++ b/src/main/java/domain/user/User.java
@@ -39,7 +39,7 @@ public String getPhoneNumber() {
     return phoneNumber;
   }
 
-  public String getEMail() {
+  public String getEmail() {
     return eMail;
   }
 
diff --git a/src/main/java/persistence/UserDao.java b/src/main/java/persistence/UserDao.java
index 2fa7765..d343376 100644
--- a/src/main/java/persistence/UserDao.java
+++ b/src/main/java/persistence/UserDao.java
@@ -21,7 +21,7 @@ public void insert(User user) {
 
       stmt.setString(1, user.getUsername());
       stmt.setString(2, user.getPhoneNumber());
-      stmt.setString(3, user.getEMail());
+      stmt.setString(3, user.getEmail());
       //endre denne til passwordhash når det er fikset.
       stmt.setString(4, user.getPassword());
 
diff --git a/src/main/java/ui/controller/HomeController.java b/src/main/java/ui/controller/HomeController.java
index 8aafbd2..5d5a217 100644
--- a/src/main/java/ui/controller/HomeController.java
+++ b/src/main/java/ui/controller/HomeController.java
@@ -19,13 +19,6 @@ public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
 
-    public Button signInButton;
-
-    @FXML
-    private void handleSignIn() throws IOException {
-        onNavigate.accept(Page.SIGNIN);
-    }
-
     @FXML
     private void handleBrowseOrganizations() {
         onNavigate.accept(Page.ORGANIZATIONS);
diff --git a/src/main/java/ui/controller/RegisterController.java b/src/main/java/ui/controller/RegisterController.java
index 9db9bb4..a43a47d 100644
--- a/src/main/java/ui/controller/RegisterController.java
+++ b/src/main/java/ui/controller/RegisterController.java
@@ -1,17 +1,12 @@
 package ui.controller;
 
-import application.security.PasswordHasher;
 import application.user.UserRegister;
-import application.user.UserSignIn;
-import integration.security.Sha256PasswordHasher;
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
-import persistence.UserDao;
 import ui.Page;
 
-import java.io.IOException;
 import java.util.function.Consumer;
 
 public class RegisterController implements NavigationAware {
@@ -56,7 +51,7 @@ private void handleRegister() {
 
         try {
             userRegister.execute(username, phoneNr, password, email);
-            onNavigate.accept(Page.SIGNIN);
+            onNavigate.accept(Page.SIGN_IN);
         } catch (IllegalArgumentException e) {
             errorLabel.setText(e.getMessage());
         }
@@ -64,7 +59,7 @@ private void handleRegister() {
 
     @FXML
     private void handleSignIn() {
-        onNavigate.accept(Page.SIGNIN);
+        onNavigate.accept(Page.SIGN_IN);
     }
 
     @FXML
diff --git a/src/main/java/util/SessionManager.java b/src/main/java/util/SessionManager.java
index 9d020c3..b11cec9 100644
--- a/src/main/java/util/SessionManager.java
+++ b/src/main/java/util/SessionManager.java
@@ -20,7 +20,7 @@ public static boolean isSignedIn() {
         return SignedIn;
     }
 
-    public static User getCurrentUser() {
+    public static User getSignedInUser() {
         return currentUser;
     }
 }

From 60fd71faa5a12723d83c72140a3019cbb405274c Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Tue, 14 Apr 2026 13:19:17 +0200
Subject: [PATCH 067/101] Generated javadoc for Dao-classes

---
 .../java/persistence/OrganizationDao.java     | 19 +++++++-
 src/main/java/persistence/UserDao.java        | 48 ++++++++++++++++++-
 2 files changed, 65 insertions(+), 2 deletions(-)

diff --git a/src/main/java/persistence/OrganizationDao.java b/src/main/java/persistence/OrganizationDao.java
index 7757887..470d74a 100644
--- a/src/main/java/persistence/OrganizationDao.java
+++ b/src/main/java/persistence/OrganizationDao.java
@@ -6,11 +6,22 @@
 import java.util.ArrayList;
 import java.util.List;
 
+/**
+ * Data Access Object for organization-related database operations.
+ * Provides methods for inserting and retrieving {@link Organization} records
+ * from the SQLite database.
+ */
 public class OrganizationDao {
 
-
   private static final String URL = "jdbc:sqlite:givehope.db";
 
+  /**
+   * Inserts a new organization into the database.
+   * Uses {@code INSERT OR IGNORE} so duplicate org numbers are silently skipped.
+   *
+   * @param org the {@link Organization} to insert; must not be null and must have a valid org number
+   * @throws SQLException if a database error occurs during the insert
+   */
   public void insert(Organization org) throws SQLException {
     String sql = """
             INSERT OR IGNORE INTO organization
@@ -30,6 +41,12 @@ public void insert(Organization org) throws SQLException {
     }
   }
 
+  /**
+   * Retrieves all organizations stored in the database.
+   *
+   * @return a list of all {@link Organization} objects; empty list if none exist
+   * @throws SQLException if a database error occurs during the query
+   */
   public List<Organization> getAll() throws SQLException {
     String sql = "SELECT * FROM organization";
     List<Organization> list = new ArrayList<>();
diff --git a/src/main/java/persistence/UserDao.java b/src/main/java/persistence/UserDao.java
index 2fa7765..bdfc9f3 100644
--- a/src/main/java/persistence/UserDao.java
+++ b/src/main/java/persistence/UserDao.java
@@ -9,9 +9,20 @@
 import java.sql.SQLException;
 import domain.user.User;
 
+/**
+ * Data Access Object for user-related database operations.
+ * Implements {@link UserRepository} and provides methods for inserting users
+ * and looking them up by email, username, or either.
+ */
 public class UserDao implements UserRepository {
 
-
+  /**
+   * Inserts a new user into the database.
+   * Upon successful insertion, the generated database ID is set on the user object.
+   *
+   * @param user the {@link User} to insert; must not be null and must have a unique email and username
+   * @throws RuntimeException if a database error occurs, including unique constraint violations
+   */
   public void insert(User user) {
     String sql = "INSERT INTO user(user_name, phone_number, e_mail, password_hash) VALUES(?, ?, ?, ?)";
 
@@ -39,6 +50,13 @@ public void insert(User user) {
 
   //private User mapRow(ResultSet rs) throws SQLException {}
 
+  /**
+   * Finds a user by their email address.
+   *
+   * @param email the email address to search for; leading/trailing whitespace is trimmed
+   * @return an {@link Optional} containing the user if found, or empty if no match exists
+   * @throws RuntimeException if a database error occurs during the query
+   */
   @Override
   public Optional<User> findByEmail(String email) {
     String sql = """
@@ -67,6 +85,13 @@ public Optional<User> findByEmail(String email) {
     }
   }
 
+  /**
+   * Finds a user by their username.
+   *
+   * @param username the username to search for
+   * @return an {@link Optional} containing the user if found, or empty if no match exists
+   * @throws RuntimeException if a database error occurs during the query
+   */
   @Override
   public Optional<User> findByUsername(String username) {
     String sql = """
@@ -95,6 +120,13 @@ public Optional<User> findByUsername(String username) {
     }
   }
 
+  /**
+   * Finds a user by either email or username.
+   * First attempts to match by email, then falls back to username if no email match is found.
+   *
+   * @param login the email or username to search for; returns empty if null or blank
+   * @return an {@link Optional} containing the user if found, or empty if no match exists
+   */
   @Override
   public Optional<User> findByLogin(String login) {
     if (login == null || login.isBlank()) {
@@ -110,6 +142,13 @@ public Optional<User> findByLogin(String login) {
 
   }
 
+  /**
+   * Checks whether a user with the given email address already exists in the database.
+   *
+   * @param email the email address to check
+   * @return {@code true} if a user with the given email exists, {@code false} otherwise
+   * @throws RuntimeException if a database error occurs during the query
+   */
   @Override
   public boolean existsByEmail(String email) {
     String sql = "SELECT 1 FROM user WHERE e_mail = ?";
@@ -128,6 +167,13 @@ public boolean existsByEmail(String email) {
     }
   }
 
+  /**
+   * Checks whether a user with the given username already exists in the database.
+   *
+   * @param username the username to check
+   * @return {@code true} if a user with the given username exists, {@code false} otherwise
+   * @throws RuntimeException if a database error occurs during the query
+   */
   @Override
   public boolean existsByUsername(String username) {
     String sql = "SELECT 1 FROM user WHERE user_name = ?";

From 537b48da872bc60400c14d197a6d574d17d877a5 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 18:34:30 +0200
Subject: [PATCH 068/101] Remove unused handleGoHome() and handleSignIn()
 methods

---
 .../java/ui/controller/OrganizationController.java     | 10 ----------
 1 file changed, 10 deletions(-)

diff --git a/src/main/java/ui/controller/OrganizationController.java b/src/main/java/ui/controller/OrganizationController.java
index a166fdf..e5f4ac2 100644
--- a/src/main/java/ui/controller/OrganizationController.java
+++ b/src/main/java/ui/controller/OrganizationController.java
@@ -135,14 +135,4 @@ private void nextPage() {
         showPage();
     }
 
-    @FXML
-    private void handleGoHome() {
-        onNavigate.accept(Page.HOME);
-    }
-
-    @FXML
-    private void handleSignIn() {
-        onNavigate.accept(Page.SIGN_IN);
-    }
-
 }

From 572c111ec75db447ed69b7893b9296ffec2a89cb Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 18:35:24 +0200
Subject: [PATCH 069/101] Add press/scale animation to back button and remove
 stray blank lines in FXML files

---
 src/main/resources/css/Donation.css               | 8 ++++++++
 src/main/resources/view/DonationAmount.fxml       | 1 -
 src/main/resources/view/DonationConfirmation.fxml | 1 -
 3 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/resources/css/Donation.css b/src/main/resources/css/Donation.css
index 8aaf42c..7894fd7 100644
--- a/src/main/resources/css/Donation.css
+++ b/src/main/resources/css/Donation.css
@@ -101,6 +101,14 @@
 
 .back-button:hover {
     -fx-background-color: #f0f0f0;
+    -fx-scale-x: 1.03;
+    -fx-scale-y: 1.03;
+}
+
+.back-button:pressed {
+    -fx-background-color: #e0e0e0;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
 }
 
 .error-label {
diff --git a/src/main/resources/view/DonationAmount.fxml b/src/main/resources/view/DonationAmount.fxml
index 75459ae..8098a23 100644
--- a/src/main/resources/view/DonationAmount.fxml
+++ b/src/main/resources/view/DonationAmount.fxml
@@ -9,7 +9,6 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 
-
 <BorderPane minHeight="-Infinity" minWidth="-Infinity" stylesheets="@../css/Donation.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationAmountController">
    <top>
       <HBox spacing="5.0" BorderPane.alignment="CENTER">
diff --git a/src/main/resources/view/DonationConfirmation.fxml b/src/main/resources/view/DonationConfirmation.fxml
index 3b4a8a6..879fff0 100644
--- a/src/main/resources/view/DonationConfirmation.fxml
+++ b/src/main/resources/view/DonationConfirmation.fxml
@@ -5,7 +5,6 @@
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.VBox?>
 
-
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationConfirmationController">
    <center>
       <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" stylesheets="@../css/Donation.css" BorderPane.alignment="CENTER">

From a10b95657e418e6abc6090fbc44528ff758ce857 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 18:35:47 +0200
Subject: [PATCH 070/101] Update to renamed SessionManager.getSignedInUser()
 and user.getEmail()

---
 src/main/java/ui/controller/MyProfileController.java | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/main/java/ui/controller/MyProfileController.java b/src/main/java/ui/controller/MyProfileController.java
index f6b82ff..2af08f7 100644
--- a/src/main/java/ui/controller/MyProfileController.java
+++ b/src/main/java/ui/controller/MyProfileController.java
@@ -37,11 +37,11 @@ public void setOnNavigate(Consumer<Page> onNavigate) {
 
     @FXML
     public void initialize() {
-        User user = SessionManager.getCurrentUser();
+        User user = SessionManager.getSignedInUser();
         if (user == null) return;
 
         nameLabel.setText("Name: " + user.getUsername());
-        emailLabel.setText("E-mail: " + user.getEMail());
+        emailLabel.setText("E-mail: " + user.getEmail());
         phoneLabel.setText("Phonenumber: " + user.getPhoneNumber());
 
         UserStatistics stats = new UserStatistics();

From c266a514b98b72d72cc20b6af2ea5d89131e7017 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 18:36:45 +0200
Subject: [PATCH 071/101] =?UTF-8?q?=20-=20Initialize=20database=20on=20sta?=
 =?UTF-8?q?rtup=20in=20Main.start()=20=20-=20Fix=20INSERT=20column=20name:?=
 =?UTF-8?q?=20cause=5Fid=20=E2=86=92=20organization=5Fid=20=20-=20Guard=20?=
 =?UTF-8?q?against=20null=20result=20in=20getTotalDonatedAmount()?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 src/main/java/app/Main.java                | 3 ++-
 src/main/java/persistence/DonationDao.java | 7 ++++++-
 2 files changed, 8 insertions(+), 2 deletions(-)

diff --git a/src/main/java/app/Main.java b/src/main/java/app/Main.java
index fcfcd9c..e9947a6 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/app/Main.java
@@ -28,7 +28,8 @@ public static void main(String[] args) {
 
   @Override
   public void start(Stage stage) throws Exception {
-
+    Database.initializeDatabase();
+    System.out.println("DB path: " + new java.io.File("givehope.db").getAbsolutePath());
     OrganizationDao orgDao = new OrganizationDao();
     Organization[] orgs = InnsamlingskontrollenClient.fetchOrganizations();
     for (Organization org : orgs) {
diff --git a/src/main/java/persistence/DonationDao.java b/src/main/java/persistence/DonationDao.java
index 2d8c0e3..9e70812 100644
--- a/src/main/java/persistence/DonationDao.java
+++ b/src/main/java/persistence/DonationDao.java
@@ -28,8 +28,12 @@ public class DonationDao {
    * @throws RuntimeException if a database error occurs during the insert
    */
   public void insert(Donation donation) {
+    System.out.println("Inserting donation:");
+    System.out.println("  user_id = " + donation.getUser().getID());
+    System.out.println("  org_id  = " + donation.getOrganization().getOrgNumber());
+
     String sql = "INSERT INTO donation(amount, donation_date" +
-        ", user_id, cause_id) VALUES(?, ?, ?, ?)";
+        ", user_id, organization_id) VALUES(?, ?, ?, ?)";
 
     try (Connection conn = Database.getConnection()) {
       PreparedStatement stmt = conn.prepareStatement(sql,
@@ -202,6 +206,7 @@ SELECT SUM(CAST(amount as REAL))
       ResultSet rs = stmt.executeQuery();
       if (rs.next()) {
         BigDecimal amount = rs.getBigDecimal(1);
+        if (amount == null) return "0";
         return amount.toString();
       }
       return "0";

From 43ea467fbb349bfd343bb3ead0ab9c396c6e6c10 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 18:54:18 +0200
Subject: [PATCH 072/101] Added spacing between the labels

---
 src/main/resources/view/DonationConfirmation.fxml | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/resources/view/DonationConfirmation.fxml b/src/main/resources/view/DonationConfirmation.fxml
index 879fff0..48994ec 100644
--- a/src/main/resources/view/DonationConfirmation.fxml
+++ b/src/main/resources/view/DonationConfirmation.fxml
@@ -7,7 +7,7 @@
 
 <BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationConfirmationController">
    <center>
-      <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" stylesheets="@../css/Donation.css" BorderPane.alignment="CENTER">
+      <VBox alignment="CENTER" prefHeight="200.0" prefWidth="100.0" spacing="15.0" stylesheets="@../css/Donation.css" BorderPane.alignment="CENTER">
          <children>
             <Label styleClass="success-icon" text="✓" />
             <Label styleClass="donation-title" text="Thank you for your donation!" />

From ebe715f9684632f28e6b34124ecf4dce325273ad Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 19:25:30 +0200
Subject: [PATCH 073/101] Refactor: removed the info page and added an not
 loggen in page instead, forcing user to log in before donating

---
 src/main/java/ui/Page.java                    |  2 +-
 .../donation/DonationFlowController.java      |  2 +-
 src/main/resources/css/Donation.css           | 46 ++++++------
 .../resources/view/DonationNotLoggedIn.fxml   | 42 +++++++++++
 src/main/resources/view/DonationUserInfo.fxml | 75 -------------------
 5 files changed, 67 insertions(+), 100 deletions(-)
 create mode 100644 src/main/resources/view/DonationNotLoggedIn.fxml
 delete mode 100644 src/main/resources/view/DonationUserInfo.fxml

diff --git a/src/main/java/ui/Page.java b/src/main/java/ui/Page.java
index a7878b9..d926d43 100644
--- a/src/main/java/ui/Page.java
+++ b/src/main/java/ui/Page.java
@@ -7,7 +7,7 @@ public enum Page {
     REGISTER("Register.fxml"),
     ORGANIZATIONS("OrganizationsView.fxml"),
     MY_PROFILE("MyProfile.fxml"),
-    DONATION_USER_INFO("DonationUserInfo.fxml"),
+    DONATION_NOT_LOGGED_IN("DonationNotLoggedIn.fxml"),
     DONATION_AMOUNT("DonationAmount.fxml"),
     DONATION_PAYMENT("DonationPayment.fxml"),
     DONATION_CONFIRMATION("DonationConfirmation.fxml");
diff --git a/src/main/java/ui/controller/donation/DonationFlowController.java b/src/main/java/ui/controller/donation/DonationFlowController.java
index bb9545e..4ef5cbd 100644
--- a/src/main/java/ui/controller/donation/DonationFlowController.java
+++ b/src/main/java/ui/controller/donation/DonationFlowController.java
@@ -34,7 +34,7 @@ public void start(Organization org) throws IOException {
     }
 
     private void loadStep1() throws IOException {
-        FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationUserInfo.fxml"));
+        FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationNotLoggedIn.fxml"));
         Parent root = loader.load();
 
         DonationUserInfoController controller = loader.getController();
diff --git a/src/main/resources/css/Donation.css b/src/main/resources/css/Donation.css
index 7894fd7..68722d4 100644
--- a/src/main/resources/css/Donation.css
+++ b/src/main/resources/css/Donation.css
@@ -1,21 +1,3 @@
-.info-box-success {
-    -fx-background-color: #f0f7ff;
-    -fx-border-color: #b8d4f5;
-    -fx-border-width: 1.5;
-    -fx-border-radius: 8;
-    -fx-background-radius: 8;
-    -fx-padding: 12 16 12 16;
-}
-
-.info-box-warning {
-    -fx-background-color: #fff8e1;
-    -fx-border-color: #ffe082;
-    -fx-border-width: 1.5;
-    -fx-border-radius: 8;
-    -fx-background-radius: 8;
-    -fx-padding: 12 16 12 16;
-}
-
 .donation-container {
     -fx-alignment: center;
     -fx-padding: 40 15% 40 15%;
@@ -111,12 +93,30 @@
     -fx-scale-y: 0.97;
 }
 
-.error-label {
-    -fx-text-fill: #e63946;
-    -fx-font-size: 12px;
-}
-
 .success-icon {
     -fx-font-size: 48px;
     -fx-text-fill: #2d6a4f;
+}
+
+.secondary-button {
+    -fx-background-color: transparent;
+    -fx-border-color: #1e3a8a;
+    -fx-border-width: 1.5;
+    -fx-border-radius: 6;
+    -fx-background-radius: 6;
+    -fx-text-fill: #1e3a8a;
+    -fx-font-weight: bold;
+    -fx-padding: 10 24 10 24;
+    -fx-cursor: hand;
+    -fx-font-size: 14px;
+}
+
+.secondary-button:hover {
+    -fx-background-color: #f0f4ff;
+}
+
+.secondary-button:pressed {
+    -fx-background-color: #dce6f7;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
 }
\ No newline at end of file
diff --git a/src/main/resources/view/DonationNotLoggedIn.fxml b/src/main/resources/view/DonationNotLoggedIn.fxml
new file mode 100644
index 0000000..2e8bdcc
--- /dev/null
+++ b/src/main/resources/view/DonationNotLoggedIn.fxml
@@ -0,0 +1,42 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.net.URL?>
+<?import javafx.geometry.Insets?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationUserInfoController">
+   <stylesheets>
+      <URL value="@../css/Global.css" />
+      <URL value="@../css/Donation.css" />
+   </stylesheets>
+   <center>
+      <VBox alignment="CENTER" spacing="10.0" styleClass="donation-container" BorderPane.alignment="CENTER">
+         <children>
+            <Label styleClass="donation-title" text="Sign in to donate" />
+            <Label fx:id="orgLabel" styleClass="donation-subtitle" />
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <Button mnemonicParsing="false" styleClass="confirm-button" text="Sign In" />
+                  <Button mnemonicParsing="false" styleClass="secondary-button" text="Register" />
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+   </center>
+   <top>
+      <HBox alignment="CENTER" spacing="5.0" BorderPane.alignment="CENTER">
+         <children>
+            <Button mnemonicParsing="false" onAction="#handleBack" styleClass="back-button" text="← Back" HBox.hgrow="ALWAYS" />
+            <Region HBox.hgrow="ALWAYS" />
+         </children>
+         <padding>
+            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
+         </padding>
+      </HBox>
+   </top>
+</BorderPane>
diff --git a/src/main/resources/view/DonationUserInfo.fxml b/src/main/resources/view/DonationUserInfo.fxml
deleted file mode 100644
index 26e1a71..0000000
--- a/src/main/resources/view/DonationUserInfo.fxml
+++ /dev/null
@@ -1,75 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-
-<?import java.net.URL?>
-<?import javafx.geometry.Insets?>
-<?import javafx.scene.control.Button?>
-<?import javafx.scene.control.Hyperlink?>
-<?import javafx.scene.control.Label?>
-<?import javafx.scene.control.TextField?>
-<?import javafx.scene.layout.BorderPane?>
-<?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
-<?import javafx.scene.layout.VBox?>
-
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationUserInfoController">
-   <stylesheets>
-      <URL value="@../css/Global.css" />
-      <URL value="@../css/Donation.css" />
-   </stylesheets>
-   <center>
-      <VBox spacing="10.0" styleClass="donation-form" BorderPane.alignment="CENTER">
-         <children>
-            <Label text="Your information" />
-            <Label fx:id="orgLabel" text="Donating to:" />
-            <Label fx:id="loggedInLabel" styleClass="info-box-success" text="You are signed in – information is pre-filled" />
-            <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
-               <children>
-                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="5.0">
-                     <children>
-                        <Label styleClass="field-label" text="Full name" />
-                        <TextField fx:id="nameField" promptText="Enter your name" />
-                     </children>
-                  </VBox>
-                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="5.0">
-                     <children>
-                        <Label styleClass="field-label" text="Email" />
-                        <TextField fx:id="emailField" promptText="Enter your email" />
-                     </children>
-                  </VBox>
-                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="5.0">
-                     <children>
-                        <Label styleClass="field-label" text="Phone number" />
-                        <TextField fx:id="phoneField" promptText="Enter your phone number" />
-                     </children>
-                  </VBox>
-                  <Button mnemonicParsing="false" onAction="#handleContinue" text="Continue →" />
-                  <Label fx:id="errorLabel" textFill="RED" />
-               </children>
-            </VBox>
-            <VBox fx:id="notLoggedInBox" prefHeight="200.0" prefWidth="100.0" styleClass="info-box-warning">
-               <children>
-                  <Label text="You are not signed in" />
-                  <HBox prefHeight="100.0" prefWidth="200.0" spacing="10.0">
-                     <children>
-                        <Hyperlink fx:id="goToSignIn" onAction="#goToSignIn" text="Sign in" />
-                        <Hyperlink fx:id="goToRegister" onAction="#goToRegister" text="Register" />
-                     </children>
-                  </HBox>
-               </children>
-            </VBox>
-         </children>
-      </VBox>
-   </center>
-   <top>
-      <HBox alignment="CENTER" spacing="5.0" BorderPane.alignment="CENTER">
-         <children>
-            <Button mnemonicParsing="false" onAction="#handleBack" text="← Back" HBox.hgrow="ALWAYS" />
-            <Region HBox.hgrow="ALWAYS" />
-            <Label text="Step 1 of 4" HBox.hgrow="ALWAYS" />
-         </children>
-         <padding>
-            <Insets bottom="10.0" left="10.0" right="10.0" top="10.0" />
-         </padding>
-      </HBox>
-   </top>
-</BorderPane>

From 59d112143e8c212ef11cfc1b16b6f075ca3a422f Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 19:32:54 +0200
Subject: [PATCH 074/101] Refactor: simplify DonationNotLoggedIn controller and
 remove unused fields

---
 .../DonationNotLoggedInController.java        |  45 ++++++++
 .../donation/DonationUserInfoController.java  | 109 ------------------
 .../resources/view/DonationNotLoggedIn.fxml   |   2 +-
 3 files changed, 46 insertions(+), 110 deletions(-)
 create mode 100644 src/main/java/ui/controller/donation/DonationNotLoggedInController.java
 delete mode 100644 src/main/java/ui/controller/donation/DonationUserInfoController.java

diff --git a/src/main/java/ui/controller/donation/DonationNotLoggedInController.java b/src/main/java/ui/controller/donation/DonationNotLoggedInController.java
new file mode 100644
index 0000000..fa21d72
--- /dev/null
+++ b/src/main/java/ui/controller/donation/DonationNotLoggedInController.java
@@ -0,0 +1,45 @@
+package ui.controller.donation;
+
+import domain.organization.Organization;
+import javafx.fxml.FXML;
+import javafx.scene.control.Label;
+import ui.DonationSession;
+import ui.DonationSessionAware;
+import ui.Page;
+import ui.controller.NavigationAware;
+
+import java.util.function.Consumer;
+
+public class DonationNotLoggedInController implements NavigationAware, DonationSessionAware {
+
+    @FXML private Label orgLabel;
+
+    private Consumer<Page> onNavigate;
+    private DonationSession donationSession;
+
+
+    @Override
+    public void setOnNavigate(Consumer<Page> onNavigate) {
+        this.onNavigate = onNavigate;
+    }
+
+    @Override
+    public void setDonationSession(DonationSession session) {
+        this.donationSession = session;
+        orgLabel.setText("You need an account to make a donation to " + donationSession.getOrganization().getName());
+    }
+
+    public void goToSignIn() {
+        onNavigate.accept(Page.SIGN_IN);
+    }
+
+    public void goToRegister() {
+        onNavigate.accept(Page.REGISTER);
+    }
+
+    public void handleBack() {
+        onNavigate.accept(Page.ORGANIZATIONS);
+    }
+
+}
+
diff --git a/src/main/java/ui/controller/donation/DonationUserInfoController.java b/src/main/java/ui/controller/donation/DonationUserInfoController.java
deleted file mode 100644
index 52e1310..0000000
--- a/src/main/java/ui/controller/donation/DonationUserInfoController.java
+++ /dev/null
@@ -1,109 +0,0 @@
-package ui.controller.donation;
-
-import domain.organization.Organization;
-import domain.user.User;
-import javafx.fxml.FXML;
-import javafx.scene.control.Label;
-import javafx.scene.control.TextField;
-import javafx.scene.layout.VBox;
-import ui.DonationSession;
-import ui.DonationSessionAware;
-import ui.Page;
-import ui.controller.NavbarController;
-import ui.controller.NavigationAware;
-import util.SessionManager;
-
-import java.util.function.Consumer;
-
-public class DonationUserInfoController implements NavigationAware, DonationSessionAware {
-
-    @FXML private Label loggedInLabel;
-    @FXML private VBox notLoggedInBox;
-    @FXML private Label orgLabel;
-    @FXML private TextField nameField;
-    @FXML private TextField emailField;
-    @FXML private TextField phoneField;
-    @FXML private Label errorLabel;
-
-    private Consumer<Page> onNavigate;
-    private Consumer<DonationSession> onContinue;
-    private DonationSession donationSession;
-    private Organization org;
-
-
-    public void setOrganization(Organization org) {
-        this.org = org;
-    }
-
-    @Override
-    public void setOnNavigate(Consumer<Page> onNavigate) {
-        this.onNavigate = onNavigate;
-    }
-
-    @Override
-    public void setDonationSession(DonationSession session) {
-        this.donationSession = session;
-        orgLabel.setText("Donating to: " + donationSession.getOrganization().getName());
-    }
-
-    public void setOnContinue(Consumer<DonationSession> onContinue) {
-        this.onContinue = onContinue;
-    }
-
-    @FXML
-    public void initialize() {
-        if (SessionManager.isSignedIn()) {
-            loggedInLabel.setVisible(true);
-            loggedInLabel.setManaged(true);
-            notLoggedInBox.setVisible(false);
-            notLoggedInBox.setManaged(false);
-
-            User user = SessionManager.getSignedInUser();
-            nameField.setText(user.getUsername());
-            emailField.setText(user.getEmail());
-            phoneField.setText(user.getPhoneNumber());
-
-        } else {
-            loggedInLabel.setVisible(false);
-            loggedInLabel.setManaged(false);
-            notLoggedInBox.setVisible(true);
-            notLoggedInBox.setManaged(true);
-        }
-    }
-
-
-
-    public void goToSignIn() {
-        onNavigate.accept(Page.SIGN_IN);
-    }
-
-    public void goToRegister() {
-        onNavigate.accept(Page.REGISTER);
-    }
-
-    public void handleBack() {
-        onNavigate.accept(Page.ORGANIZATIONS);
-    }
-
-    public void handleContinue() {
-        if (nameField.getText().isBlank()) {
-            errorLabel.setText("Please enter your full name");
-            return;
-        }
-        if (emailField.getText().isBlank()) {
-            errorLabel.setText("Please enter your email");
-            return;
-        }
-        if (phoneField.getText().isBlank()) {
-            errorLabel.setText("Please enter your phone number");
-            return;
-        }
-
-        donationSession.setName(nameField.getText());
-        donationSession.setEmail(emailField.getText());
-        donationSession.setPhone(phoneField.getText());
-        onContinue.accept(donationSession);
-    }
-
-}
-
diff --git a/src/main/resources/view/DonationNotLoggedIn.fxml b/src/main/resources/view/DonationNotLoggedIn.fxml
index 2e8bdcc..3c9990c 100644
--- a/src/main/resources/view/DonationNotLoggedIn.fxml
+++ b/src/main/resources/view/DonationNotLoggedIn.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationUserInfoController">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationNotLoggedInController">
    <stylesheets>
       <URL value="@../css/Global.css" />
       <URL value="@../css/Donation.css" />

From 32108d2ac5afd5678235097da74796a688eac3f0 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 19:53:46 +0200
Subject: [PATCH 075/101] Added guard for negative amount

---
 .../donation/DonationAmountController.java    | 35 ++++++++++---------
 1 file changed, 19 insertions(+), 16 deletions(-)

diff --git a/src/main/java/ui/controller/donation/DonationAmountController.java b/src/main/java/ui/controller/donation/DonationAmountController.java
index 3a35fc2..064c07d 100644
--- a/src/main/java/ui/controller/donation/DonationAmountController.java
+++ b/src/main/java/ui/controller/donation/DonationAmountController.java
@@ -5,8 +5,7 @@
 import javafx.scene.control.TextField;
 import ui.DonationSession;
 import ui.DonationSessionAware;
-import ui.Page;
-import ui.controller.NavigationAware;
+
 
 import java.util.function.Consumer;
 
@@ -34,20 +33,24 @@ public void setOnBack(Runnable onBack) {
         this.onBack = onBack;
     }
 
-    @FXML
-    public void handleContinue() {
-        if (amountField.getText().isBlank()) {
-            errorLabel.setText("Please enter an amount.");
-            return;
-        }
-        try {
-            int amount = Integer.parseInt(amountField.getText().trim());
-            donationSession.setAmount(amount);
-            onContinue.accept(donationSession);
-        } catch (NumberFormatException e) {
-            errorLabel.setText("Please enter a valid number.");
-        }
-    }
+      @FXML
+      public void handleContinue() {
+          if (amountField.getText().isBlank()) {
+              errorLabel.setText("Please enter an amount.");
+              return;
+          }
+          try {
+              int amount = Integer.parseInt(amountField.getText().trim());
+              if (amount <= 0) {
+                errorLabel.setText("Please enter an amount greater than 0.");
+                return;
+              }
+              donationSession.setAmount(amount);
+              onContinue.accept(donationSession);
+          } catch (NumberFormatException e) {
+              errorLabel.setText("Please enter a valid number.");
+          }
+      }
 
     @FXML
     private void handleBack() {

From dc50cd22d7e938343c7302a38759a1507f19661a Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 19:56:57 +0200
Subject: [PATCH 076/101] feat: finish not logged in page for donation flow

---
 src/main/resources/view/DonationNotLoggedIn.fxml | 9 +++++----
 1 file changed, 5 insertions(+), 4 deletions(-)

diff --git a/src/main/resources/view/DonationNotLoggedIn.fxml b/src/main/resources/view/DonationNotLoggedIn.fxml
index 3c9990c..a144080 100644
--- a/src/main/resources/view/DonationNotLoggedIn.fxml
+++ b/src/main/resources/view/DonationNotLoggedIn.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationNotLoggedInController">
+<BorderPane minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.donation.DonationNotLoggedInController">
    <stylesheets>
       <URL value="@../css/Global.css" />
       <URL value="@../css/Donation.css" />
@@ -19,10 +19,11 @@
          <children>
             <Label styleClass="donation-title" text="Sign in to donate" />
             <Label fx:id="orgLabel" styleClass="donation-subtitle" />
-            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0">
+            <Label styleClass="donation-subtitle" text="Create a free account to start making a difference" />
+            <HBox alignment="CENTER" prefHeight="100.0" prefWidth="200.0" spacing="10.0">
                <children>
-                  <Button mnemonicParsing="false" styleClass="confirm-button" text="Sign In" />
-                  <Button mnemonicParsing="false" styleClass="secondary-button" text="Register" />
+                  <Button mnemonicParsing="false" onAction="#goToSignIn" styleClass="confirm-button" text="Sign In" />
+                  <Button mnemonicParsing="false" onAction="#goToRegister" styleClass="secondary-button" text="Register" />
                </children>
             </HBox>
          </children>

From 9ff603d03a0021ce988c5337a848fdb0422e5b05 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 19:57:17 +0200
Subject: [PATCH 077/101] refactor: redirect to amount or not logged in page
 based on auth state

---
 .../donation/DonationFlowController.java        | 17 ++++++++---------
 1 file changed, 8 insertions(+), 9 deletions(-)

diff --git a/src/main/java/ui/controller/donation/DonationFlowController.java b/src/main/java/ui/controller/donation/DonationFlowController.java
index 4ef5cbd..f9d014a 100644
--- a/src/main/java/ui/controller/donation/DonationFlowController.java
+++ b/src/main/java/ui/controller/donation/DonationFlowController.java
@@ -30,20 +30,20 @@ public void start(Organization org) throws IOException {
         session = new DonationSession();
         session.setOrganization(org);
         navbarController.hideNavbar();
-        loadStep1();
+
+        if (SessionManager.isSignedIn()) {
+            loadStep2();
+        } else {
+            loadStep1();
+        }
     }
 
     private void loadStep1() throws IOException {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationNotLoggedIn.fxml"));
         Parent root = loader.load();
 
-        DonationUserInfoController controller = loader.getController();
+        DonationNotLoggedInController controller = loader.getController();
         controller.setDonationSession(session);
-        controller.setOnContinue(updatedSession -> {
-            session = updatedSession;
-            try { loadStep2(); }
-            catch (IOException e) { throw new RuntimeException(e); }
-        });
 
         controller.setOnNavigate(onNavigate);
         mainPane.setCenter(root);
@@ -66,8 +66,7 @@ private void loadStep2() throws IOException {
         });
 
         controller.setOnBack(() ->  {
-            try { loadStep1(); }
-            catch (IOException e) { throw new RuntimeException(e); }
+          onNavigate.accept(Page.ORGANIZATIONS);
         });
 
         mainPane.setCenter(root);

From b67a5f2a73d27d486c1e82c2884f9c83fd29fea3 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 20:41:19 +0200
Subject: [PATCH 078/101] Refactor: Moved common styling to Global.css

---
 src/main/resources/css/Global.css   |  38 ++++++++
 src/main/resources/css/Register.css | 129 ----------------------------
 src/main/resources/css/SignIn.css   |  20 -----
 3 files changed, 38 insertions(+), 149 deletions(-)
 delete mode 100644 src/main/resources/css/Register.css
 delete mode 100644 src/main/resources/css/SignIn.css

diff --git a/src/main/resources/css/Global.css b/src/main/resources/css/Global.css
index 5de6600..c7af883 100644
--- a/src/main/resources/css/Global.css
+++ b/src/main/resources/css/Global.css
@@ -127,3 +127,41 @@
     -fx-font-weight: bold;
 }
 
+.confirm-button {
+    -fx-background-color: #1e3a8a;
+    -fx-text-fill: white;
+    -fx-font-weight: bold;
+    -fx-background-radius: 6;
+    -fx-padding: 10 24 10 24;
+    -fx-cursor: hand;
+    -fx-font-size: 14px;
+}
+
+.confirm-button:hover {
+    -fx-background-color: #2649a8;
+    -fx-scale-x: 1.03;
+    -fx-scale-y: 1.03;
+}
+
+.confirm-button:pressed {
+    -fx-background-color: #162d6e;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
+}
+
+.field-label {
+    -fx-font-size: 15px;
+    -fx-font-weight: bold;
+    -fx-text-fill: #1a1a2e;
+}
+
+.input-field {
+    -fx-background-radius: 6;
+    -fx-border-radius: 6;
+    -fx-border-color: #c0c8dc;
+    -fx-border-width: 1.5;
+    -fx-padding: 8 12 8 12;
+    -fx-font-size: 13px;
+    -fx-pref-height: 40px;
+}
+
diff --git a/src/main/resources/css/Register.css b/src/main/resources/css/Register.css
deleted file mode 100644
index a51cd40..0000000
--- a/src/main/resources/css/Register.css
+++ /dev/null
@@ -1,129 +0,0 @@
-/* =====================
-   GiveHope – register.css
-   Matches the sign-in page aesthetic
-   ===================== */
-
-/* Root / background */
-.root-pane {
-    -fx-background-color: #e8e8e8;
-}
-
-/* ── Top bar ── */
-.top-bar {
-    -fx-padding: 14 18 14 18;
-    -fx-alignment: CENTER_LEFT;
-    -fx-background-color: #e8e8e8;
-    -fx-spacing: 12;
-}
-
-.logo-label {
-    -fx-font-size: 15px;
-    -fx-font-family: "Segoe UI", sans-serif;
-    -fx-text-fill: #2c2c2c;
-    -fx-font-weight: normal;
-}
-
-.home-button {
-    -fx-background-color: #d4d4d4;
-    -fx-text-fill: #2c2c2c;
-    -fx-font-size: 14px;
-    -fx-font-family: "Segoe UI", sans-serif;
-    -fx-background-radius: 12px;
-    -fx-padding: 8 18 8 18;
-    -fx-cursor: hand;
-    -fx-border-color: transparent;
-}
-
-.home-button:hover {
-    -fx-background-color: #c4c4c4;
-}
-
-/* ── Form container ── */
-.form-container {
-    -fx-padding: 0 0 80 0;
-}
-
-/* ── Input fields ── */
-.input-field {
-    -fx-background-color: #ffffff;
-    -fx-background-radius: 24px;
-    -fx-border-radius: 24px;
-    -fx-border-color: transparent;
-    -fx-padding: 14 22 14 22;
-    -fx-font-size: 15px;
-    -fx-font-family: "Segoe UI", sans-serif;
-    -fx-prompt-text-fill: #b0b0b0;
-    -fx-text-fill: #2c2c2c;
-    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.06), 6, 0, 0, 1);
-    -fx-pref-height: 50px;
-}
-
-.input-field:focused {
-    -fx-background-color: #ffffff;
-    -fx-border-color: #a8c4d4;
-    -fx-border-radius: 24px;
-    -fx-border-width: 1.5px;
-}
-
-/* ── Primary button ── */
-.primary-button {
-    -fx-background-color: #a8c4d4;
-    -fx-text-fill: #2c2c2c;
-    -fx-font-size: 16px;
-    -fx-font-family: "Segoe UI", sans-serif;
-    -fx-background-radius: 24px;
-    -fx-padding: 14 0 14 0;
-    -fx-cursor: hand;
-    -fx-pref-height: 54px;
-    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.08), 6, 0, 0, 2);
-}
-
-.primary-button:hover {
-    -fx-background-color: #96b5c8;
-}
-
-.primary-button:pressed {
-    -fx-background-color: #84a6bb;
-}
-
-/* ── Footer ── */
-.footer-label {
-    -fx-font-size: 13px;
-    -fx-font-family: "Segoe UI", sans-serif;
-    -fx-text-fill: #888888;
-}
-
-.footer-link {
-    -fx-font-size: 13px;
-    -fx-font-family: "Segoe UI", sans-serif;
-    -fx-text-fill: #5a8fa8;
-    -fx-border-color: transparent;
-    -fx-padding: 0;
-    -fx-underline: false;
-}
-
-.footer-link:hover {
-    -fx-text-fill: #3d7290;
-    -fx-underline: true;
-}
-
-.register-button{
-    -fx-font-size: 24px;
-    -fx-background-color: #3a86ff;
-    -fx-text-fill: white;
-    -fx-font-family: "Segoe UI", sans-serif;
-    -fx-cursor: hand;
-    -fx-border-color: transparent;
-    -fx-background-radius: 14px;
-}
-
-.register-button:hover {
-    -fx-background-color: #266ddf;
-    -fx-scale-x: 1.05;
-    -fx-scale-y: 1.05;
-}
-.register-button:pressed {
-    -fx-background-color: #1a5bbf;
-    -fx-scale-x: 0.97;
-    -fx-scale-y: 0.97;
-}
\ No newline at end of file
diff --git a/src/main/resources/css/SignIn.css b/src/main/resources/css/SignIn.css
deleted file mode 100644
index 36cdbb8..0000000
--- a/src/main/resources/css/SignIn.css
+++ /dev/null
@@ -1,20 +0,0 @@
-.signIn-button{
-    -fx-font-size: 24px;
-    -fx-background-color: #3a86ff;
-    -fx-text-fill: white;
-    -fx-font-family: "Segoe UI", sans-serif;
-    -fx-cursor: hand;
-    -fx-border-color: transparent;
-    -fx-background-radius: 14px;
-}
-
-.signIn-button:hover {
-    -fx-background-color: #266ddf;
-    -fx-scale-x: 1.05;
-    -fx-scale-y: 1.05;
-}
-.signIn-button:pressed {
-    -fx-background-color: #1a5bbf;
-    -fx-scale-x: 0.97;
-    -fx-scale-y: 0.97;
-}
\ No newline at end of file

From f3aa1ef0209b3ef313d46f70d21e1e9651c3f054 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 14 Apr 2026 20:41:55 +0200
Subject: [PATCH 079/101] refactor: improve Sign In and Register page layout
 and styling

---
 src/main/resources/view/Register.fxml | 62 ++++++++++++++++++---------
 src/main/resources/view/SignIn.fxml   | 44 ++++++++-----------
 2 files changed, 60 insertions(+), 46 deletions(-)

diff --git a/src/main/resources/view/Register.fxml b/src/main/resources/view/Register.fxml
index 4753596..de4a9d3 100644
--- a/src/main/resources/view/Register.fxml
+++ b/src/main/resources/view/Register.fxml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.net.URL?>
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
@@ -9,29 +7,57 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-<BorderPane fx:controller="ui.controller.RegisterController" prefHeight="725.0" prefWidth="1275" style="-fx-background-color: #f4f4f4;" xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/25">
+<BorderPane prefHeight="725.0" prefWidth="1275" style="-fx-background-color: #f4f4f4;" stylesheets="@../css/Global.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.RegisterController">
 
     <!-- REGISTER AREA -->
     <center>
 
         <VBox alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="500" spacing="25.0">
          <Label styleClass="page-title" text="Register" />
+         <VBox spacing="5.0">
+            <children>
+               <Label styleClass="field-label" text="Username" />
+      
+                              <TextField fx:id="usernameField" promptText="Enter Username" styleClass="input-field" />
+            </children>
+         </VBox>
+         <VBox spacing="5.0">
+            <children>
+               <Label styleClass="field-label" text="Email" />
+      
+                              <TextField fx:id="emailField" promptText="Enter Email" styleClass="input-field" />
+            </children>
+         </VBox>
+         <VBox spacing="5.0">
+            <children>
+               <Label styleClass="field-label" text="Phone Number" />
+      
+                        <TextField fx:id="phoneNumberField" promptText="Enter Phone Number" styleClass="input-field" />
+            </children>
+         </VBox>
+         <HBox alignment="CENTER" spacing="15.0">
+            <children>
+               <VBox spacing="5.0" HBox.hgrow="ALWAYS">
+                  <children>
+                     <Label styleClass="field-label" text="Password" />
+            
+                                    <PasswordField fx:id="passwordField" promptText="Enter Password" styleClass="input-field" />
+                  </children>
+               </VBox>
+               <VBox spacing="5.0" HBox.hgrow="ALWAYS">
+                  <children>
+                     <Label styleClass="field-label" text="Confirm Password" />
+            
+                                    <PasswordField fx:id="confirmPasswordField" promptText="Re-enter Password" styleClass="input-field" />
+                  </children>
+               </VBox>
+            </children>
+         </HBox>
 
-                  <TextField fx:id="usernameField" prefHeight="40.0" prefWidth="480" promptText="Enter Username" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-                  <TextField fx:id="emailField" prefHeight="40.0" prefWidth="480" promptText="Enter Email" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-                  <TextField fx:id="phoneNumberField" prefHeight="40.0" prefWidth="480" promptText="Enter Phone Number" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-                  <PasswordField fx:id="passwordField" prefHeight="40.0" prefWidth="480" promptText="Enter Password" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-                  <PasswordField fx:id="confirmPasswordField" prefHeight="40.0" prefWidth="480" promptText="Confirm Password" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-
-                  <Button maxWidth="1.7976931348623157E308" onAction="#handleRegister" styleClass="register-button" text="Register" />
+                        <Button maxWidth="1.7976931348623157E308" onAction="#handleRegister" styleClass="confirm-button" text="Register" />
 
                               <!-- SIGN IN LINK -->
             <HBox alignment="CENTER_LEFT" spacing="0">
@@ -51,14 +77,10 @@
 
                               </HBox>
 
-                  <Label fx:id="errorLabel" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" style="-fx-text-fill: red; -fx-font-size: 16px;" text="" />
+                              <Label fx:id="errorLabel" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" style="-fx-text-fill: red; -fx-font-size: 16px;" />
 
         </VBox>
 
     </center>
-   <stylesheets>
-      <URL value="@../css/Register.css" />
-      <URL value="@../css/Global.css" />
-   </stylesheets>
 
 </BorderPane>
diff --git a/src/main/resources/view/SignIn.fxml b/src/main/resources/view/SignIn.fxml
index fda7a96..38e5f2a 100644
--- a/src/main/resources/view/SignIn.fxml
+++ b/src/main/resources/view/SignIn.fxml
@@ -1,7 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.net.URL?>
-<?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Hyperlink?>
 <?import javafx.scene.control.Label?>
@@ -9,13 +7,10 @@
 <?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.HBox?>
-<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 <?import javafx.scene.text.Font?>
 
-
-<BorderPane fx:controller="ui.controller.SignInController" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" style="-fx-background-color: #f4f4f4;" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1">
-          <!-- LOGIN AREA -->
+<BorderPane maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" style="-fx-background-color: #f4f4f4;" stylesheets="@../css/Global.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.SignInController">
     <center>
 
                     <VBox alignment="CENTER" maxWidth="500.0" spacing="20.0">
@@ -40,34 +35,31 @@
                                           </HBox>
             </children>
          </VBox>
-         <VBox prefHeight="200.0" prefWidth="100.0" spacing="25.0">
+         <VBox spacing="15.0">
             <children>
+               <VBox spacing="5.0">
+                  <children>
+                     <Label styleClass="field-label" text="Username or Email" />
+            
+                                    <TextField fx:id="loginField" prefHeight="40.0" prefWidth="300.0" promptText="e.g. john@email.com" styleClass="input-field" />
+                  </children>
+               </VBox>
+               <VBox spacing="5.0">
+                  <children>
+                     <Label styleClass="field-label" text="Password" />
+            
+                                    <PasswordField fx:id="passwordField" prefHeight="40.0" prefWidth="300.0" promptText="••••••••" styleClass="input-field" />
+                  </children>
+               </VBox>
       
-                              <TextField fx:id="loginField" prefHeight="65" prefWidth="480" promptText="Username or Email" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-      
-                              <PasswordField fx:id="passwordField" prefHeight="65" prefWidth="480" promptText="Password" style="-fx-font-size: 24px; -fx-background-radius: 14;" />
-      
-                              <Button maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" onAction="#handleSignIn" styleClass="signIn-button" text="Sign in" />
+                              <Button maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" onAction="#handleSignIn" styleClass="confirm-button" text="Sign in" />
             </children>
          </VBox>
-         <HBox alignment="CENTER_LEFT">
-            <children>
-               <Hyperlink onAction="#handleRegister" text="Forgot your password?">
-                  <font>
-                     <Font size="16.0" />
-                  </font>
-               </Hyperlink>
-            </children>
-         </HBox>
 
-                                          <Label fx:id="errorLabel" maxWidth="1.7976931348623157E308" style="-fx-text-fill: red; -fx-font-size: 16px;" text="" />
+                                          <Label fx:id="errorLabel" alignment="TOP_LEFT" maxWidth="1.7976931348623157E308" style="-fx-text-fill: red; -fx-font-size: 16px;" text="" />
 
                     </VBox>
 
           </center>
-   <stylesheets>
-      <URL value="@../css/Global.css" />
-      <URL value="@../css/SignIn.css" />
-   </stylesheets>
 
       </BorderPane>

From 621da6c8e1bdb1bd938ffeda4f827854f83b6b16 Mon Sep 17 00:00:00 2001
From: haavajor <haavajor@stud.ntnu.no>
Date: Wed, 15 Apr 2026 09:45:45 +0200
Subject: [PATCH 080/101] Unit tests

---
 src/main/java/application/user/UserLogin.java |   2 +-
 .../java/application/user/UserLoginTest.java  | 162 +++++++++++++++++
 .../application/user/UserRegisterTest.java    | 170 ++++++++++++++++++
 .../application/user/UserStatisticsTest.java  | 132 ++++++++++++++
 .../security/Sha256PasswordHasherTest.java    |  26 +++
 5 files changed, 491 insertions(+), 1 deletion(-)
 create mode 100644 src/test/java/application/user/UserLoginTest.java
 create mode 100644 src/test/java/application/user/UserRegisterTest.java
 create mode 100644 src/test/java/application/user/UserStatisticsTest.java
 create mode 100644 src/test/java/integration/security/Sha256PasswordHasherTest.java

diff --git a/src/main/java/application/user/UserLogin.java b/src/main/java/application/user/UserLogin.java
index e116498..50940ac 100644
--- a/src/main/java/application/user/UserLogin.java
+++ b/src/main/java/application/user/UserLogin.java
@@ -16,7 +16,7 @@ public UserLogin(PasswordHasher hasher, UserRepository repo) {
 
     public User execute(String login, String password) {
         // normalize (trim etc.)
-        login.trim().toLowerCase();
+        login = login.trim().toLowerCase();
 
         User user = repo.findByLogin(login)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid credentials"));
diff --git a/src/test/java/application/user/UserLoginTest.java b/src/test/java/application/user/UserLoginTest.java
new file mode 100644
index 0000000..4bd8312
--- /dev/null
+++ b/src/test/java/application/user/UserLoginTest.java
@@ -0,0 +1,162 @@
+package application.user;
+
+import application.security.PasswordHasher;
+import domain.user.User;
+import org.junit.jupiter.api.Test;
+import persistence.UserRepository;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class UserLoginTest {
+
+    @Test
+    void executeReturnsUserWhenCredentialsAreValid() {
+        User user = new User("testuser", "12345678", "hashed-secret", "test@example.com");
+        PasswordHasher hasher = new FakePasswordHasher("hashed-secret");
+        UserRepository repo = new FakeUserRepository(Optional.of(user));
+
+        UserLogin userLogin = new UserLogin(hasher, repo);
+
+        User result = userLogin.execute("testuser", "secret");
+
+        assertSame(user, result);
+
+    }
+
+    @Test
+    void executeThrowsWhenLoginDoesNotExist() {
+        PasswordHasher hasher = new FakePasswordHasher("hashed-secret");
+        UserRepository repo = new FakeUserRepository(Optional.empty());
+
+        UserLogin userLogin = new UserLogin(hasher, repo);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> userLogin.execute("missing-user", "secret")
+        );
+
+        assertEquals("Invalid credentials", exception.getMessage());
+    }
+
+    @Test
+    void executeThrowsWhenPasswordIsWrong() {
+        User user = new User("testuser", "12345678", "stored-hash", "test@example.com");
+        PasswordHasher hasher = new FakePasswordHasher("different-hash");
+        UserRepository repo = new FakeUserRepository(Optional.of(user));
+
+        UserLogin userLogin = new UserLogin(hasher, repo);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> userLogin.execute("testuser", "wrong-password")
+        );
+
+        assertEquals("Invalid password", exception.getMessage());
+    }
+
+    @Test
+    void executeUsesNormalizedLoginBeforeLookup() {
+        User user = new User("testuser", "12345678", "hashed-secret", "test@example.com");
+        RecordingUserRepository repo = new RecordingUserRepository(Optional.of(user));
+        PasswordHasher hasher = new FakePasswordHasher("hashed-secret");
+
+        UserLogin userLogin = new UserLogin(hasher, repo);
+
+        userLogin.execute("  TestUser  ", "secret");
+
+        assertEquals("testuser", repo.lastLoginUsed);
+    }
+
+    private static class FakePasswordHasher implements PasswordHasher{
+        private final String hashToReturn;
+        private FakePasswordHasher(String hashToReturn) {
+            this.hashToReturn = hashToReturn;
+        }
+
+        @Override
+        public String hash(String password) {
+            return hashToReturn;
+        }
+    }
+
+    private static class FakeUserRepository implements UserRepository {
+        private final Optional<User> userToReturn;
+
+        private FakeUserRepository(Optional<User> userToReturn) {
+            this.userToReturn = userToReturn;
+        }
+
+        @Override
+        public Optional<User> findByUsername(String username){
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByEmail(String email){
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByLogin(String login) {
+            return userToReturn;
+        }
+
+        @Override
+        public boolean existsByEmail(String email) {
+            return false;
+        }
+
+        @Override
+        public boolean existsByUsername(String username) {
+            return false;
+        }
+
+        @Override
+        public void insert(User user) {
+        }
+    }
+
+    private static class RecordingUserRepository implements UserRepository {
+        private final Optional<User> userToReturn;
+        private String lastLoginUsed;
+
+        private RecordingUserRepository(Optional<User> userToReturn) {
+            this.userToReturn = userToReturn;
+        }
+
+        @Override
+        public Optional<User> findByUsername(String username) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByEmail(String email) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByLogin(String login) {
+            lastLoginUsed = login;
+            return userToReturn;
+        }
+
+        @Override
+        public boolean existsByEmail(String email) {
+            return false;
+        }
+
+        @Override
+        public boolean existsByUsername(String username) {
+            return false;
+        }
+
+        @Override
+        public void insert(User user) {
+        }
+    }
+
+
+}
+
diff --git a/src/test/java/application/user/UserRegisterTest.java b/src/test/java/application/user/UserRegisterTest.java
new file mode 100644
index 0000000..c5296cd
--- /dev/null
+++ b/src/test/java/application/user/UserRegisterTest.java
@@ -0,0 +1,170 @@
+package application.user;
+
+import application.security.PasswordHasher;
+import domain.user.User;
+import org.junit.jupiter.api.Test;
+import persistence.UserRepository;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class UserRegisterTest {
+
+    @Test
+    void executeInsertsUserWhenInputIsValid() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        PasswordHasher hasher = new FakePasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        userRegister.execute("testuser", "12345678", "secret", "test@example.com");
+
+        assertNotNull(repo.insertedUser);
+        assertEquals("testuser", repo.insertedUser.getUsername());
+        assertEquals("12345678", repo.insertedUser.getPhoneNumber());
+        assertEquals("hashed-password", repo.insertedUser.getPassword());
+        assertEquals("test@example.com", repo.insertedUser.getEMail());
+    }
+
+
+    @Test
+    void executeNormalizesUsernameEmailAndPhoneBeforeInsert() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        PasswordHasher hasher = new FakePasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        userRegister.execute("  testuser  ", " 12345678 ", "secret", "  TEST@EXAMPLE.COM  ");
+
+        assertNotNull(repo.insertedUser);
+        assertEquals("testuser", repo.insertedUser.getUsername());
+        assertEquals("12345678", repo.insertedUser.getPhoneNumber());
+        assertEquals("test@example.com", repo.insertedUser.getEMail());
+    }
+
+
+    @Test
+    void executeThrowsWhenEmailAlreadyExists() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        repo.emailExists = true;
+        PasswordHasher hasher = new FakePasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> userRegister.execute("testuser", "12345678", "secret", "test@example.com")
+        );
+
+        assertEquals("Email already in use", exception.getMessage());
+        assertNull(repo.insertedUser);
+    }
+
+    @Test
+    void executeThrowsWhenUsernameAlreadyExists() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        repo.usernameExists = true;
+        PasswordHasher hasher = new FakePasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> userRegister.execute("testuser", "12345678", "secret", "test@example.com")
+        );
+
+        assertEquals("This username is taken", exception.getMessage());
+        assertNull(repo.insertedUser);
+    }
+
+    @Test
+    void executeHashesPasswordBeforeSavingUser() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        RecordingPasswordHasher hasher = new RecordingPasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        userRegister.execute("testuser", "12345678", "secret", "test@example.com");
+
+        assertEquals("secret", hasher.lastPasswordInput);
+        assertNotNull(repo.insertedUser);
+        assertEquals("hashed-password", repo.insertedUser.getPassword());
+    }
+
+    @Test
+    void executePropagatesDomainValidationErrors() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        PasswordHasher hasher = new FakePasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> userRegister.execute("testuser", "1234", "secret", "test@example.com")
+        );
+
+        assertEquals("Fill in a phonenumber with 8 digits", exception.getMessage());
+        assertNull(repo.insertedUser);
+    }
+
+    private static class FakePasswordHasher implements PasswordHasher {
+        private final String hashToReturn;
+
+        private FakePasswordHasher(String hashToReturn) {
+            this.hashToReturn = hashToReturn;
+        }
+
+        @Override
+        public String hash(String password) {
+            return hashToReturn;
+        }
+    }
+
+
+    private static class RecordingPasswordHasher implements PasswordHasher {
+        private final String hashToReturn;
+        private String lastPasswordInput;
+
+        private RecordingPasswordHasher(String hashToReturn) {
+            this.hashToReturn = hashToReturn;
+        }
+
+        @Override
+        public String hash(String password) {
+            lastPasswordInput = password;
+            return hashToReturn;
+        }
+    }
+
+    private static class RecordingUserRepository implements UserRepository {
+        private boolean emailExists;
+        private boolean usernameExists;
+        private User insertedUser;
+
+        @Override
+        public Optional<User> findByUsername(String username) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByEmail(String email) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByLogin(String login) {
+            return Optional.empty();
+        }
+
+
+        @Override
+        public boolean existsByEmail(String email) {
+            return emailExists;
+        }
+
+        @Override
+        public boolean existsByUsername(String username) {
+            return usernameExists;
+        }
+
+        @Override
+        public void insert(User user) {
+            insertedUser = user;
+        }
+    }
+}
diff --git a/src/test/java/application/user/UserStatisticsTest.java b/src/test/java/application/user/UserStatisticsTest.java
new file mode 100644
index 0000000..da904cb
--- /dev/null
+++ b/src/test/java/application/user/UserStatisticsTest.java
@@ -0,0 +1,132 @@
+package application.user;
+
+import domain.user.User;
+import org.junit.jupiter.api.Test;
+import persistence.DonationDao;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class UserStatisticsTest {
+
+    @Test
+    void userFavoriteOrganizationsReturnsListFromDonationDao() throws Exception {
+        FakeDonationDao fakeDao = new FakeDonationDao();
+        fakeDao.favoriteOrganizationsToReturn = List.of(
+                "Org1 (3 donasjoner)",
+                "Org2 (2 donasjoner)"
+        );
+
+        UserStatistics statistics = createStatisticsWithFakeDao(fakeDao);
+        User user = createUserWithId(42L);
+
+        List<String> result = statistics.userFavoriteOrganizations(user);
+
+        assertEquals(List.of("Org1 (3 donasjoner)", "Org2 (2 donasjoner)"), result);
+        assertEquals(42L, fakeDao.lastUserIdForFavorites);
+    }
+
+    @Test
+    void userDonationsReturnsListFromDonationDao() throws Exception {
+        FakeDonationDao fakeDao = new FakeDonationDao();
+        fakeDao.userDonationsToReturn = List.of(
+                "Amount: 100, Date: 2026-04-15, Organization: Org1",
+                "Amount: 50, Date: 2026-04-16, Organization: Org2"
+        );
+
+        UserStatistics statistics = createStatisticsWithFakeDao(fakeDao);
+        User user = createUserWithId(7L);
+
+        List<String> result = statistics.userDonations(user);
+
+        assertEquals(List.of(
+                "Amount: 100, Date: 2026-04-15, Organization: Org1",
+                "Amount: 50, Date: 2026-04-16, Organization: Org2"
+        ), result);
+        assertEquals(7L, fakeDao.lastUserIdForDonations);
+    }
+
+    @Test
+    void userTotalDonationAmountReturnsValueFromDonationDao() throws Exception {
+        FakeDonationDao fakeDao = new FakeDonationDao();
+        fakeDao.totalDonationAmountToReturn = "250.00";
+
+        UserStatistics statistics = createStatisticsWithFakeDao(fakeDao);
+        User user = createUserWithId(15L);
+
+        String result = statistics.userTotalDonationAmount(user);
+
+        assertEquals("250.00", result);
+        assertEquals(15L, fakeDao.lastUserIdForTotalAmount);
+    }
+
+    @Test
+    void getTotalDonationsMadeReturnsValueFromDonationDao() throws Exception {
+        FakeDonationDao fakeDao = new FakeDonationDao();
+        fakeDao.totalDonationsMadeToReturn = "5";
+
+        UserStatistics statistics = createStatisticsWithFakeDao(fakeDao);
+        User user = createUserWithId(99L);
+
+        String result = statistics.getTotalDonationsMade(user);
+
+        assertEquals("5", result);
+        assertEquals(99L, fakeDao.lastUserIdForTotalCount);
+    }
+
+
+
+    private UserStatistics createStatisticsWithFakeDao(FakeDonationDao fakeDao) throws Exception {
+        UserStatistics statistics = new UserStatistics();
+
+        Field field = UserStatistics.class.getDeclaredField("donationDao");
+        field.setAccessible(true);
+        field.set(statistics, fakeDao);
+
+        return statistics;
+    }
+
+    private User createUserWithId(long id) {
+        User user = new User("testuser", "12345678", "password", "test@example.com");
+        user.setId(id);
+        return user;
+    }
+
+    private static class FakeDonationDao extends DonationDao {
+        private List<String> favoriteOrganizationsToReturn = List.of();
+        private List<String> userDonationsToReturn = List.of();
+        private String totalDonationAmountToReturn = "0";
+        private String totalDonationsMadeToReturn = "0";
+
+        private long lastUserIdForFavorites;
+        private long lastUserIdForDonations;
+        private long lastUserIdForTotalAmount;
+        private long lastUserIdForTotalCount;
+
+        @Override
+        public List<String> getFavoriteOrganizations(long userId) {
+            lastUserIdForFavorites = userId;
+            return favoriteOrganizationsToReturn;
+        }
+
+        @Override
+        public List<String> getUserDonations(long userId) {
+            lastUserIdForDonations = userId;
+            return userDonationsToReturn;
+        }
+
+        @Override
+        public String getTotalDonationAmount(long userId) {
+            lastUserIdForTotalAmount = userId;
+            return totalDonationAmountToReturn;
+        }
+
+        @Override
+        public String getTotalDonationsMade(long userId) {
+            lastUserIdForTotalCount = userId;
+            return totalDonationsMadeToReturn;
+        }
+    }
+}
diff --git a/src/test/java/integration/security/Sha256PasswordHasherTest.java b/src/test/java/integration/security/Sha256PasswordHasherTest.java
new file mode 100644
index 0000000..67b360e
--- /dev/null
+++ b/src/test/java/integration/security/Sha256PasswordHasherTest.java
@@ -0,0 +1,26 @@
+package integration.security;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class Sha256PasswordHasherTest {
+    @Test
+    void hashReturnsExpectedSha256ForKnownInput() {
+        Sha256PasswordHasher hasher = new Sha256PasswordHasher();
+
+        String result = hasher.hash("password");
+
+        assertEquals("5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8", result);
+    }
+
+    @Test
+    void hashReturns64CharacterLowercaseHexString() {
+        Sha256PasswordHasher hasher = new Sha256PasswordHasher();
+
+        String result = hasher.hash("secret");
+
+        assertEquals(64, result.length());
+        assertTrue(result.matches("[0-9a-f]{64}"));
+    }
+}

From d00975624cb3ebdd5d9b6048daac843fac9bc761 Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Wed, 15 Apr 2026 10:22:59 +0200
Subject: [PATCH 081/101] Added javadoc to multiple classes

---
 .../application/security/PasswordHasher.java  |  4 ++
 .../java/application/user/UserStatistics.java | 19 +++---
 src/main/java/domain/donation/Cause.java      |  3 +
 src/main/java/domain/donation/Donation.java   | 45 ++++++++++++++
 .../domain/organization/Organization.java     |  3 +
 src/main/java/domain/user/Role.java           |  3 +
 src/main/java/domain/user/User.java           | 62 +++++++++++++++++++
 .../InnsamlingskontrollenClient.java          |  5 ++
 .../security/Sha256PasswordHasher.java        | 14 ++++-
 src/main/java/persistence/UserRepository.java |  5 ++
 src/main/java/persistence/db/Database.java    | 16 +++++
 src/main/java/util/SessionManager.java        | 29 +++++++--
 12 files changed, 193 insertions(+), 15 deletions(-)

diff --git a/src/main/java/application/security/PasswordHasher.java b/src/main/java/application/security/PasswordHasher.java
index d708691..03e2564 100644
--- a/src/main/java/application/security/PasswordHasher.java
+++ b/src/main/java/application/security/PasswordHasher.java
@@ -1,5 +1,9 @@
 package application.security;
 
+/**
+ * Interface that creates a "contract" for which methods the class that implements it, needs.
+ * Interface is created for SHA256PasswordHasher.
+ */
 public interface PasswordHasher {
 
     String hash(String password);
diff --git a/src/main/java/application/user/UserStatistics.java b/src/main/java/application/user/UserStatistics.java
index b78f18f..ed0f2dc 100644
--- a/src/main/java/application/user/UserStatistics.java
+++ b/src/main/java/application/user/UserStatistics.java
@@ -8,8 +8,7 @@
 /**
  * Provides statistical information about a user's donation activity.
  * Acts as a service layer between the application and {@link DonationDao},
- * exposing user-friendly methods for retrieving donation history,
- * total amounts, and favorite organizations.
+ * showing relevant userstatistics to the user.
  */
 public class UserStatistics {
   private DonationDao donationDao;
@@ -24,9 +23,9 @@ public UserStatistics() {
   /**
    * Returns the top three organizations that the user has donated to most frequently.
    *
-   * @param user the user whose favorite organizations are to be retrieved; must not be null
+   * @param user the user whose favorite organizations are going to be returned.
    * @return a list of up to three formatted strings, each representing an organization
-   *         and its donation count; empty list if the user has no donations
+   *         and its donation count. Returns empty list if the user has no donations.
    */
   public List<String> userFavoriteOrganization(User user) {
     List<String> favoriteOrganization = donationDao.getFavoriteOrganization(user.getID());
@@ -37,8 +36,8 @@ public List<String> userFavoriteOrganization(User user) {
    * Returns a formatted list of all donations made by the user.
    * Each entry contains the donation amount, date, and organization.
    *
-   * @param user the user whose donation history is to be retrieved; must not be null
-   * @return a list of formatted donation strings; empty list if the user has no donations
+   * @param user the user whose donation history is returned.
+   * @return a list of formatted donation strings. Returns empty list if the user has no donations
    */
   public List<String> userDonations(User user) {
     List<String> userDonationList = donationDao.getUserDonations(user.getID());
@@ -48,8 +47,8 @@ public List<String> userDonations(User user) {
   /**
    * Returns the total amount donated by the user across all donations.
    *
-   * @param user the user whose total donation amount is to be calculated; must not be null
-   * @return a string representation of the total donated amount; {@code "0"} if no donations exist
+   * @param user the user whose total donation amount is returned.
+   * @return a string representation of the total donated amount. Returns "0" if no donations exist
    */
   public String userTotalDonationAmount(User user) {
     String totalDonations = donationDao.getTotalDonationAmount(user.getID());
@@ -59,8 +58,8 @@ public String userTotalDonationAmount(User user) {
   /**
    * Returns the total number of donations made by the user.
    *
-   * @param user the user whose donation count is to be retrieved; must not be null
-   * @return a string representation of the total number of donations; {@code "0"} if none exist
+   * @param user the user whose donation count is returned.
+   * @return a string representation of the total number of donations. Returns "0" if none exist.
    */
   public String getTotalDonationsMade(User user) {
     String totalDonationsMade = donationDao.getTotalDonationsMade(user.getID());
diff --git a/src/main/java/domain/donation/Cause.java b/src/main/java/domain/donation/Cause.java
index ae9311d..a69854e 100644
--- a/src/main/java/domain/donation/Cause.java
+++ b/src/main/java/domain/donation/Cause.java
@@ -1,3 +1,6 @@
 package domain.donation;
 
+/**
+ * Enum class that contains 5 different cause types
+ */
 public enum Cause { HEALTH, EMERGENCY_RELIEF, CHILDREN, ENVIRONMENT, CONFLICTS; }
diff --git a/src/main/java/domain/donation/Donation.java b/src/main/java/domain/donation/Donation.java
index ff49864..9835c00 100644
--- a/src/main/java/domain/donation/Donation.java
+++ b/src/main/java/domain/donation/Donation.java
@@ -7,6 +7,10 @@
 import java.time.LocalDateTime;
 import java.util.Objects;
 
+/**
+ * Donation object that defines what a Donation is.
+ * Provides set and get methods.
+ */
 public class Donation {
     private Long id; //get set to null by default,
     // Gets set to a value by database when registered?
@@ -15,6 +19,13 @@ public class Donation {
     private final User user;
     private final Organization organization;
 
+  /**
+   * Donation takes in parameters that is needed to define what a donation is.
+   * Requires both user and organization to be not null.
+   * @param amount
+   * @param user
+   * @param organization
+   */
     public Donation(BigDecimal amount, User user, Organization organization) {
         Objects.requireNonNull(amount, "Amount cannot be null");
         if (amount.compareTo(BigDecimal.ZERO) <= 0) {
@@ -27,6 +38,15 @@ public Donation(BigDecimal amount, User user, Organization organization) {
         this.organization = Objects.requireNonNull(organization, "Organization cannot be null");
     }
 
+
+    /**
+     * Sets the database-generated ID for this donation.
+     * Can only be set once — throws if the ID is already assigned.
+     *
+     * @param id the ID to assign; must be a positive non-null value
+     * @throws IllegalStateException if the ID has already been set
+     * @throws IllegalArgumentException if {@code id} is null or not positive
+     */
     public void setId(Long id) {
         if (this.id != null) {
             throw new IllegalStateException("ID is already set");
@@ -37,22 +57,47 @@ public void setId(Long id) {
         this.id = id;
     }
 
+    /**
+     * Returns the unique database ID of this donation.
+     *
+     * @return the donation ID
+     */
     public long getId() {
         return id;
     }
 
+    /**
+     * Returns the amount of this donation.
+     *
+     * @return the donation amount as a {@link BigDecimal}
+     */
     public BigDecimal getAmount() {
         return amount;
     }
 
+    /**
+     * Returns the date and time when this donation was created.
+     *
+     * @return the donation timestamp as a {@link LocalDateTime}
+     */
     public LocalDateTime getDateTime() {
         return dateTime;
     }
 
+    /**
+     * Returns the user who made this donation.
+     *
+     * @return the {@link User} associated with this donation
+     */
     public User getUser() {
         return user;
     }
 
+    /**
+     * Returns the organization this donation was made to.
+     *
+     * @return the {@link Organization} associated with this donation
+     */
     public Organization getOrganization() {
         return organization;
     }
diff --git a/src/main/java/domain/organization/Organization.java b/src/main/java/domain/organization/Organization.java
index cf45d2e..f0a470a 100644
--- a/src/main/java/domain/organization/Organization.java
+++ b/src/main/java/domain/organization/Organization.java
@@ -6,6 +6,9 @@
 
 import java.util.Objects;
 
+/**
+ * Class
+ */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Organization {
   
diff --git a/src/main/java/domain/user/Role.java b/src/main/java/domain/user/Role.java
index 1eba6cd..673390f 100644
--- a/src/main/java/domain/user/Role.java
+++ b/src/main/java/domain/user/Role.java
@@ -1,4 +1,7 @@
 package domain.user;
 
+/**
+ * Enum class that defines if a user has the role Admin or user.
+ */
 public enum Role {ADMIN, USER
 }
diff --git a/src/main/java/domain/user/User.java b/src/main/java/domain/user/User.java
index 69a51b8..8108d5a 100644
--- a/src/main/java/domain/user/User.java
+++ b/src/main/java/domain/user/User.java
@@ -1,5 +1,9 @@
 package domain.user;
 
+/**
+ * Class that defines what a User is.
+ * Contains get and set methods for each parameter, and validating methods.
+ */
 public class User {
   private String userName;
   private String phoneNumber;
@@ -7,6 +11,14 @@ public class User {
   private String password;
   private Long id;
 
+  /**
+   * Constructor that takes in the parameters that define a user.
+   * It contains input validation on all parameters.
+   * @param userName
+   * @param phoneNumber
+   * @param password
+   * @param eMail
+   */
   public User(String userName, String phoneNumber, String password, String eMail) {
 
     if (userName == null || userName.isBlank()) {
@@ -31,40 +43,90 @@ public User(String userName, String phoneNumber, String password, String eMail)
     this.password = password;
   }
 
+  /**
+   * Returns the username of this user.
+   *
+   * @return the username
+   */
   public String getUsername() {
     return userName;
   }
 
+  /**
+   * Returns the phone number of this user.
+   *
+   * @return the phone number
+   */
   public String getPhoneNumber() {
     return phoneNumber;
   }
 
+  /**
+   * Returns the email address of this user.
+   *
+   * @return the email address
+   */
   public String getEMail() {
     return eMail;
   }
 
+  /**
+   * Returns the password of this user.
+   *
+   * @return the password hash
+   */
   public String getPassword() {
     return password;
   }
 
+  /**
+   * Returns the ID of this user.
+   *
+   * @return the user ID
+   */
   public long getID() { return id; }
 
+  /**
+   * Sets a new password hash for this user.
+   *
+   * @param password the new password hash; must not be null
+   */
   public void setPassword(String password) {
     this.password = password;
   }
 
+  /**
+   * Sets a new username for this user.
+   *
+   * @param userName the new username; must not be null or blank
+   */
   public void setUsername(String userName) {
     this.userName = userName;
   }
 
+  /**
+   * Sets a new phone number for this user.
+   *
+   * @param phoneNumber the new phone number; must be exactly 8 digits
+   */
   public void setPhonenumber (String phoneNumber) {
     this.phoneNumber = phoneNumber;
   }
 
+  /**
+   * Sets the ID for this user.
+   *
+   * @param id the ID to assign
+   */
   public void setId(Long id) {
     this.id = id;
   }
 
+  /**
+   * Method that validates that a e-mail is in the right format.
+   * @param email
+   * @return
+   */
   private static boolean isValidEmail(String email) {
     if (email == null || email.isBlank()) return false;
     return email.matches("^[a-zA-Z0-9._%+\\-]+@[a-zA-Z0-9.\\-]+\\.[a-zA-Z]{2,}$");
diff --git a/src/main/java/integration/InnsamlingskontrollenClient.java b/src/main/java/integration/InnsamlingskontrollenClient.java
index c0786fa..1f97c5b 100644
--- a/src/main/java/integration/InnsamlingskontrollenClient.java
+++ b/src/main/java/integration/InnsamlingskontrollenClient.java
@@ -8,6 +8,11 @@
 import com.fasterxml.jackson.databind.ObjectMapper;
 import domain.organization.Organization;
 
+/**
+ * The InnsamlingskontrollenClient class provides functionality to fetch a list
+ * of organizations from the Innsamlingskontrollen API. The fetched data is
+ * represented as an array of Organization objects.
+ */
 public class InnsamlingskontrollenClient {
 
   public static Organization[] fetchOrganizations() throws Exception {
diff --git a/src/main/java/integration/security/Sha256PasswordHasher.java b/src/main/java/integration/security/Sha256PasswordHasher.java
index 2e59caa..d6c4a4f 100644
--- a/src/main/java/integration/security/Sha256PasswordHasher.java
+++ b/src/main/java/integration/security/Sha256PasswordHasher.java
@@ -4,9 +4,21 @@
 import java.security.MessageDigest;
 import java.nio.charset.StandardCharsets;
 
+/**
+ * Class that takes in the chosen password of a user, and hashes it.
+ */
 public class Sha256PasswordHasher implements PasswordHasher {
 
-    @Override
+  /**
+   * Method for hashing an inputted password.
+   * Uses the SHA-256 algorithm.
+   * Transforms the passoword to a UTF-8 byte-array, then digests it using SHA-256.
+   * The bytes are then formatted as a 64-character string.
+   * @param password
+   * @return a 64-character hash of the password.
+   * @throws RuntimeException if the hashing fails.
+   */
+  @Override
     public String hash(String password) {
       try {
         MessageDigest md = MessageDigest.getInstance("SHA-256");
diff --git a/src/main/java/persistence/UserRepository.java b/src/main/java/persistence/UserRepository.java
index 3aa8d43..9b92669 100644
--- a/src/main/java/persistence/UserRepository.java
+++ b/src/main/java/persistence/UserRepository.java
@@ -4,6 +4,11 @@
 
 import java.util.Optional;
 
+/**
+ * Interface that defines a "contract" for which methods the class that implements it has
+ * to contiain.
+ * Is created for UserDao class, to define which methods needs to be implemented.
+ */
 public interface UserRepository {
     Optional <User> findByUsername(String username);
     Optional <User> findByEmail(String email);
diff --git a/src/main/java/persistence/db/Database.java b/src/main/java/persistence/db/Database.java
index 889bba1..b110a70 100644
--- a/src/main/java/persistence/db/Database.java
+++ b/src/main/java/persistence/db/Database.java
@@ -8,6 +8,9 @@
 import java.sql.SQLException;
 import java.sql.Statement;
 
+/**
+ * Class that initializes and connects to the generated database.
+ */
 public final class Database {
   public static final String URL = "jdbc:sqlite:givehope.db";
 
@@ -15,6 +18,13 @@ public final class Database {
     initializeDatabase();
   }
 
+  /**
+   * Methods that provides a connection the URL/file that is initialized.
+   * Runs "PRAGMA FOREIGN KEYS = ON", which turns foreign key check on in SQLite.
+   * Connection class is used connects the java-code to the database/SQL-code.
+   * @return returns connection to database.
+   * @throws SQLException
+   */
   public static Connection getConnection() throws SQLException {
     Connection conn = DriverManager.getConnection(URL);
     try (Statement stmt = conn.createStatement()) {
@@ -23,6 +33,12 @@ public static Connection getConnection() throws SQLException {
     return conn;
   }
 
+  /**
+   * Method that initializes/creates the database.
+   * Uses file "schema.sql" to create, which contains SQL-code that creates the tables.
+   * Splits string at ";", to separate each CREATE TABLE-sentences.
+   * @throws RuntimeException if the schema file cannot be read or a database error occurs.
+   */
   public static void initializeDatabase() {
     try (Connection conn = DriverManager.getConnection(URL);
          Statement stmt = conn.createStatement()) {
diff --git a/src/main/java/util/SessionManager.java b/src/main/java/util/SessionManager.java
index 9d020c3..3cbf39c 100644
--- a/src/main/java/util/SessionManager.java
+++ b/src/main/java/util/SessionManager.java
@@ -2,25 +2,46 @@
 
 import domain.user.User;
 
+/**
+ * Class that manages current user session for the application.
+ * Has methods that keep track of if a user is signed in or not.
+ * Only one user can be signed in at a time.
+ */
 public class SessionManager {
     private static boolean SignedIn = false;
     private static User currentUser = null;
 
-    public static void signIn(User user) {
+  /**
+   * Signs in a user.
+   * Stores the user as the current session holder.
+   * @param the user tom sign in.
+   */
+  public static void signIn(User user) {
         SignedIn = true;
         currentUser = user;
     }
 
-    public static void signOut() {
+  /**
+   * Signs out current user by clearing session.
+   */
+  public static void signOut() {
         SignedIn = false;
         currentUser = null;
     }
 
-    public static boolean isSignedIn() {
+  /**
+   * Method returns boolean value on whether a user is signed in.
+   * @return false if user is not signed in, true if signed in.
+   */
+  public static boolean isSignedIn() {
         return SignedIn;
     }
 
-    public static User getCurrentUser() {
+  /**
+   * Method that returns the current user that the session contains.
+   * @return the current user
+   */
+  public static User getCurrentUser() {
         return currentUser;
     }
 }

From a406ff6d1797a6fbbea630f51524c1adedf57707 Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Wed, 15 Apr 2026 11:23:46 +0200
Subject: [PATCH 082/101] Added javadoc to UserRegister and UserSignIn

---
 .../java/application/user/UserRegister.java   | 26 ++++++++++++++++++-
 .../java/application/user/UserSignIn.java     | 23 +++++++++++++++-
 2 files changed, 47 insertions(+), 2 deletions(-)

diff --git a/src/main/java/application/user/UserRegister.java b/src/main/java/application/user/UserRegister.java
index 337b378..adc2107 100644
--- a/src/main/java/application/user/UserRegister.java
+++ b/src/main/java/application/user/UserRegister.java
@@ -4,16 +4,40 @@
 import domain.user.User;
 import persistence.UserRepository;
 
+/**
+ * The UserRegister class is responsible for handling the user registration process.
+ * It ensures that the provided user details meet the necessary criteria and that
+ * the username and email are not already in use. It also hashes the user's password
+ * before saving the user information into the repository.
+ */
 public class UserRegister {
 
     private final PasswordHasher hasher;
     private final UserRepository repo;
 
-    public UserRegister(PasswordHasher hasher, UserRepository repo) {
+  /**
+   * Constructs a {@code UserRegister} instance responsible for handling the user registration process.
+   * It ensures user details meet validation criteria, such as uniqueness of username and email,
+   * and hashes passwords before saving user information into the repository.
+   *
+   * @param hasher a {@code PasswordHasher} implementation used to hash user passwords.
+   * @param repo a {@code UserRepository} implementation responsible for storing user data.
+   */
+  public UserRegister(PasswordHasher hasher, UserRepository repo) {
         this.hasher = hasher;
         this.repo = repo;
     }
 
+  /**
+   * Executes a user registration.
+   * Validation checks, checks if username or e-mail already exists.
+   * Hashes inputted password using PasswordHasher, that uses SHA256PasswordHasher.
+   * Creates user object, and inserts it into UserRepository using insert method.
+   * @param username
+   * @param phoneNumber
+   * @param password
+   * @param email
+   */
     public void execute(String username, String phoneNumber, String password, String email) {
         username = username.trim();
         email = email.trim().toLowerCase();
diff --git a/src/main/java/application/user/UserSignIn.java b/src/main/java/application/user/UserSignIn.java
index 08a6dc6..be6b159 100644
--- a/src/main/java/application/user/UserSignIn.java
+++ b/src/main/java/application/user/UserSignIn.java
@@ -4,16 +4,37 @@
 import domain.user.User;
 import persistence.UserRepository;
 
+/**
+ * The UserSignIn class handles the process of user authentication.
+ * It verifies the input credentials (login and password) against the stored user data.
+ * The password is validated through hashing and comparison with the stored hash.
+ */
 public class UserSignIn {
 
     private final PasswordHasher hasher;
     private final UserRepository repo;
 
-    public UserSignIn(PasswordHasher hasher, UserRepository repo) {
+  /**
+   * Constructs a {@code UserSignIn} instance responsible for user authentication.
+   * It handles the process of verifying user credentials by comparing the provided
+   * input with stored data in the repository and validating the password through hashing.
+   *
+   * @param hasher a {@code PasswordHasher} implementation used to hash and validate user passwords.
+   * @param repo a {@code UserRepository} implementation that stores user authentication data.
+   */
+  public UserSignIn(PasswordHasher hasher, UserRepository repo) {
         this.hasher = hasher;
         this.repo = repo;
     }
 
+  /**
+   * Execute methods, that takes in inputted login and password.
+   * Checks via UserRepository if login exists in database.
+   * Compares hashed input password with hashed password in database.
+   * @param login inputted login by user
+   * @param password inputted password by user
+   * @return user object, if it exists.
+   */
     public User execute(String login, String password) {
         // normalize (trim etc.)
         login.trim().toLowerCase();

From 349171c8093e6af7ccddc1fe7f7c81c2a73f4e08 Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Wed, 15 Apr 2026 11:31:03 +0200
Subject: [PATCH 083/101] Added javadoc to Page enum and NavigationAware

---
 src/main/java/ui/Page.java                       |  4 ++++
 src/main/java/ui/controller/NavigationAware.java | 11 +++++++++++
 2 files changed, 15 insertions(+)

diff --git a/src/main/java/ui/Page.java b/src/main/java/ui/Page.java
index e2066c8..c788a50 100644
--- a/src/main/java/ui/Page.java
+++ b/src/main/java/ui/Page.java
@@ -1,5 +1,9 @@
 package ui;
 
+/**
+ * Represents the different pages available in the application, where each page
+ * is associated with a specific FXML file used for its layout.
+ */
 public enum Page {
     HOME("Home.fxml"),
     PROFILE("MyProfile.fxml"),
diff --git a/src/main/java/ui/controller/NavigationAware.java b/src/main/java/ui/controller/NavigationAware.java
index a04623e..82f215f 100644
--- a/src/main/java/ui/controller/NavigationAware.java
+++ b/src/main/java/ui/controller/NavigationAware.java
@@ -4,6 +4,17 @@
 
 import java.util.function.Consumer;
 
+/**
+ * Interface for controllers that need to navigate between pages.
+ * Controllers that implement this interface can switch to a different page
+ * by calling the navigation function they receive.
+ */
 public interface NavigationAware {
+
+    /**
+     * Sets the navigation function that the controller can use to switch pages.
+     *
+     * @param onNavigate a function that takes a {@link Page} and navigates to it
+     */
     void setOnNavigate(Consumer<Page> onNavigate);
 }
\ No newline at end of file

From fe579b974a32f7a35b5fb182511f81c4a16eb18d Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Wed, 15 Apr 2026 11:52:04 +0200
Subject: [PATCH 084/101] feat: add Jsoup dependency for web scraping
 organization details

---
 pom.xml | 19 +++++++++++++++++++
 1 file changed, 19 insertions(+)

diff --git a/pom.xml b/pom.xml
index 0f3156b..a888bc6 100644
--- a/pom.xml
+++ b/pom.xml
@@ -51,6 +51,12 @@
             <version>3.46.1.0</version>
         </dependency>
 
+        <dependency>
+            <groupId>org.jsoup</groupId>
+            <artifactId>jsoup</artifactId>
+            <version>1.17.2</version>
+        </dependency>
+
     </dependencies>
 
     <build>
@@ -73,6 +79,19 @@
                 <version>3.5.4</version>
             </plugin>
 
+            <plugin>
+                <groupId>org.openjfx</groupId>
+                <artifactId>javafx-maven-plugin</artifactId>
+                <version>0.0.8</version>
+                <configuration>
+                    <mainClass>app.Main</mainClass>
+                    <options>
+                        <option>-Dfile.encoding=UTF-8</option>
+                        <option>-Dstdout.encoding=UTF-8</option>
+                    </options>
+                </configuration>
+            </plugin>
+
         </plugins>
     </build>
 </project>
\ No newline at end of file

From 2acf915e18be97fb8a3e51775081cb2fa641bed7 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Wed, 15 Apr 2026 11:54:56 +0200
Subject: [PATCH 085/101] feat: add organization detail popup with logo,
 description and action buttons

---
 .../organization/OrganizationDetails.java     |  19 ++++
 .../java/ui/controller/MainController.java    |  54 ++++++++++
 .../ui/controller/OrganizationController.java |  11 +-
 .../OrganizationDetailController.java         | 102 ++++++++++++++++++
 src/main/resources/css/OrganizationView.css   |  59 ++++++++++
 src/main/resources/view/MainView.fxml         |  31 +++---
 .../resources/view/OrganizationDetail.fxml    |  56 ++++++++++
 7 files changed, 316 insertions(+), 16 deletions(-)
 create mode 100644 src/main/java/domain/organization/OrganizationDetails.java
 create mode 100644 src/main/java/ui/controller/OrganizationDetailController.java
 create mode 100644 src/main/resources/view/OrganizationDetail.fxml

diff --git a/src/main/java/domain/organization/OrganizationDetails.java b/src/main/java/domain/organization/OrganizationDetails.java
new file mode 100644
index 0000000..e892e82
--- /dev/null
+++ b/src/main/java/domain/organization/OrganizationDetails.java
@@ -0,0 +1,19 @@
+package domain.organization;
+
+public class OrganizationDetails {
+  private String description;
+  private String logoUrl;
+
+  public OrganizationDetails(String description, String logoUrl) {
+    this.description = description;
+    this.logoUrl = logoUrl;
+  }
+
+  public String getDescription() {
+    return description;
+  }
+
+  public String getLogoUrl() {
+    return logoUrl;
+  }
+}
diff --git a/src/main/java/ui/controller/MainController.java b/src/main/java/ui/controller/MainController.java
index b7077fc..aaa182b 100644
--- a/src/main/java/ui/controller/MainController.java
+++ b/src/main/java/ui/controller/MainController.java
@@ -3,11 +3,14 @@
 import application.user.UserRegister;
 import application.user.UserSignIn;
 import domain.organization.Organization;
+import domain.organization.OrganizationDetails;
+import integration.InnsamlingskontrollenClient;
 import integration.security.Sha256PasswordHasher;
 import javafx.fxml.FXML;
 import javafx.fxml.FXMLLoader;
 import javafx.scene.Parent;
 import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.VBox;
 import persistence.UserDao;
 import ui.DonationSession;
 import ui.Page;
@@ -24,6 +27,9 @@ public class MainController {
     @FXML
     private NavbarController navbarController;
 
+    @FXML
+    private VBox overlay;
+
     private DonationSession donationSession;
     private DonationFlowController donationFlowController;
 
@@ -79,6 +85,13 @@ public void loadPage(Page page) throws IOException {
         if (controller instanceof DonationSessionAware c) {
             c.setDonationSession(donationSession);
         }
+        if (controller instanceof OrganizationController c) {
+            c.setOnDonate(org -> {
+                try { loadDonationPage(org); }
+                catch (IOException e) { throw new RuntimeException(e); }
+            });
+            c.setOnShowDetail(org -> showOrganizationDetail(org));
+        }
 
         mainPane.setCenter(root);
         navbarController.setActivePage(page);
@@ -89,4 +102,45 @@ public void loadPage(Page page) throws IOException {
     public void loadDonationPage(Organization org) throws IOException {
         donationFlowController.start(org);
     }
+
+    public void showOrganizationDetail(Organization org) {
+        try {
+            FXMLLoader loader = new FXMLLoader(
+                getClass().getResource("/view/OrganizationDetail.fxml"));
+            Parent root = loader.load();
+
+            OrganizationDetails details =
+                InnsamlingskontrollenClient.fetchDetails(org.getUrl());
+
+            OrganizationDetailController controller = loader.getController();
+            controller.setOrganization(org, details);
+            controller.setOnClose(() -> {
+                overlay.setVisible(false);
+                overlay.setManaged(false);
+                overlay.getChildren().clear();
+            });
+            controller.setOnDonate(o -> {
+                overlay.setVisible(false);
+                overlay.setManaged(false);
+                overlay.getChildren().clear();
+                try {
+                    loadDonationPage(o);
+                } catch (IOException e) {
+                    throw new RuntimeException(e);
+                }
+            });
+
+            overlay.getChildren().clear();
+            overlay.getChildren().add(root);
+            overlay.setVisible(true);
+            overlay.setManaged(true);
+            overlay.setStyle("-fx-background-color: rgba(0,0,0,0.5);");
+            overlay.setMaxWidth(Double.MAX_VALUE);
+            overlay.setMaxHeight(Double.MAX_VALUE);
+            overlay.setAlignment(javafx.geometry.Pos.CENTER);
+
+        } catch (IOException e) {
+            throw new RuntimeException(e);
+        }
+    }
 }
diff --git a/src/main/java/ui/controller/OrganizationController.java b/src/main/java/ui/controller/OrganizationController.java
index e5f4ac2..ede0dd3 100644
--- a/src/main/java/ui/controller/OrganizationController.java
+++ b/src/main/java/ui/controller/OrganizationController.java
@@ -37,6 +37,8 @@ public class OrganizationController implements NavigationAware{
 
     private Consumer<Page> onNavigate;
     private Consumer<Organization> onDonate;
+    private Consumer<Organization> onShowDetail;
+
 
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
@@ -46,10 +48,16 @@ public void setOnDonate(Consumer<Organization> onDonate) {
         this.onDonate = onDonate;
     }
 
+    public void setOnShowDetail(Consumer<Organization> onShowDetail) {
+        this.onShowDetail = onShowDetail;
+    }
+
     public void initialize() {
         try {
             OrganizationDao dao = new OrganizationDao();
-            allOrgs = dao.getAll();
+            allOrgs = dao.getAll().stream()
+                .filter(org -> "approved".equals(org.getStatus()))
+                .collect(Collectors.toList());
             System.out.println("Fetched: " + allOrgs.size() + " organizations");
             filtrertOrgs = new ArrayList<>(allOrgs);
             showPage();
@@ -119,6 +127,7 @@ private VBox createCard(Organization org) {
         donateBtn.setMaxWidth(Double.MAX_VALUE);
         donateBtn.setOnAction(e -> onDonate.accept(org));
 
+        card.setOnMouseClicked(e -> onShowDetail.accept(org));
         card.getChildren().addAll(name, orgnr, status, donateBtn);
         return card;
     }
diff --git a/src/main/java/ui/controller/OrganizationDetailController.java b/src/main/java/ui/controller/OrganizationDetailController.java
new file mode 100644
index 0000000..96a8b74
--- /dev/null
+++ b/src/main/java/ui/controller/OrganizationDetailController.java
@@ -0,0 +1,102 @@
+package ui.controller;
+
+import domain.organization.Organization;
+import domain.organization.OrganizationDetails;
+import javafx.fxml.FXML;
+import javafx.scene.control.Button;
+import javafx.scene.control.Hyperlink;
+import javafx.scene.control.Label;
+import javafx.scene.image.Image;
+import javafx.scene.image.ImageView;
+import ui.Page;
+
+import java.awt.Desktop;
+import java.net.URI;
+import java.util.function.Consumer;
+
+public class OrganizationDetailController {
+
+  @FXML private Label nameLabel;
+  @FXML private Label orgNumberLabel;
+  @FXML private Label verifiedLabel;
+  @FXML private Label descriptionLabel;
+  @FXML private ImageView logoImageView;
+  @FXML private Hyperlink readMoreLink;
+
+
+  private Organization organization;
+  private Consumer<Organization> onDonate;
+  private Runnable onClose;
+
+  public void setOrganization(Organization org, OrganizationDetails details) {
+    this.organization = org;
+    nameLabel.setText(org.getName());
+    orgNumberLabel.setText("Org.nr: " + org.getOrgNumber());
+    verifiedLabel.setText(org.isPreApproved() ? "✓ Forhåndsgodkjent" : "✓ Verified");
+
+    if (details.getDescription() != null && !details.getDescription().isBlank()) {
+      String description = details.getDescription();
+      if (description.length() > 300) {
+        int lastPeriod = description.lastIndexOf(".", 300);
+        description = lastPeriod > 0
+            ? description.substring(0, lastPeriod + 1)
+            : description.substring(0, 300) + "...";
+        readMoreLink.setVisible(true);
+        readMoreLink.setManaged(true);
+      }
+      descriptionLabel.setText(description);
+    } else {
+      descriptionLabel.setText("No description available.");
+    }
+
+
+
+    if (details.getLogoUrl() != null && !details.getLogoUrl().isBlank()) {
+      try {
+        Image image = new Image(details.getLogoUrl(), true);
+        image.errorProperty().addListener((obs, old, error) -> {
+          if (error) {
+            logoImageView.setVisible(false);
+          }
+        });
+        logoImageView.setImage(image);
+      } catch (Exception e) {
+        logoImageView.setVisible(false);
+      }
+    } else {
+      logoImageView.setVisible(false);
+    }
+  }
+
+  public void setOnDonate(Consumer<Organization> onDonate) {
+    this.onDonate = onDonate;
+  }
+
+  public void setOnClose(Runnable onClose) {
+    this.onClose = onClose;
+  }
+
+  @FXML
+  public void handleClose() {
+    if (onClose != null) onClose.run();
+  }
+
+  @FXML
+  public void handleDonate() {
+    if (onDonate != null) onDonate.accept(organization);
+  }
+
+  @FXML
+  public void handleVisitWebsite() {
+    try {
+      Desktop.getDesktop().browse(new URI(organization.getUrl()));
+    } catch (Exception e) {
+      e.printStackTrace();
+    }
+  }
+
+  @FXML
+  public void handleReadMore() {
+    handleVisitWebsite();
+  }
+}
diff --git a/src/main/resources/css/OrganizationView.css b/src/main/resources/css/OrganizationView.css
index 6904bfd..18c0a90 100644
--- a/src/main/resources/css/OrganizationView.css
+++ b/src/main/resources/css/OrganizationView.css
@@ -10,6 +10,12 @@
     -fx-cursor: hand;
 }
 
+.org-card:pressed {
+    -fx-scale-x: 0.98;
+    -fx-scale-y: 0.98;
+    -fx-effect: dropshadow(gaussian, rgba(0,0,0,0.05), 4, 0, 0, 2);
+}
+
 .org-name {
     -fx-font-size: 20px;
 }
@@ -55,4 +61,57 @@
 
 .search-field:focused {
     -fx-border-color: #3a86ff;
+}
+
+
+.detail-header {
+    -fx-background-color: #1e3a8a;
+    -fx-padding: 15 20 15 20;
+    -fx-alignment: CENTER_LEFT;
+    -fx-spacing: 10;
+}
+
+.detail-title {
+    -fx-font-size: 20px;
+    -fx-font-weight: bold;
+    -fx-text-fill: white;
+    -fx-hgrow: always;
+}
+
+.detail-close-button {
+    -fx-background-color: transparent;
+    -fx-text-fill: white;
+    -fx-font-size: 16px;
+    -fx-cursor: hand;
+    -fx-border-color: transparent;
+}
+
+.detail-close-button:hover {
+    -fx-background-color: rgba(255,255,255,0.2);
+    -fx-background-radius: 50;
+}
+
+.detail-content {
+    -fx-padding: 20;
+    -fx-spacing: 15;
+    -fx-background-color: white;
+}
+
+.detail-verified {
+    -fx-background-color: #e8f5e9;
+    -fx-text-fill: #2d6a4f;
+    -fx-padding: 4 10 4 10;
+    -fx-background-radius: 4;
+    -fx-font-size: 12px;
+}
+
+.detail-orgnr {
+    -fx-font-size: 12px;
+    -fx-text-fill: #666666;
+}
+
+.detail-description {
+    -fx-font-size: 13px;
+    -fx-text-fill: #333333;
+    -fx-wrap-text: true;
 }
\ No newline at end of file
diff --git a/src/main/resources/view/MainView.fxml b/src/main/resources/view/MainView.fxml
index 6b655b0..671a97b 100644
--- a/src/main/resources/view/MainView.fxml
+++ b/src/main/resources/view/MainView.fxml
@@ -1,21 +1,22 @@
 <?xml version="1.0" encoding="UTF-8"?>
 
-<?import java.lang.*?>
-<?import java.util.*?>
-<?import javafx.scene.*?>
-<?import javafx.scene.control.*?>
-<?import javafx.scene.layout.*?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.StackPane?>
+<?import javafx.scene.layout.VBox?>
 
 <!-- MainView.fxml -->
-<BorderPane fx:id="mainPane"
-            fx:controller="ui.controller.MainController"
-            stylesheets="@../css/Global.css"
-            xmlns="http://javafx.com/javafx/25"
-            xmlns:fx="http://javafx.com/fxml/1">
-    <top>
-        <fx:include fx:id="navbar" source="Navbar.fxml" />
-    </top>
-    <center>
+
+
+<StackPane xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.MainController">
+   <children>
+      <BorderPane fx:id="mainPane" stylesheets="@../css/Global.css">
+          <top>
+              <fx:include fx:id="navbar" source="Navbar.fxml" />
+          </top>
+          <center>
         <!-- her swapper du inn Home, Donate, Profile osv -->
     </center>
-</BorderPane>
+      </BorderPane>
+      <VBox fx:id="overlay" alignment="CENTER" prefHeight="200.0" prefWidth="100.0" visible="false" StackPane.alignment="CENTER" />
+   </children>
+</StackPane>
diff --git a/src/main/resources/view/OrganizationDetail.fxml b/src/main/resources/view/OrganizationDetail.fxml
new file mode 100644
index 0000000..7f46012
--- /dev/null
+++ b/src/main/resources/view/OrganizationDetail.fxml
@@ -0,0 +1,56 @@
+<?xml version="1.0" encoding="UTF-8"?>
+
+<?import java.net.URL?>
+<?import javafx.scene.control.Button?>
+<?import javafx.scene.control.Hyperlink?>
+<?import javafx.scene.control.Label?>
+<?import javafx.scene.control.Separator?>
+<?import javafx.scene.image.ImageView?>
+<?import javafx.scene.layout.BorderPane?>
+<?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
+<?import javafx.scene.layout.VBox?>
+
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.OrganizationDetailController">
+   <top>
+      <HBox prefHeight="100.0" prefWidth="200.0" styleClass="detail-header" BorderPane.alignment="CENTER">
+         <children>
+            <Label fx:id="nameLabel" styleClass="detail-title" text="Label" wrapText="true" />
+            <Region prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
+            <Button fx:id="closeButton" mnemonicParsing="false" onAction="#handleClose" styleClass="detail-close-button" text="x" />
+         </children>
+      </HBox>
+   </top>
+   <center>
+      <VBox prefHeight="200.0" prefWidth="100.0" styleClass="detail-content" BorderPane.alignment="CENTER">
+         <children>
+            <HBox prefHeight="100.0" prefWidth="200.0">
+               <children>
+                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
+                     <children>
+                        <Label fx:id="verifiedLabel" styleClass="detail-verified" text="✓ Verified" />
+                        <Label fx:id="orgNumberLabel" styleClass="detail-orgnr" text="orgNumberLabel" />
+                     </children>
+                  </VBox>
+                  <Region prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
+                  <ImageView fx:id="logoImageView" fitHeight="100.0" fitWidth="250.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="ALWAYS" />
+               </children>
+            </HBox>
+            <Separator prefWidth="200.0" />
+            <Label fx:id="descriptionLabel" styleClass="detail-description" wrapText="true" />
+            <Hyperlink fx:id="readMoreLink" onAction="#handleReadMore" text="Read more on their website ↗" visible="false" />
+            <Separator prefWidth="200.0" />
+            <HBox alignment="CENTER" spacing="50.0">
+               <children>
+                  <Button fx:id="donateButton" mnemonicParsing="false" onAction="#handleDonate" styleClass="confirm-button" text="Donate" />
+                  <Button fx:id="visitWebsiteButton" mnemonicParsing="false" onAction="#handleVisitWebsite" styleClass="secondary-button" text="Visit Website" />
+               </children>
+            </HBox>
+         </children>
+      </VBox>
+   </center>
+   <stylesheets>
+      <URL value="@../css/OrganizationView.css" />
+      <URL value="@../css/Global.css" />
+   </stylesheets>
+</BorderPane>

From 93d9ab7db9e87a975d868cf98fe4d00ef9b9581c Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Wed, 15 Apr 2026 11:55:10 +0200
Subject: [PATCH 086/101] feat: add fetchDetails method to scrape description
 and logo from Innsamlingskontrollen

---
 .../InnsamlingskontrollenClient.java          | 41 +++++++++++++++++++
 1 file changed, 41 insertions(+)

diff --git a/src/main/java/integration/InnsamlingskontrollenClient.java b/src/main/java/integration/InnsamlingskontrollenClient.java
index c0786fa..0699c7d 100644
--- a/src/main/java/integration/InnsamlingskontrollenClient.java
+++ b/src/main/java/integration/InnsamlingskontrollenClient.java
@@ -4,9 +4,14 @@
 import java.net.http.HttpClient;
 import java.net.http.HttpRequest;
 import java.net.http.HttpResponse;
+import java.nio.charset.StandardCharsets;
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import domain.organization.Organization;
+import domain.organization.OrganizationDetails;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+
 
 public class InnsamlingskontrollenClient {
 
@@ -24,4 +29,40 @@ public static Organization[] fetchOrganizations() throws Exception {
 
     return mapper.readValue(response.body(), Organization[].class);
   }
+
+  public static OrganizationDetails fetchDetails(String url) {
+    try {
+      org.jsoup.Connection conn = Jsoup.connect(url);
+      conn.timeout(10000);
+      Document doc = conn.get();
+      doc.charset(StandardCharsets.UTF_8);
+      System.out.println(doc.select("section.information").text());
+
+      String description = "";
+      System.out.println("Section size: " + doc.select("section.information div > p").size());
+      for (org.jsoup.nodes.Element p : doc.select("section.information div > p")) {
+        System.out.println("P element: " + p.text());
+        if (!p.text().isBlank()) {
+          description = p.text();
+          break;
+        }
+      }
+
+      if (description.isBlank()) {
+        String sectionText = doc.select("section.information").text();
+        if (!sectionText.isBlank()) {
+          int lesmerIndex = sectionText.indexOf("Les mer");
+          description = lesmerIndex > 0
+              ? sectionText.substring(0, lesmerIndex).trim()
+              : sectionText;
+        }
+      }
+
+      String logoUrl = doc.select("img[src*=logo]").attr("src");
+
+      return new OrganizationDetails(description, logoUrl);
+    } catch (Exception e) {
+      return new OrganizationDetails("", "");
+    }
+  }
 }

From bacf2ecf31595bf69217c341beb1c65d23ccffcf Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Wed, 15 Apr 2026 11:55:24 +0200
Subject: [PATCH 087/101] refactor: move shared button styles to Global.css and
 clean up unused styles

---
 src/main/resources/css/Donation.css | 23 -----------------------
 src/main/resources/css/Global.css   | 22 ++++++++++++++++++++++
 2 files changed, 22 insertions(+), 23 deletions(-)

diff --git a/src/main/resources/css/Donation.css b/src/main/resources/css/Donation.css
index 68722d4..ec92d1f 100644
--- a/src/main/resources/css/Donation.css
+++ b/src/main/resources/css/Donation.css
@@ -96,27 +96,4 @@
 .success-icon {
     -fx-font-size: 48px;
     -fx-text-fill: #2d6a4f;
-}
-
-.secondary-button {
-    -fx-background-color: transparent;
-    -fx-border-color: #1e3a8a;
-    -fx-border-width: 1.5;
-    -fx-border-radius: 6;
-    -fx-background-radius: 6;
-    -fx-text-fill: #1e3a8a;
-    -fx-font-weight: bold;
-    -fx-padding: 10 24 10 24;
-    -fx-cursor: hand;
-    -fx-font-size: 14px;
-}
-
-.secondary-button:hover {
-    -fx-background-color: #f0f4ff;
-}
-
-.secondary-button:pressed {
-    -fx-background-color: #dce6f7;
-    -fx-scale-x: 0.97;
-    -fx-scale-y: 0.97;
 }
\ No newline at end of file
diff --git a/src/main/resources/css/Global.css b/src/main/resources/css/Global.css
index c7af883..7a2eeac 100644
--- a/src/main/resources/css/Global.css
+++ b/src/main/resources/css/Global.css
@@ -165,3 +165,25 @@
     -fx-pref-height: 40px;
 }
 
+.secondary-button {
+    -fx-background-color: transparent;
+    -fx-border-color: #1e3a8a;
+    -fx-border-width: 1.5;
+    -fx-border-radius: 6;
+    -fx-background-radius: 6;
+    -fx-text-fill: #1e3a8a;
+    -fx-font-weight: bold;
+    -fx-padding: 10 24 10 24;
+    -fx-cursor: hand;
+    -fx-font-size: 14px;
+}
+
+.secondary-button:hover {
+    -fx-background-color: #f0f4ff;
+}
+
+.secondary-button:pressed {
+    -fx-background-color: #dce6f7;
+    -fx-scale-x: 0.97;
+    -fx-scale-y: 0.97;
+}

From 6f8eb57d3126a2871b0ae4945f0145e6083ea45e Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Wed, 15 Apr 2026 11:55:36 +0200
Subject: [PATCH 088/101] chore: minor changes

---
 src/main/java/app/Main.java | 10 +++++++---
 1 file changed, 7 insertions(+), 3 deletions(-)

diff --git a/src/main/java/app/Main.java b/src/main/java/app/Main.java
index e9947a6..fea73ff 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/app/Main.java
@@ -1,19 +1,18 @@
 package app;
 
 import domain.organization.Organization;
+import domain.organization.OrganizationDetails;
 import integration.InnsamlingskontrollenClient;
 import application.security.PasswordHasher;
-import application.user.UserRegister;
 import domain.donation.Donation;
 import domain.user.User;
 import integration.security.Sha256PasswordHasher;
 import java.math.BigDecimal;
 import java.sql.SQLException;
-import java.util.List;
+
 import persistence.DonationDao;
 import persistence.OrganizationDao;
 import persistence.UserDao;
-import persistence.UserRepository;
 import persistence.db.Database;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
@@ -30,6 +29,11 @@ public static void main(String[] args) {
   public void start(Stage stage) throws Exception {
     Database.initializeDatabase();
     System.out.println("DB path: " + new java.io.File("givehope.db").getAbsolutePath());
+    OrganizationDetails details = InnsamlingskontrollenClient.fetchDetails(
+        "https://www.innsamlingskontrollen.no/organisasjoner/caritas-norge/"
+    );
+    System.out.println("Description: " + details.getDescription());
+    System.out.println("Logo: " + details.getLogoUrl());
     OrganizationDao orgDao = new OrganizationDao();
     Organization[] orgs = InnsamlingskontrollenClient.fetchOrganizations();
     for (Organization org : orgs) {

From 64e470c2fb416c96462fe3aab330b4e3f4dde8f2 Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Thu, 16 Apr 2026 09:35:46 +0200
Subject: [PATCH 089/101] Deleted not-used CauseDao class

---
 src/main/java/persistence/CauseDao.java | 4 ----
 1 file changed, 4 deletions(-)
 delete mode 100644 src/main/java/persistence/CauseDao.java

diff --git a/src/main/java/persistence/CauseDao.java b/src/main/java/persistence/CauseDao.java
deleted file mode 100644
index 4ed035d..0000000
--- a/src/main/java/persistence/CauseDao.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package persistence;
-
-public class CauseDao {
-}

From 37089010fb30276c315db33e213ec96c75cf88ec Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 16 Apr 2026 09:46:32 +0200
Subject: [PATCH 090/101] Javadoc for UI classes

---
 src/main/java/ui/DonationSession.java      | 47 ++++++++++------------
 src/main/java/ui/DonationSessionAware.java | 10 +++++
 src/main/java/ui/Page.java                 | 10 ++++-
 3 files changed, 39 insertions(+), 28 deletions(-)

diff --git a/src/main/java/ui/DonationSession.java b/src/main/java/ui/DonationSession.java
index 991f91a..0d3bf1d 100644
--- a/src/main/java/ui/DonationSession.java
+++ b/src/main/java/ui/DonationSession.java
@@ -2,51 +2,46 @@
 
 import domain.organization.Organization;
 
+/**
+ * Holds the state of an ongoing donation session.
+ * Passed between donation flow controllers to carry
+ * the selected organization and amount.
+ */
 public class DonationSession {
     private Organization organization;
     private int amount;
-    private String name;
-    private String email;
-    private String phone;
 
+    /**
+     * Returns the organization selected for donation.
+     * @return the selected organization
+     */
     public Organization getOrganization() {
         return organization;
     }
 
+    /**
+     * Returns the donation amount.
+     * @return the amount in NOK
+     */
     public int getAmount() {
         return amount;
     }
 
-    public String getName() {
-        return name;
-    }
-
-    public String getEmail() {
-        return email;
-    }
-
-    public String getPhone() {
-        return phone;
-    }
-
+    /**
+     * Sets the organization to donate to.
+     * @param organization the organization to set
+     */
     public void setOrganization(Organization organization) {
         this.organization = organization;
     }
 
+    /**
+     * Sets the donation amount.
+     * @param amount the amount in NOK
+     */
     public void setAmount(int amount) {
         this.amount = amount;
     }
 
-    public void setName(String name) {
-        this.name = name;
-    }
-
-    public void setEmail(String email) {
-        this.email = email;
-    }
-
-    public void setPhone(String phone) {
-        this.phone = phone;
-    }
 }
 
diff --git a/src/main/java/ui/DonationSessionAware.java b/src/main/java/ui/DonationSessionAware.java
index 8ceab22..75b9965 100644
--- a/src/main/java/ui/DonationSessionAware.java
+++ b/src/main/java/ui/DonationSessionAware.java
@@ -1,5 +1,15 @@
 package ui;
 
+/**
+ * Interface for controllers that participate in the donation flow.
+ * Implementing controllers receive the current {@link DonationSession}
+ * when they are loaded.
+ */
 public interface DonationSessionAware {
+
+    /**
+     * Sets the current donation session.
+     * @param session the active donation session
+     */
     void setDonationSession(DonationSession session);
 }
diff --git a/src/main/java/ui/Page.java b/src/main/java/ui/Page.java
index 7dbf0e0..77cac0f 100644
--- a/src/main/java/ui/Page.java
+++ b/src/main/java/ui/Page.java
@@ -16,14 +16,20 @@ public enum Page {
     DONATION_PAYMENT("DonationPayment.fxml"),
     DONATION_CONFIRMATION("DonationConfirmation.fxml");
 
-
-
     private final String fileName;
 
+    /**
+     * Constructs a Page with the associated FXML filename.
+     * @param fileName the name of the FXML file for this page
+     */
     Page(String fileName) {
         this.fileName = fileName;
     }
 
+    /**
+     * Returns the FXML filename associated with this page.
+     * @return the FXML filename
+     */
     public String getFileName() {
         return fileName;
     }

From e22cc28c2422744b5b4809503f17e5dbfd4c503c Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 16 Apr 2026 14:13:22 +0200
Subject: [PATCH 091/101] Documentation: Added javadoc and removed unused
 method and files

---
 src/main/java/app/Main.java                   |  6 +-
 .../java/application/user/UserDonate.java     | 16 ++++-
 .../java/application/user/UserRegister.java   |  7 +--
 .../java/application/user/UserSignIn.java     |  7 +--
 .../java/application/user/UserStatistics.java | 16 ++---
 src/main/java/domain/donation/Cause.java      |  6 --
 src/main/java/domain/donation/Donation.java   |  3 +-
 .../domain/organization/Organization.java     | 59 +++++++++++++++++--
 .../organization/OrganizationDetails.java     | 21 ++++++-
 src/main/java/domain/user/Role.java           |  7 ---
 src/main/java/domain/user/User.java           | 45 +++-----------
 .../InnsamlingskontrollenClient.java          | 15 ++++-
 .../security/Sha256PasswordHasher.java        |  4 +-
 src/main/java/persistence/CauseDao.java       |  4 --
 .../persistence/{ => dao}/DonationDao.java    |  2 +-
 .../{ => dao}/OrganizationDao.java            |  2 +-
 .../java/persistence/{ => dao}/UserDao.java   | 13 +---
 .../persistence/{ => dao}/UserRepository.java |  3 +-
 .../java/ui/controller/HomeController.java    | 14 ++---
 .../java/ui/controller/MainController.java    | 30 +++++++---
 .../ui/controller/MyProfileController.java    | 10 +++-
 .../java/ui/controller/NavbarController.java  | 38 +++++++++---
 .../ui/controller/OrganizationController.java | 21 +++++--
 .../OrganizationDetailController.java         | 21 ++++++-
 .../ui/controller/RegisterController.java     | 35 +++++++----
 .../java/ui/controller/SignInController.java  | 24 ++++----
 .../donation/DonationAmountController.java    | 19 ++++++
 .../DonationConfirmationController.java       | 13 +++-
 .../donation/DonationFlowController.java      | 25 ++++++++
 .../DonationNotLoggedInController.java        | 16 ++++-
 .../donation/DonationPaymentController.java   | 21 ++++++-
 src/main/java/util/SessionManager.java        |  2 +-
 32 files changed, 356 insertions(+), 169 deletions(-)
 delete mode 100644 src/main/java/domain/donation/Cause.java
 delete mode 100644 src/main/java/domain/user/Role.java
 delete mode 100644 src/main/java/persistence/CauseDao.java
 rename src/main/java/persistence/{ => dao}/DonationDao.java (99%)
 rename src/main/java/persistence/{ => dao}/OrganizationDao.java (98%)
 rename src/main/java/persistence/{ => dao}/UserDao.java (94%)
 rename src/main/java/persistence/{ => dao}/UserRepository.java (95%)

diff --git a/src/main/java/app/Main.java b/src/main/java/app/Main.java
index fea73ff..8c34abd 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/app/Main.java
@@ -10,9 +10,9 @@
 import java.math.BigDecimal;
 import java.sql.SQLException;
 
-import persistence.DonationDao;
-import persistence.OrganizationDao;
-import persistence.UserDao;
+import persistence.dao.DonationDao;
+import persistence.dao.OrganizationDao;
+import persistence.dao.UserDao;
 import persistence.db.Database;
 import javafx.application.Application;
 import javafx.fxml.FXMLLoader;
diff --git a/src/main/java/application/user/UserDonate.java b/src/main/java/application/user/UserDonate.java
index bf8f187..bf3889f 100644
--- a/src/main/java/application/user/UserDonate.java
+++ b/src/main/java/application/user/UserDonate.java
@@ -3,17 +3,29 @@
 import domain.donation.Donation;
 import domain.organization.Organization;
 import domain.user.User;
-import persistence.DonationDao;
-
+import persistence.dao.DonationDao;
 import java.math.BigDecimal;
 
+/**
+ * Use case for handling donations made by a user to an organization.
+ * Creates a {@link Donation} and persists it to the database.
+ */
 public class UserDonate {
     private final DonationDao donationDao;
 
+    /**
+     * Creates a new {@code UserDonate} with a default {@link DonationDao}.
+     */
     public UserDonate() {
         this.donationDao = new DonationDao();
     }
 
+    /**
+     * Executes the donation use case by creating and saving a donation.
+     * @param user the user making the donation
+     * @param org the organization receiving the donation
+     * @param amount the donation amount in NOK
+     */
     public void execute(User user, Organization org, BigDecimal amount) {
         Donation donation = new Donation(amount, user, org);
         donationDao.insert(donation);
diff --git a/src/main/java/application/user/UserRegister.java b/src/main/java/application/user/UserRegister.java
index adc2107..0a07316 100644
--- a/src/main/java/application/user/UserRegister.java
+++ b/src/main/java/application/user/UserRegister.java
@@ -2,7 +2,7 @@
 
 import application.security.PasswordHasher;
 import domain.user.User;
-import persistence.UserRepository;
+import persistence.dao.UserRepository;
 
 /**
  * The UserRegister class is responsible for handling the user registration process.
@@ -43,7 +43,6 @@ public void execute(String username, String phoneNumber, String password, String
         email = email.trim().toLowerCase();
         phoneNumber = phoneNumber.trim();
 
-        // duplicate check (repo.existsByEmail)
         if (repo.existsByEmail(email)) {
             throw new IllegalArgumentException("Email already in use");
         }
@@ -51,13 +50,9 @@ public void execute(String username, String phoneNumber, String password, String
             throw new IllegalArgumentException("This username is taken");
         }
 
-        // hash password (optional)
         String hashedPassword = hasher.hash(password);
 
-        // new User(...)  (domain validates)
         User user = new User(username, phoneNumber, hashedPassword, email);
-
-        // saves user
         repo.insert(user);
     }
 }
diff --git a/src/main/java/application/user/UserSignIn.java b/src/main/java/application/user/UserSignIn.java
index be6b159..f7ea596 100644
--- a/src/main/java/application/user/UserSignIn.java
+++ b/src/main/java/application/user/UserSignIn.java
@@ -2,7 +2,7 @@
 
 import application.security.PasswordHasher;
 import domain.user.User;
-import persistence.UserRepository;
+import persistence.dao.UserRepository;
 
 /**
  * The UserSignIn class handles the process of user authentication.
@@ -36,22 +36,17 @@ public UserSignIn(PasswordHasher hasher, UserRepository repo) {
    * @return user object, if it exists.
    */
     public User execute(String login, String password) {
-        // normalize (trim etc.)
         login.trim().toLowerCase();
 
         User user = repo.findByLogin(login)
                 .orElseThrow(() -> new IllegalArgumentException("Invalid credentials"));
 
-        // hash password (optional)
         String hashedInput = hasher.hash(password);
 
-        // compare hashed input with stored hash
         if (!hashedInput.equals(user.getPassword())) {
             throw new IllegalArgumentException("Invalid password");
         }
 
-        System.out.println("Loggin in");
-        // return user (if match)
         return user;
     }
 }
diff --git a/src/main/java/application/user/UserStatistics.java b/src/main/java/application/user/UserStatistics.java
index ed0f2dc..4d3b960 100644
--- a/src/main/java/application/user/UserStatistics.java
+++ b/src/main/java/application/user/UserStatistics.java
@@ -1,9 +1,9 @@
 package application.user;
 
 import domain.user.User;
-import java.util.ArrayList;
+
 import java.util.List;
-import persistence.DonationDao;
+import persistence.dao.DonationDao;
 
 /**
  * Provides statistical information about a user's donation activity.
@@ -28,8 +28,7 @@ public UserStatistics() {
    *         and its donation count. Returns empty list if the user has no donations.
    */
   public List<String> userFavoriteOrganization(User user) {
-    List<String> favoriteOrganization = donationDao.getFavoriteOrganization(user.getID());
-    return favoriteOrganization;
+    return donationDao.getFavoriteOrganization(user.getID());
   }
 
   /**
@@ -40,8 +39,7 @@ public List<String> userFavoriteOrganization(User user) {
    * @return a list of formatted donation strings. Returns empty list if the user has no donations
    */
   public List<String> userDonations(User user) {
-    List<String> userDonationList = donationDao.getUserDonations(user.getID());
-    return userDonationList;
+    return donationDao.getUserDonations(user.getID());
   }
 
   /**
@@ -51,8 +49,7 @@ public List<String> userDonations(User user) {
    * @return a string representation of the total donated amount. Returns "0" if no donations exist
    */
   public String userTotalDonationAmount(User user) {
-    String totalDonations = donationDao.getTotalDonationAmount(user.getID());
-    return totalDonations;
+    return donationDao.getTotalDonationAmount(user.getID());
   }
 
   /**
@@ -62,7 +59,6 @@ public String userTotalDonationAmount(User user) {
    * @return a string representation of the total number of donations. Returns "0" if none exist.
    */
   public String getTotalDonationsMade(User user) {
-    String totalDonationsMade = donationDao.getTotalDonationsMade(user.getID());
-    return totalDonationsMade;
+    return donationDao.getTotalDonationsMade(user.getID());
   }
 }
diff --git a/src/main/java/domain/donation/Cause.java b/src/main/java/domain/donation/Cause.java
deleted file mode 100644
index a69854e..0000000
--- a/src/main/java/domain/donation/Cause.java
+++ /dev/null
@@ -1,6 +0,0 @@
-package domain.donation;
-
-/**
- * Enum class that contains 5 different cause types
- */
-public enum Cause { HEALTH, EMERGENCY_RELIEF, CHILDREN, ENVIRONMENT, CONFLICTS; }
diff --git a/src/main/java/domain/donation/Donation.java b/src/main/java/domain/donation/Donation.java
index 9835c00..53e1063 100644
--- a/src/main/java/domain/donation/Donation.java
+++ b/src/main/java/domain/donation/Donation.java
@@ -12,8 +12,7 @@
  * Provides set and get methods.
  */
 public class Donation {
-    private Long id; //get set to null by default,
-    // Gets set to a value by database when registered?
+    private Long id;
     private final BigDecimal amount;
     private final LocalDateTime dateTime;
     private final User user;
diff --git a/src/main/java/domain/organization/Organization.java b/src/main/java/domain/organization/Organization.java
index f0a470a..2c5ff30 100644
--- a/src/main/java/domain/organization/Organization.java
+++ b/src/main/java/domain/organization/Organization.java
@@ -2,12 +2,11 @@
 
 import com.fasterxml.jackson.annotation.JsonIgnoreProperties;
 import com.fasterxml.jackson.annotation.JsonProperty;
-import domain.donation.Cause;
 
-import java.util.Objects;
 
 /**
- * Class
+ * Represents a charitable organization retrieved from the Innsamlingskontrollen API.
+ * Contains basic information such as name, organization number, status and URL.
  */
 @JsonIgnoreProperties(ignoreUnknown = true)
 public class Organization {
@@ -25,23 +24,71 @@ public class Organization {
     private String url;
 
     @JsonProperty("is_pre_approved")
-    private boolean isPreApproved;
+    public boolean isPreApproved;
 
-    public Organization() {}
 
+    public Organization() {}
 
+    /**
+     * Returns the organization number.
+     * @return the organization number
+     */
     public String getOrgNumber() { return orgNumber; }
+
+    /**
+     * Sets the organization number.
+     * @param orgNumber the organization number to set
+     */
     public void setOrgNumber(String orgNumber) { this.orgNumber = orgNumber; }
 
+    /**
+     * Returns the name of the organization.
+     * @return the organization name
+     */
     public String getName() { return name; }
+
+    /**
+     * Sets the name of the organization.
+     * @param name the name to set
+     */
     public void setName(String name) { this.name = name; }
 
+    /**
+     * Returns the approval status of the organization.
+     * @return the status, either "approved" or "obs"
+     */
     public String getStatus() { return status; }
+
+    /**
+     * Sets the approval status of the organization.
+     * @param status the status to set
+     */
     public void setStatus(String status) { this.status = status; }
 
+    /**
+     * Returns the URL to the organization's page on Innsamlingskontrollen.
+     * @return the URL
+     */
     public String getUrl() { return url; }
+
+    /**
+     * Sets the URL to the organization's page on Innsamlingskontrollen.
+     * @param url the URL to set
+     */
     public void setUrl(String url) { this.url = url; }
 
-    public boolean isPreApproved() { return isPreApproved; }
+    /**
+     * Returns whether the organization is pre-approved.
+     * @return true if pre-approved, false otherwise
+     */
+    public boolean isPreApproved() {
+        return isPreApproved;
+    }
+
+    /**
+     * Sets whether the organization is pre-approved.
+     * @param preApproved true if pre-approved, false otherwise
+     */
     public void setPreApproved(boolean preApproved) { isPreApproved = preApproved; }
+
 }
diff --git a/src/main/java/domain/organization/OrganizationDetails.java b/src/main/java/domain/organization/OrganizationDetails.java
index e892e82..a86920a 100644
--- a/src/main/java/domain/organization/OrganizationDetails.java
+++ b/src/main/java/domain/organization/OrganizationDetails.java
@@ -1,18 +1,35 @@
 package domain.organization;
 
+/**
+ * Holds additional details about an organization fetched from Innsamlingskontrollen's website.
+ * Contains a short description and a URL to the organization's logo.
+ */
 public class OrganizationDetails {
-  private String description;
-  private String logoUrl;
+  private final String description;
+  private final String logoUrl;
 
+  /**
+   * Creates a new OrganizationDetails with the given description and logo URL.
+   * @param description a short description of the organization
+   * @param logoUrl the URL to the organization's logo
+   */
   public OrganizationDetails(String description, String logoUrl) {
     this.description = description;
     this.logoUrl = logoUrl;
   }
 
+  /**
+   * Returns the organization's description.
+   * @return the description
+   */
   public String getDescription() {
     return description;
   }
 
+  /**
+   * Returns the URL to the organization's logo.
+   * @return the logo URL
+   */
   public String getLogoUrl() {
     return logoUrl;
   }
diff --git a/src/main/java/domain/user/Role.java b/src/main/java/domain/user/Role.java
deleted file mode 100644
index 673390f..0000000
--- a/src/main/java/domain/user/Role.java
+++ /dev/null
@@ -1,7 +0,0 @@
-package domain.user;
-
-/**
- * Enum class that defines if a user has the role Admin or user.
- */
-public enum Role {ADMIN, USER
-}
diff --git a/src/main/java/domain/user/User.java b/src/main/java/domain/user/User.java
index e5ff5e9..5d471cc 100644
--- a/src/main/java/domain/user/User.java
+++ b/src/main/java/domain/user/User.java
@@ -12,12 +12,12 @@ public class User {
   private Long id;
 
   /**
-   * Constructor that takes in the parameters that define a user.
-   * It contains input validation on all parameters.
-   * @param userName
-   * @param phoneNumber
-   * @param password
-   * @param eMail
+   * Creates a new User with the given parameters.
+   * Validates all input before assigning.
+   * @param userName the username; must not be null or blank
+   * @param phoneNumber the phone number; must be exactly 8 digits
+   * @param password the hashed password
+   * @param eMail the email address; must be a valid email format
    */
   public User(String userName, String phoneNumber, String password, String eMail) {
 
@@ -87,33 +87,6 @@ public String getPassword() {
    */
   public long getID() { return id; }
 
-  /**
-   * Sets a new password hash for this user.
-   *
-   * @param password the new password hash; must not be null
-   */
-  public void setPassword(String password) {
-    this.password = password;
-  }
-
-  /**
-   * Sets a new username for this user.
-   *
-   * @param userName the new username; must not be null or blank
-   */
-  public void setUsername(String userName) {
-    this.userName = userName;
-  }
-
-  /**
-   * Sets a new phone number for this user.
-   *
-   * @param phoneNumber the new phone number; must be exactly 8 digits
-   */
-  public void setPhonenumber (String phoneNumber) {
-    this.phoneNumber = phoneNumber;
-  }
-
   /**
    * Sets the ID for this user.
    *
@@ -124,9 +97,9 @@ public void setId(Long id) {
   }
 
   /**
-   * Method that validates that a e-mail is in the right format.
-   * @param email
-   * @return
+   * Validates that an email address is in the correct format.
+   * @param email the email address to validate
+   * @return true if the email is valid, false otherwise
    */
   private static boolean isValidEmail(String email) {
     if (email == null || email.isBlank()) return false;
diff --git a/src/main/java/integration/InnsamlingskontrollenClient.java b/src/main/java/integration/InnsamlingskontrollenClient.java
index c6083d9..258f2e9 100644
--- a/src/main/java/integration/InnsamlingskontrollenClient.java
+++ b/src/main/java/integration/InnsamlingskontrollenClient.java
@@ -20,6 +20,11 @@
  */
 public class InnsamlingskontrollenClient {
 
+  /**
+   * Fetches all organizations from the Innsamlingskontrollen API.
+   * @return an array of Organization objects
+   * @throws Exception if the request fails
+   */
   public static Organization[] fetchOrganizations() throws Exception {
     HttpClient client = HttpClient.newHttpClient();
 
@@ -35,18 +40,22 @@ public static Organization[] fetchOrganizations() throws Exception {
     return mapper.readValue(response.body(), Organization[].class);
   }
 
+  /**
+   * Fetches additional details for an organization from its Innsamlingskontrollen page.
+   * Scrapes the organization's description and logo URL using Jsoup.
+   * Returns empty strings if the details cannot be fetched.
+   * @param url the URL to the organization's page on Innsamlingskontrollen
+   * @return an OrganizationDetails object containing description and logo URL
+   */
   public static OrganizationDetails fetchDetails(String url) {
     try {
       org.jsoup.Connection conn = Jsoup.connect(url);
       conn.timeout(10000);
       Document doc = conn.get();
       doc.charset(StandardCharsets.UTF_8);
-      System.out.println(doc.select("section.information").text());
 
       String description = "";
-      System.out.println("Section size: " + doc.select("section.information div > p").size());
       for (org.jsoup.nodes.Element p : doc.select("section.information div > p")) {
-        System.out.println("P element: " + p.text());
         if (!p.text().isBlank()) {
           description = p.text();
           break;
diff --git a/src/main/java/integration/security/Sha256PasswordHasher.java b/src/main/java/integration/security/Sha256PasswordHasher.java
index d6c4a4f..95b760c 100644
--- a/src/main/java/integration/security/Sha256PasswordHasher.java
+++ b/src/main/java/integration/security/Sha256PasswordHasher.java
@@ -12,9 +12,9 @@ public class Sha256PasswordHasher implements PasswordHasher {
   /**
    * Method for hashing an inputted password.
    * Uses the SHA-256 algorithm.
-   * Transforms the passoword to a UTF-8 byte-array, then digests it using SHA-256.
+   * Transforms the password to a UTF-8 byte-array, then digests it using SHA-256.
    * The bytes are then formatted as a 64-character string.
-   * @param password
+   * @param password the password to hash
    * @return a 64-character hash of the password.
    * @throws RuntimeException if the hashing fails.
    */
diff --git a/src/main/java/persistence/CauseDao.java b/src/main/java/persistence/CauseDao.java
deleted file mode 100644
index 4ed035d..0000000
--- a/src/main/java/persistence/CauseDao.java
+++ /dev/null
@@ -1,4 +0,0 @@
-package persistence;
-
-public class CauseDao {
-}
diff --git a/src/main/java/persistence/DonationDao.java b/src/main/java/persistence/dao/DonationDao.java
similarity index 99%
rename from src/main/java/persistence/DonationDao.java
rename to src/main/java/persistence/dao/DonationDao.java
index 9e70812..e8294ea 100644
--- a/src/main/java/persistence/DonationDao.java
+++ b/src/main/java/persistence/dao/DonationDao.java
@@ -1,4 +1,4 @@
-package persistence;
+package persistence.dao;
 
 import domain.donation.Donation;
 import domain.organization.Organization;
diff --git a/src/main/java/persistence/OrganizationDao.java b/src/main/java/persistence/dao/OrganizationDao.java
similarity index 98%
rename from src/main/java/persistence/OrganizationDao.java
rename to src/main/java/persistence/dao/OrganizationDao.java
index 470d74a..cd035e1 100644
--- a/src/main/java/persistence/OrganizationDao.java
+++ b/src/main/java/persistence/dao/OrganizationDao.java
@@ -1,4 +1,4 @@
-package persistence;
+package persistence.dao;
 
 import domain.organization.Organization;
 
diff --git a/src/main/java/persistence/UserDao.java b/src/main/java/persistence/dao/UserDao.java
similarity index 94%
rename from src/main/java/persistence/UserDao.java
rename to src/main/java/persistence/dao/UserDao.java
index 90a13c4..a1b0544 100644
--- a/src/main/java/persistence/UserDao.java
+++ b/src/main/java/persistence/dao/UserDao.java
@@ -1,8 +1,9 @@
-package persistence;
+package persistence.dao;
 
 import java.sql.ResultSet;
 import java.sql.Statement;
 import java.util.Optional;
+
 import persistence.db.Database;
 import java.sql.Connection;
 import java.sql.PreparedStatement;
@@ -48,7 +49,6 @@ public void insert(User user) {
     }
   }
 
-  //private User mapRow(ResultSet rs) throws SQLException {}
 
   /**
    * Finds a user by their email address.
@@ -184,7 +184,7 @@ public boolean existsByUsername(String username) {
       stmt.setString(1, username.trim().toLowerCase());
 
       try (ResultSet rs = stmt.executeQuery()) {
-        return rs.next(); // true hvis minst én rad finnes
+        return rs.next();
       }
 
     } catch (SQLException e) {
@@ -192,13 +192,6 @@ public boolean existsByUsername(String username) {
     }
   }
 
-  //User findById(long id) throws SQLException {}
-
-  //List<User> findAllUsers() throws SQLException {}
-
-  void update(User user) throws SQLException {}
-
-  void updatePassword(long userId, String newPasswordHash) throws SQLException {}
 
   private User mapUser(ResultSet rs) throws SQLException {
 
diff --git a/src/main/java/persistence/UserRepository.java b/src/main/java/persistence/dao/UserRepository.java
similarity index 95%
rename from src/main/java/persistence/UserRepository.java
rename to src/main/java/persistence/dao/UserRepository.java
index 9b92669..0ee64c6 100644
--- a/src/main/java/persistence/UserRepository.java
+++ b/src/main/java/persistence/dao/UserRepository.java
@@ -1,7 +1,6 @@
-package persistence;
+package persistence.dao;
 
 import domain.user.User;
-
 import java.util.Optional;
 
 /**
diff --git a/src/main/java/ui/controller/HomeController.java b/src/main/java/ui/controller/HomeController.java
index 5d5a217..02420a6 100644
--- a/src/main/java/ui/controller/HomeController.java
+++ b/src/main/java/ui/controller/HomeController.java
@@ -1,20 +1,20 @@
 package ui.controller;
 
-import application.security.PasswordHasher;
-import application.user.UserSignIn;
-import integration.security.Sha256PasswordHasher;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
-import persistence.UserDao;
 import ui.Page;
-
-import java.io.IOException;
 import java.util.function.Consumer;
 
+/**
+ * Controller for the home page.
+ */
 public class HomeController implements NavigationAware {
 
     private Consumer<Page> onNavigate;
 
+    /**
+     * Sets the navigation callback.
+     * @param onNavigate the callback for navigating to a page
+     */
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
diff --git a/src/main/java/ui/controller/MainController.java b/src/main/java/ui/controller/MainController.java
index aaa182b..93d83be 100644
--- a/src/main/java/ui/controller/MainController.java
+++ b/src/main/java/ui/controller/MainController.java
@@ -11,14 +11,17 @@
 import javafx.scene.Parent;
 import javafx.scene.layout.BorderPane;
 import javafx.scene.layout.VBox;
-import persistence.UserDao;
+import persistence.dao.UserDao;
 import ui.DonationSession;
 import ui.Page;
 import ui.DonationSessionAware;
 import ui.controller.donation.DonationFlowController;
-
 import java.io.IOException;
 
+/**
+ * Main controller for the application.
+ * Manages page navigation, the donation flow, and the organization detail popup.
+ */
 public class MainController {
 
     @FXML
@@ -55,6 +58,12 @@ public void initialize() {
         }
     }
 
+    /**
+     * Loads and displays the given page in the main content area.
+     * Sets up the appropriate controller callbacks for each page.
+     * @param page the page to load
+     * @throws IOException if the FXML file cannot be loaded
+     */
     public void loadPage(Page page) throws IOException {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/" + page.getFileName()));
         Parent root = loader.load();
@@ -69,13 +78,6 @@ public void loadPage(Page page) throws IOException {
                 }
             });
         }
-        if (controller instanceof OrganizationController c) {
-            c.setOnDonate(org -> {
-                try { loadDonationPage(org); }
-                catch (IOException e) { throw new RuntimeException(e); }
-            });
-
-        }
         if (controller instanceof SignInController c) {
             c.setUserSignIn(new UserSignIn(new Sha256PasswordHasher(), new UserDao()));
         }
@@ -99,10 +101,20 @@ public void loadPage(Page page) throws IOException {
         navbarController.showNavbar();
     }
 
+    /**
+     * Starts the donation flow for the given organization.
+     * @param org the organization to donate to
+     * @throws IOException if the FXML file cannot be loaded
+     */
     public void loadDonationPage(Organization org) throws IOException {
         donationFlowController.start(org);
     }
 
+    /**
+     * Shows the organization detail popup for the given organization.
+     * Fetches description and logo from Innsamlingskontrollen and displays them.
+     * @param org the organization to show details for
+     */
     public void showOrganizationDetail(Organization org) {
         try {
             FXMLLoader loader = new FXMLLoader(
diff --git a/src/main/java/ui/controller/MyProfileController.java b/src/main/java/ui/controller/MyProfileController.java
index 2af08f7..b8dd62c 100644
--- a/src/main/java/ui/controller/MyProfileController.java
+++ b/src/main/java/ui/controller/MyProfileController.java
@@ -11,12 +11,16 @@
 import javafx.scene.control.Label;
 import javafx.scene.control.TableColumn;
 import javafx.scene.control.TableView;
-import persistence.DonationDao;
+import persistence.dao.DonationDao;
 import ui.Page;
 import util.SessionManager;
 
 import java.util.function.Consumer;
 
+/**
+ * Controller for the user profile page.
+ * Displays user information, donation statistics and donation history.
+ */
 public class MyProfileController implements NavigationAware {
 
     private Consumer<Page> onNavigate;
@@ -31,6 +35,10 @@ public class MyProfileController implements NavigationAware {
     @FXML private TableColumn<Donation, String> amountColumn;
     @FXML private TableColumn<Donation, String> dateColumn;
 
+    /**
+     * Sets the navigation callback.
+     * @param onNavigate the callback for navigating to a page
+     */
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
diff --git a/src/main/java/ui/controller/NavbarController.java b/src/main/java/ui/controller/NavbarController.java
index 18a56ea..0be90c5 100644
--- a/src/main/java/ui/controller/NavbarController.java
+++ b/src/main/java/ui/controller/NavbarController.java
@@ -8,6 +8,10 @@
 import ui.Page;
 import util.SessionManager;
 
+/**
+ * Controller for the navigation bar.
+ * Handles navigation between pages and updates the active button state.
+ */
 public class NavbarController {
 
     private Consumer<Page> onNavigate;
@@ -20,10 +24,18 @@ public class NavbarController {
     @FXML
     private Button signInBtn;
 
+    /**
+     * Sets the navigation callback.
+     * @param onNavigate the callback for navigating to a page
+     */
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
 
+    /**
+     * Highlights the navbar button corresponding to the given page.
+     * @param page the currently active page
+     */
     public void setActivePage(Page page) {
         homeBtn.getStyleClass().remove("nav-button-active");
         orgBtn.getStyleClass().remove("nav-button-active");
@@ -41,10 +53,16 @@ public void setActivePage(Page page) {
         }
     }
 
+    /**
+     * Navigates to the home page.
+     */
     public void goHome() {
         onNavigate.accept(Page.HOME);
     }
 
+    /**
+     * Navigates to the sign in page or profile page depending on authentication state.
+     */
     public void goToSignIn() {
         if (SessionManager.isSignedIn()) {
             onNavigate.accept(Page.PROFILE);
@@ -53,11 +71,17 @@ public void goToSignIn() {
         }
     }
 
+    /**
+     * Navigates to the organizations page.
+     */
     public void goToOrganizations() {
         onNavigate.accept(Page.ORGANIZATIONS);
     }
 
-
+    /**
+     * Updates the sign in button text based on the user's authentication state.
+     * Shows "My Profile" if signed in, "Sign In" otherwise.
+     */
     public void updateAuthButton() {
         if (SessionManager.isSignedIn()) {
             signInBtn.setText("My Profile");
@@ -66,17 +90,17 @@ public void updateAuthButton() {
         }
     }
 
-    public void clearActivePage() {
-        homeBtn.getStyleClass().remove("nav-button-active");
-        orgBtn.getStyleClass().remove("nav-button-active");
-        signInBtn.getStyleClass().remove("nav-button-active");
-    }
-
+    /**
+     * Hides the navbar.
+     */
     public void hideNavbar() {
         navBar.setVisible(false);
         navBar.setManaged(false);
     }
 
+    /**
+     * Shows the navbar.
+     */
     public void showNavbar() {
         navBar.setVisible(true);
         navBar.setManaged(true);
diff --git a/src/main/java/ui/controller/OrganizationController.java b/src/main/java/ui/controller/OrganizationController.java
index ede0dd3..00ad56c 100644
--- a/src/main/java/ui/controller/OrganizationController.java
+++ b/src/main/java/ui/controller/OrganizationController.java
@@ -8,7 +8,7 @@
 import javafx.scene.control.TextField;
 import javafx.scene.layout.FlowPane;
 import javafx.scene.layout.VBox;
-import persistence.OrganizationDao;
+import persistence.dao.OrganizationDao;
 import ui.Page;
 
 import java.sql.SQLException;
@@ -17,6 +17,10 @@
 import java.util.function.Consumer;
 import java.util.stream.Collectors;
 
+/**
+ * Controller for the organizations page.
+ * Displays a paginated list of approved organizations with search functionality.
+ */
 public class OrganizationController implements NavigationAware{
 
     @FXML
@@ -39,15 +43,26 @@ public class OrganizationController implements NavigationAware{
     private Consumer<Organization> onDonate;
     private Consumer<Organization> onShowDetail;
 
-
+    /**
+     * Sets the navigation callback.
+     * @param onNavigate the callback for navigating to a page
+     */
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
 
+    /**
+     * Sets the callback to invoke when the user clicks Donate on an organization card.
+     * @param onDonate the callback with the selected organization
+     */
     public void setOnDonate(Consumer<Organization> onDonate) {
         this.onDonate = onDonate;
     }
 
+    /**
+     * Sets the callback to invoke when the user clicks on an organization card.
+     * @param onShowDetail the callback with the selected organization
+     */
     public void setOnShowDetail(Consumer<Organization> onShowDetail) {
         this.onShowDetail = onShowDetail;
     }
@@ -58,7 +73,6 @@ public void initialize() {
             allOrgs = dao.getAll().stream()
                 .filter(org -> "approved".equals(org.getStatus()))
                 .collect(Collectors.toList());
-            System.out.println("Fetched: " + allOrgs.size() + " organizations");
             filtrertOrgs = new ArrayList<>(allOrgs);
             showPage();
 
@@ -143,5 +157,4 @@ private void nextPage() {
         page++;
         showPage();
     }
-
 }
diff --git a/src/main/java/ui/controller/OrganizationDetailController.java b/src/main/java/ui/controller/OrganizationDetailController.java
index 96a8b74..0775ea0 100644
--- a/src/main/java/ui/controller/OrganizationDetailController.java
+++ b/src/main/java/ui/controller/OrganizationDetailController.java
@@ -3,17 +3,18 @@
 import domain.organization.Organization;
 import domain.organization.OrganizationDetails;
 import javafx.fxml.FXML;
-import javafx.scene.control.Button;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;
 import javafx.scene.image.Image;
 import javafx.scene.image.ImageView;
-import ui.Page;
-
 import java.awt.Desktop;
 import java.net.URI;
 import java.util.function.Consumer;
 
+/**
+ * Controller for the organization detail popup.
+ * Displays organization name, verified status, description and logo.
+ */
 public class OrganizationDetailController {
 
   @FXML private Label nameLabel;
@@ -28,6 +29,12 @@ public class OrganizationDetailController {
   private Consumer<Organization> onDonate;
   private Runnable onClose;
 
+  /**
+   * Sets the organization and its details, and updates all UI elements.
+   * Cuts the description at 300 characters if it is too long.
+   * @param org the organization to display
+   * @param details the scraped details including description and logo URL
+   */
   public void setOrganization(Organization org, OrganizationDetails details) {
     this.organization = org;
     nameLabel.setText(org.getName());
@@ -68,10 +75,18 @@ public void setOrganization(Organization org, OrganizationDetails details) {
     }
   }
 
+  /**
+   * Sets the callback to invoke when the user clicks Donate.
+   * @param onDonate the callback with the selected organization
+   */
   public void setOnDonate(Consumer<Organization> onDonate) {
     this.onDonate = onDonate;
   }
 
+  /**
+   * Sets the callback to invoke when the user closes the popup.
+   * @param onClose the callback to run on close
+   */
   public void setOnClose(Runnable onClose) {
     this.onClose = onClose;
   }
diff --git a/src/main/java/ui/controller/RegisterController.java b/src/main/java/ui/controller/RegisterController.java
index a43a47d..db662f8 100644
--- a/src/main/java/ui/controller/RegisterController.java
+++ b/src/main/java/ui/controller/RegisterController.java
@@ -9,22 +9,40 @@
 
 import java.util.function.Consumer;
 
+/**
+ * Controller for the register page.
+ * Handles user input validation and registration.
+ */
 public class RegisterController implements NavigationAware {
 
-    @FXML private TextField usernameField;
-    @FXML private TextField emailField;
-    @FXML private TextField phoneNumberField;
-    @FXML private PasswordField passwordField;
-    @FXML private PasswordField confirmPasswordField;
-    @FXML private Label errorLabel;
+    @FXML
+    private TextField usernameField;
+    @FXML
+    private TextField emailField;
+    @FXML
+    private TextField phoneNumberField;
+    @FXML
+    private PasswordField passwordField;
+    @FXML
+    private PasswordField confirmPasswordField;
+    @FXML
+    private Label errorLabel;
 
     private UserRegister userRegister;
     private Consumer<Page> onNavigate;
 
+    /**
+     * Sets the user register use case.
+     * @param userRegister the use case for registering a new user
+     */
     public void setUserRegister(UserRegister userRegister) {
         this.userRegister = userRegister;
     }
 
+    /**
+     * Sets the navigation callback.
+     * @param onNavigate the callback for navigating to a page
+     */
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
@@ -61,9 +79,4 @@ private void handleRegister() {
     private void handleSignIn() {
         onNavigate.accept(Page.SIGN_IN);
     }
-
-    @FXML
-    private void handleGoHome() {
-        onNavigate.accept(Page.HOME);
-    }
 }
diff --git a/src/main/java/ui/controller/SignInController.java b/src/main/java/ui/controller/SignInController.java
index 6541460..6cde88c 100644
--- a/src/main/java/ui/controller/SignInController.java
+++ b/src/main/java/ui/controller/SignInController.java
@@ -1,26 +1,20 @@
 package ui.controller;
 
-import application.security.PasswordHasher;
-import application.user.UserRegister;
 import application.user.UserSignIn;
 import domain.user.User;
-import integration.security.Sha256PasswordHasher;
-import javafx.event.ActionEvent;
 import javafx.fxml.FXML;
-import javafx.fxml.FXMLLoader;
-import javafx.scene.Node;
-import javafx.scene.Scene;
 import javafx.scene.control.Label;
 import javafx.scene.control.PasswordField;
 import javafx.scene.control.TextField;
-import javafx.stage.Stage;
-import persistence.UserDao;
 import ui.Page;
 import util.SessionManager;
-
 import java.io.IOException;
 import java.util.function.Consumer;
 
+/**
+ * Controller for the sign-in page.
+ * Handles user authentication and navigation after sign in.
+ */
 public class SignInController implements NavigationAware {
 
     @FXML private TextField loginField;
@@ -30,17 +24,24 @@ public class SignInController implements NavigationAware {
     private  UserSignIn userSignIn;
     private Consumer<Page> onNavigate;
 
+    /**
+     * Sets the sign in use case.
+     * @param userSignIn the use case for signing in a user
+     */
     public void setUserSignIn(UserSignIn userSignIn) {
         this.userSignIn = userSignIn;
     }
 
+    /**
+     * Sets the navigation callback.
+     * @param onNavigate the callback for navigating to a page
+     */
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
 
     @FXML
     private void handleSignIn() {
-
         String login = loginField.getText().trim();
         String password = passwordField.getText().trim();
 
@@ -49,7 +50,6 @@ private void handleSignIn() {
             return;
         }
 
-        // nullstill eventuell gammel feilmelding
         errorLabel.setText("");
 
         try {
diff --git a/src/main/java/ui/controller/donation/DonationAmountController.java b/src/main/java/ui/controller/donation/DonationAmountController.java
index 064c07d..2b35c83 100644
--- a/src/main/java/ui/controller/donation/DonationAmountController.java
+++ b/src/main/java/ui/controller/donation/DonationAmountController.java
@@ -9,6 +9,10 @@
 
 import java.util.function.Consumer;
 
+/**
+ * Controller for the donation amount selection page.
+ * Handles amount input validation and navigation in the donation flow.
+ */
 public class DonationAmountController implements DonationSessionAware {
 
    @FXML private Label orgLabel;
@@ -19,20 +23,35 @@ public class DonationAmountController implements DonationSessionAware {
    private Consumer<DonationSession> onContinue;
    private Runnable onBack;
 
+  /**
+   * Sets the current donation session and updates the organization label.
+   * @param donationSession the active donation session
+   */
     @Override
     public void setDonationSession(DonationSession donationSession) {
         this.donationSession = donationSession;
         orgLabel.setText("Donating to: " + donationSession.getOrganization().getName());
     }
 
+  /**
+   * Sets the callback to invoke when the user continues to the next step.
+   * @param onContinue the callback with the updated donation session
+   */
     public void setOnContinue(Consumer<DonationSession> onContinue) {
         this.onContinue = onContinue;
     }
 
+  /**
+   * Sets the callback to invoke when the user navigates back.
+   * @param onBack the callback to run on back navigation
+   */
     public void setOnBack(Runnable onBack) {
         this.onBack = onBack;
     }
 
+  /**
+   * Validates the entered amount and continues to the next step in the donation flow.
+   */
       @FXML
       public void handleContinue() {
           if (amountField.getText().isBlank()) {
diff --git a/src/main/java/ui/controller/donation/DonationConfirmationController.java b/src/main/java/ui/controller/donation/DonationConfirmationController.java
index 7fe397c..5e2df03 100644
--- a/src/main/java/ui/controller/donation/DonationConfirmationController.java
+++ b/src/main/java/ui/controller/donation/DonationConfirmationController.java
@@ -8,7 +8,10 @@
 import ui.controller.NavigationAware;
 
 import java.util.function.Consumer;
-
+/**
+ * Controller for the donation confirmation page.
+ * Displays the organization name and donation amount after a successful donation.
+ */
 public class DonationConfirmationController implements NavigationAware, DonationSessionAware {
 
     @FXML private Label orgLabel;
@@ -17,11 +20,19 @@ public class DonationConfirmationController implements NavigationAware, Donation
     private Consumer<Page> onNavigate;
     private DonationSession donationSession;
 
+    /**
+     * Sets the navigation callback.
+     * @param onNavigate the callback for navigating to a page
+     */
     @Override
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
 
+    /**
+     * Sets the donation session and updates the confirmation labels.
+     * @param session the completed donation session
+     */
     @Override
     public void setDonationSession(DonationSession session) {
         this.donationSession = session;
diff --git a/src/main/java/ui/controller/donation/DonationFlowController.java b/src/main/java/ui/controller/donation/DonationFlowController.java
index f9d014a..6b70027 100644
--- a/src/main/java/ui/controller/donation/DonationFlowController.java
+++ b/src/main/java/ui/controller/donation/DonationFlowController.java
@@ -14,6 +14,10 @@
 import java.math.BigDecimal;
 import java.util.function.Consumer;
 
+/**
+ * Manages the multi-step donation flow.
+ * Handles navigation between donation steps and hides the navbar during the flow.
+ */
 public class DonationFlowController {
     private final BorderPane mainPane;
     private final NavbarController navbarController;
@@ -21,11 +25,22 @@ public class DonationFlowController {
     private Consumer<Page> onNavigate;
     private final UserDonate userDonate = new UserDonate();
 
+    /**
+     * Creates a new DonationFlowController.
+     * @param mainPane the main BorderPane to load donation steps into
+     * @param navbarController the navbar controller used to hide/show the navbar
+     */
     public DonationFlowController(BorderPane mainPane, NavbarController navbarController) {
         this.mainPane = mainPane;
         this.navbarController = navbarController;
     }
 
+    /**
+     * Starts the donation flow for the given organization.
+     * Navigates to the amount step if signed in, otherwise to the not logged in step.
+     * @param org the organization to donate to
+     * @throws IOException if an FXML file cannot be loaded
+     */
     public void start(Organization org) throws IOException {
         session = new DonationSession();
         session.setOrganization(org);
@@ -38,6 +53,7 @@ public void start(Organization org) throws IOException {
         }
     }
 
+    // Loads the "not logged in" page
     private void loadStep1() throws IOException {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationNotLoggedIn.fxml"));
         Parent root = loader.load();
@@ -48,6 +64,8 @@ private void loadStep1() throws IOException {
         controller.setOnNavigate(onNavigate);
         mainPane.setCenter(root);
     }
+
+    // Loads the amount selection page
     private void loadStep2() throws IOException {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationAmount.fxml"));
         Parent root = loader.load();
@@ -72,6 +90,7 @@ private void loadStep2() throws IOException {
         mainPane.setCenter(root);
     }
 
+    // Loads the payment information page
     private void loadStep3() throws IOException {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationPayment.fxml"));
         Parent root = loader.load();
@@ -101,6 +120,8 @@ private void loadStep3() throws IOException {
 
         mainPane.setCenter(root);
     }
+
+    // Loads the confirmation page
     private void loadStep4() throws IOException {
         FXMLLoader loader = new FXMLLoader(getClass().getResource("/view/DonationConfirmation.fxml"));
         Parent root = loader.load();
@@ -113,6 +134,10 @@ private void loadStep4() throws IOException {
         mainPane.setCenter(root);
     }
 
+    /**
+     * Sets the callback for navigating to a page after the donation flow ends.
+     * @param onNavigate the navigation callback
+     */
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
diff --git a/src/main/java/ui/controller/donation/DonationNotLoggedInController.java b/src/main/java/ui/controller/donation/DonationNotLoggedInController.java
index fa21d72..fcfe421 100644
--- a/src/main/java/ui/controller/donation/DonationNotLoggedInController.java
+++ b/src/main/java/ui/controller/donation/DonationNotLoggedInController.java
@@ -1,6 +1,6 @@
 package ui.controller.donation;
 
-import domain.organization.Organization;
+
 import javafx.fxml.FXML;
 import javafx.scene.control.Label;
 import ui.DonationSession;
@@ -10,6 +10,10 @@
 
 import java.util.function.Consumer;
 
+/**
+ * Controller for the "not logged in" page in the donation flow.
+ * Shown when a user tries to donate without being signed in.
+ */
 public class DonationNotLoggedInController implements NavigationAware, DonationSessionAware {
 
     @FXML private Label orgLabel;
@@ -17,12 +21,19 @@ public class DonationNotLoggedInController implements NavigationAware, DonationS
     private Consumer<Page> onNavigate;
     private DonationSession donationSession;
 
-
+    /**
+     * Sets the navigation callback.
+     * @param onNavigate the callback for navigating to a page
+     */
     @Override
     public void setOnNavigate(Consumer<Page> onNavigate) {
         this.onNavigate = onNavigate;
     }
 
+    /**
+     * Sets the donation session and updates the organization label.
+     * @param session the active donation session
+     */
     @Override
     public void setDonationSession(DonationSession session) {
         this.donationSession = session;
@@ -40,6 +51,5 @@ public void goToRegister() {
     public void handleBack() {
         onNavigate.accept(Page.ORGANIZATIONS);
     }
-
 }
 
diff --git a/src/main/java/ui/controller/donation/DonationPaymentController.java b/src/main/java/ui/controller/donation/DonationPaymentController.java
index ece65d7..5c44b7c 100644
--- a/src/main/java/ui/controller/donation/DonationPaymentController.java
+++ b/src/main/java/ui/controller/donation/DonationPaymentController.java
@@ -5,9 +5,12 @@
 import javafx.scene.control.TextField;
 import ui.DonationSession;
 import ui.DonationSessionAware;
-
 import java.util.function.Consumer;
 
+/**
+ * Controller for the payment information page in the donation flow.
+ * Handles validation of card number, expiry date and CVC.
+ */
 public class DonationPaymentController implements DonationSessionAware {
 
     @FXML private Label orgLabel;
@@ -21,6 +24,10 @@ public class DonationPaymentController implements DonationSessionAware {
     private Consumer<DonationSession> onContinue;
     private Runnable onBack;
 
+    /**
+     * Sets the donation session and updates the organization and amount labels.
+     * @param donationSession the active donation session
+     */
     @Override
     public void setDonationSession(DonationSession donationSession) {
         this.donationSession = donationSession;
@@ -28,10 +35,18 @@ public void setDonationSession(DonationSession donationSession) {
         amountLabel.setText("Amount: " + donationSession.getAmount() + " kr");
     }
 
+    /**
+     * Sets the callback to invoke when the user confirms the donation.
+     * @param onContinue the callback with the updated donation session
+     */
     public void setOnContinue(Consumer<DonationSession> onContinue) {
         this.onContinue = onContinue;
     }
 
+
+    /**
+     * Validates payment information and continues to the confirmation step.
+     */
     @FXML
     public void handleConfirmDonation() {
         String cardNumber = cardNumberField.getText().trim().replace(" ", "");
@@ -53,6 +68,10 @@ public void handleConfirmDonation() {
         onContinue.accept(donationSession);
     }
 
+    /**
+     * Sets the callback to invoke when the user navigates back.
+     * @param onBack the callback to run on back navigation
+     */
     public void setOnBack(Runnable onBack) {
         this.onBack = onBack;
     }
diff --git a/src/main/java/util/SessionManager.java b/src/main/java/util/SessionManager.java
index e2a6d4f..3e40ea2 100644
--- a/src/main/java/util/SessionManager.java
+++ b/src/main/java/util/SessionManager.java
@@ -14,7 +14,7 @@ public class SessionManager {
   /**
    * Signs in a user.
    * Stores the user as the current session holder.
-   * @param the user tom sign in.
+   * @param user the user to sign in
    */
   public static void signIn(User user) {
         SignedIn = true;

From c04752c38fafbb8b52e653a2844a0eba985221f4 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Thu, 16 Apr 2026 14:31:42 +0200
Subject: [PATCH 092/101] Documentation: Added javadoc and removed unused
 method and files

---
 src/main/java/application/user/UserLogin.java |  36 ++++
 .../domain/organization/Organization.java     |   1 -
 .../java/persistence/dao/DonationDao.java     |   1 +
 .../java/application/user/UserLoginTest.java  | 162 ++++++++++++++
 .../application/user/UserRegisterTest.java    | 170 +++++++++++++++
 .../application/user/UserStatisticsTest.java  | 132 ++++++++++++
 src/test/java/domain/DonationTest.java        | 115 ++++++++++
 src/test/java/domain/OrganizationTest.java    | 202 ++++++++++++++++++
 src/test/java/domain/UserTest.java            | 132 ++++++++++++
 .../security/Sha256PasswordHasherTest.java    |  26 +++
 10 files changed, 976 insertions(+), 1 deletion(-)
 create mode 100644 src/main/java/application/user/UserLogin.java
 create mode 100644 src/test/java/application/user/UserLoginTest.java
 create mode 100644 src/test/java/application/user/UserRegisterTest.java
 create mode 100644 src/test/java/application/user/UserStatisticsTest.java
 create mode 100644 src/test/java/integration/security/Sha256PasswordHasherTest.java

diff --git a/src/main/java/application/user/UserLogin.java b/src/main/java/application/user/UserLogin.java
new file mode 100644
index 0000000..50940ac
--- /dev/null
+++ b/src/main/java/application/user/UserLogin.java
@@ -0,0 +1,36 @@
+package application.user;
+
+import application.security.PasswordHasher;
+import domain.user.User;
+import persistence.UserRepository;
+
+public class UserLogin {
+
+    private final PasswordHasher hasher;
+    private final UserRepository repo;
+
+    public UserLogin(PasswordHasher hasher, UserRepository repo) {
+        this.hasher = hasher;
+        this.repo = repo;
+    }
+
+    public User execute(String login, String password) {
+        // normalize (trim etc.)
+        login = login.trim().toLowerCase();
+
+        User user = repo.findByLogin(login)
+                .orElseThrow(() -> new IllegalArgumentException("Invalid credentials"));
+
+        // hash password (optional)
+        String hashedInput = hasher.hash(password);
+
+        // compare hashed input with stored hash
+        if (!hashedInput.equals(user.getPassword())) {
+            throw new IllegalArgumentException("Invalid password");
+        }
+
+        System.out.println("Loggin in");
+        // return user (if match)
+        return user;
+    }
+}
diff --git a/src/main/java/domain/organization/Organization.java b/src/main/java/domain/organization/Organization.java
index 2c5ff30..fd7cec1 100644
--- a/src/main/java/domain/organization/Organization.java
+++ b/src/main/java/domain/organization/Organization.java
@@ -26,7 +26,6 @@ public class Organization {
     @JsonProperty("is_pre_approved")
     public boolean isPreApproved;
 
-
     public Organization() {}
 
     /**
diff --git a/src/main/java/persistence/dao/DonationDao.java b/src/main/java/persistence/dao/DonationDao.java
index e8294ea..c4893ec 100644
--- a/src/main/java/persistence/dao/DonationDao.java
+++ b/src/main/java/persistence/dao/DonationDao.java
@@ -70,6 +70,7 @@ private Donation mapRow(ResultSet rs) throws SQLException {
         rs.getString("password_hash"),
         rs.getString("e_mail")
     );
+    user.setId(rs.getLong("user_id"));
 
     Organization org = new Organization();
     org.setOrgNumber(rs.getString("org_number"));
diff --git a/src/test/java/application/user/UserLoginTest.java b/src/test/java/application/user/UserLoginTest.java
new file mode 100644
index 0000000..4bd8312
--- /dev/null
+++ b/src/test/java/application/user/UserLoginTest.java
@@ -0,0 +1,162 @@
+package application.user;
+
+import application.security.PasswordHasher;
+import domain.user.User;
+import org.junit.jupiter.api.Test;
+import persistence.UserRepository;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class UserLoginTest {
+
+    @Test
+    void executeReturnsUserWhenCredentialsAreValid() {
+        User user = new User("testuser", "12345678", "hashed-secret", "test@example.com");
+        PasswordHasher hasher = new FakePasswordHasher("hashed-secret");
+        UserRepository repo = new FakeUserRepository(Optional.of(user));
+
+        UserLogin userLogin = new UserLogin(hasher, repo);
+
+        User result = userLogin.execute("testuser", "secret");
+
+        assertSame(user, result);
+
+    }
+
+    @Test
+    void executeThrowsWhenLoginDoesNotExist() {
+        PasswordHasher hasher = new FakePasswordHasher("hashed-secret");
+        UserRepository repo = new FakeUserRepository(Optional.empty());
+
+        UserLogin userLogin = new UserLogin(hasher, repo);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> userLogin.execute("missing-user", "secret")
+        );
+
+        assertEquals("Invalid credentials", exception.getMessage());
+    }
+
+    @Test
+    void executeThrowsWhenPasswordIsWrong() {
+        User user = new User("testuser", "12345678", "stored-hash", "test@example.com");
+        PasswordHasher hasher = new FakePasswordHasher("different-hash");
+        UserRepository repo = new FakeUserRepository(Optional.of(user));
+
+        UserLogin userLogin = new UserLogin(hasher, repo);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> userLogin.execute("testuser", "wrong-password")
+        );
+
+        assertEquals("Invalid password", exception.getMessage());
+    }
+
+    @Test
+    void executeUsesNormalizedLoginBeforeLookup() {
+        User user = new User("testuser", "12345678", "hashed-secret", "test@example.com");
+        RecordingUserRepository repo = new RecordingUserRepository(Optional.of(user));
+        PasswordHasher hasher = new FakePasswordHasher("hashed-secret");
+
+        UserLogin userLogin = new UserLogin(hasher, repo);
+
+        userLogin.execute("  TestUser  ", "secret");
+
+        assertEquals("testuser", repo.lastLoginUsed);
+    }
+
+    private static class FakePasswordHasher implements PasswordHasher{
+        private final String hashToReturn;
+        private FakePasswordHasher(String hashToReturn) {
+            this.hashToReturn = hashToReturn;
+        }
+
+        @Override
+        public String hash(String password) {
+            return hashToReturn;
+        }
+    }
+
+    private static class FakeUserRepository implements UserRepository {
+        private final Optional<User> userToReturn;
+
+        private FakeUserRepository(Optional<User> userToReturn) {
+            this.userToReturn = userToReturn;
+        }
+
+        @Override
+        public Optional<User> findByUsername(String username){
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByEmail(String email){
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByLogin(String login) {
+            return userToReturn;
+        }
+
+        @Override
+        public boolean existsByEmail(String email) {
+            return false;
+        }
+
+        @Override
+        public boolean existsByUsername(String username) {
+            return false;
+        }
+
+        @Override
+        public void insert(User user) {
+        }
+    }
+
+    private static class RecordingUserRepository implements UserRepository {
+        private final Optional<User> userToReturn;
+        private String lastLoginUsed;
+
+        private RecordingUserRepository(Optional<User> userToReturn) {
+            this.userToReturn = userToReturn;
+        }
+
+        @Override
+        public Optional<User> findByUsername(String username) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByEmail(String email) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByLogin(String login) {
+            lastLoginUsed = login;
+            return userToReturn;
+        }
+
+        @Override
+        public boolean existsByEmail(String email) {
+            return false;
+        }
+
+        @Override
+        public boolean existsByUsername(String username) {
+            return false;
+        }
+
+        @Override
+        public void insert(User user) {
+        }
+    }
+
+
+}
+
diff --git a/src/test/java/application/user/UserRegisterTest.java b/src/test/java/application/user/UserRegisterTest.java
new file mode 100644
index 0000000..c5296cd
--- /dev/null
+++ b/src/test/java/application/user/UserRegisterTest.java
@@ -0,0 +1,170 @@
+package application.user;
+
+import application.security.PasswordHasher;
+import domain.user.User;
+import org.junit.jupiter.api.Test;
+import persistence.UserRepository;
+
+import java.util.Optional;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class UserRegisterTest {
+
+    @Test
+    void executeInsertsUserWhenInputIsValid() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        PasswordHasher hasher = new FakePasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        userRegister.execute("testuser", "12345678", "secret", "test@example.com");
+
+        assertNotNull(repo.insertedUser);
+        assertEquals("testuser", repo.insertedUser.getUsername());
+        assertEquals("12345678", repo.insertedUser.getPhoneNumber());
+        assertEquals("hashed-password", repo.insertedUser.getPassword());
+        assertEquals("test@example.com", repo.insertedUser.getEMail());
+    }
+
+
+    @Test
+    void executeNormalizesUsernameEmailAndPhoneBeforeInsert() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        PasswordHasher hasher = new FakePasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        userRegister.execute("  testuser  ", " 12345678 ", "secret", "  TEST@EXAMPLE.COM  ");
+
+        assertNotNull(repo.insertedUser);
+        assertEquals("testuser", repo.insertedUser.getUsername());
+        assertEquals("12345678", repo.insertedUser.getPhoneNumber());
+        assertEquals("test@example.com", repo.insertedUser.getEMail());
+    }
+
+
+    @Test
+    void executeThrowsWhenEmailAlreadyExists() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        repo.emailExists = true;
+        PasswordHasher hasher = new FakePasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> userRegister.execute("testuser", "12345678", "secret", "test@example.com")
+        );
+
+        assertEquals("Email already in use", exception.getMessage());
+        assertNull(repo.insertedUser);
+    }
+
+    @Test
+    void executeThrowsWhenUsernameAlreadyExists() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        repo.usernameExists = true;
+        PasswordHasher hasher = new FakePasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> userRegister.execute("testuser", "12345678", "secret", "test@example.com")
+        );
+
+        assertEquals("This username is taken", exception.getMessage());
+        assertNull(repo.insertedUser);
+    }
+
+    @Test
+    void executeHashesPasswordBeforeSavingUser() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        RecordingPasswordHasher hasher = new RecordingPasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        userRegister.execute("testuser", "12345678", "secret", "test@example.com");
+
+        assertEquals("secret", hasher.lastPasswordInput);
+        assertNotNull(repo.insertedUser);
+        assertEquals("hashed-password", repo.insertedUser.getPassword());
+    }
+
+    @Test
+    void executePropagatesDomainValidationErrors() {
+        RecordingUserRepository repo = new RecordingUserRepository();
+        PasswordHasher hasher = new FakePasswordHasher("hashed-password");
+        UserRegister userRegister = new UserRegister(hasher, repo);
+
+        IllegalArgumentException exception = assertThrows(
+                IllegalArgumentException.class,
+                () -> userRegister.execute("testuser", "1234", "secret", "test@example.com")
+        );
+
+        assertEquals("Fill in a phonenumber with 8 digits", exception.getMessage());
+        assertNull(repo.insertedUser);
+    }
+
+    private static class FakePasswordHasher implements PasswordHasher {
+        private final String hashToReturn;
+
+        private FakePasswordHasher(String hashToReturn) {
+            this.hashToReturn = hashToReturn;
+        }
+
+        @Override
+        public String hash(String password) {
+            return hashToReturn;
+        }
+    }
+
+
+    private static class RecordingPasswordHasher implements PasswordHasher {
+        private final String hashToReturn;
+        private String lastPasswordInput;
+
+        private RecordingPasswordHasher(String hashToReturn) {
+            this.hashToReturn = hashToReturn;
+        }
+
+        @Override
+        public String hash(String password) {
+            lastPasswordInput = password;
+            return hashToReturn;
+        }
+    }
+
+    private static class RecordingUserRepository implements UserRepository {
+        private boolean emailExists;
+        private boolean usernameExists;
+        private User insertedUser;
+
+        @Override
+        public Optional<User> findByUsername(String username) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByEmail(String email) {
+            return Optional.empty();
+        }
+
+        @Override
+        public Optional<User> findByLogin(String login) {
+            return Optional.empty();
+        }
+
+
+        @Override
+        public boolean existsByEmail(String email) {
+            return emailExists;
+        }
+
+        @Override
+        public boolean existsByUsername(String username) {
+            return usernameExists;
+        }
+
+        @Override
+        public void insert(User user) {
+            insertedUser = user;
+        }
+    }
+}
diff --git a/src/test/java/application/user/UserStatisticsTest.java b/src/test/java/application/user/UserStatisticsTest.java
new file mode 100644
index 0000000..da904cb
--- /dev/null
+++ b/src/test/java/application/user/UserStatisticsTest.java
@@ -0,0 +1,132 @@
+package application.user;
+
+import domain.user.User;
+import org.junit.jupiter.api.Test;
+import persistence.DonationDao;
+
+import java.lang.reflect.Field;
+import java.util.List;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+public class UserStatisticsTest {
+
+    @Test
+    void userFavoriteOrganizationsReturnsListFromDonationDao() throws Exception {
+        FakeDonationDao fakeDao = new FakeDonationDao();
+        fakeDao.favoriteOrganizationsToReturn = List.of(
+                "Org1 (3 donasjoner)",
+                "Org2 (2 donasjoner)"
+        );
+
+        UserStatistics statistics = createStatisticsWithFakeDao(fakeDao);
+        User user = createUserWithId(42L);
+
+        List<String> result = statistics.userFavoriteOrganizations(user);
+
+        assertEquals(List.of("Org1 (3 donasjoner)", "Org2 (2 donasjoner)"), result);
+        assertEquals(42L, fakeDao.lastUserIdForFavorites);
+    }
+
+    @Test
+    void userDonationsReturnsListFromDonationDao() throws Exception {
+        FakeDonationDao fakeDao = new FakeDonationDao();
+        fakeDao.userDonationsToReturn = List.of(
+                "Amount: 100, Date: 2026-04-15, Organization: Org1",
+                "Amount: 50, Date: 2026-04-16, Organization: Org2"
+        );
+
+        UserStatistics statistics = createStatisticsWithFakeDao(fakeDao);
+        User user = createUserWithId(7L);
+
+        List<String> result = statistics.userDonations(user);
+
+        assertEquals(List.of(
+                "Amount: 100, Date: 2026-04-15, Organization: Org1",
+                "Amount: 50, Date: 2026-04-16, Organization: Org2"
+        ), result);
+        assertEquals(7L, fakeDao.lastUserIdForDonations);
+    }
+
+    @Test
+    void userTotalDonationAmountReturnsValueFromDonationDao() throws Exception {
+        FakeDonationDao fakeDao = new FakeDonationDao();
+        fakeDao.totalDonationAmountToReturn = "250.00";
+
+        UserStatistics statistics = createStatisticsWithFakeDao(fakeDao);
+        User user = createUserWithId(15L);
+
+        String result = statistics.userTotalDonationAmount(user);
+
+        assertEquals("250.00", result);
+        assertEquals(15L, fakeDao.lastUserIdForTotalAmount);
+    }
+
+    @Test
+    void getTotalDonationsMadeReturnsValueFromDonationDao() throws Exception {
+        FakeDonationDao fakeDao = new FakeDonationDao();
+        fakeDao.totalDonationsMadeToReturn = "5";
+
+        UserStatistics statistics = createStatisticsWithFakeDao(fakeDao);
+        User user = createUserWithId(99L);
+
+        String result = statistics.getTotalDonationsMade(user);
+
+        assertEquals("5", result);
+        assertEquals(99L, fakeDao.lastUserIdForTotalCount);
+    }
+
+
+
+    private UserStatistics createStatisticsWithFakeDao(FakeDonationDao fakeDao) throws Exception {
+        UserStatistics statistics = new UserStatistics();
+
+        Field field = UserStatistics.class.getDeclaredField("donationDao");
+        field.setAccessible(true);
+        field.set(statistics, fakeDao);
+
+        return statistics;
+    }
+
+    private User createUserWithId(long id) {
+        User user = new User("testuser", "12345678", "password", "test@example.com");
+        user.setId(id);
+        return user;
+    }
+
+    private static class FakeDonationDao extends DonationDao {
+        private List<String> favoriteOrganizationsToReturn = List.of();
+        private List<String> userDonationsToReturn = List.of();
+        private String totalDonationAmountToReturn = "0";
+        private String totalDonationsMadeToReturn = "0";
+
+        private long lastUserIdForFavorites;
+        private long lastUserIdForDonations;
+        private long lastUserIdForTotalAmount;
+        private long lastUserIdForTotalCount;
+
+        @Override
+        public List<String> getFavoriteOrganizations(long userId) {
+            lastUserIdForFavorites = userId;
+            return favoriteOrganizationsToReturn;
+        }
+
+        @Override
+        public List<String> getUserDonations(long userId) {
+            lastUserIdForDonations = userId;
+            return userDonationsToReturn;
+        }
+
+        @Override
+        public String getTotalDonationAmount(long userId) {
+            lastUserIdForTotalAmount = userId;
+            return totalDonationAmountToReturn;
+        }
+
+        @Override
+        public String getTotalDonationsMade(long userId) {
+            lastUserIdForTotalCount = userId;
+            return totalDonationsMadeToReturn;
+        }
+    }
+}
diff --git a/src/test/java/domain/DonationTest.java b/src/test/java/domain/DonationTest.java
index bb9c875..ea73049 100644
--- a/src/test/java/domain/DonationTest.java
+++ b/src/test/java/domain/DonationTest.java
@@ -1,5 +1,120 @@
 package domain;
 
+import domain.donation.Cause;
+import domain.donation.Donation;
+import domain.organization.Organization;
+import domain.user.User;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.math.BigDecimal;
+import java.time.Duration;
+import java.time.LocalDateTime;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
+
 class DonationTest {
 
+    //User Variables
+    private final String testUserName = "testUser";
+    private final String testPhoneNumber = "90909090";
+    private final String testEmail = "test@email.com";
+    private final String testPassword = "password";
+
+    //Organization Variables
+    private final String testName = "Name";
+    private final String testOrgNr = "123456789";
+    private final Cause testCause = Cause.HEALTH;
+    private final String testDescription = "Description";
+    private final String testContactEmail = "test@mail.com";
+    private final String testWebsite = "https://test.com";
+    private final boolean testVerified = true;
+
+    //Donation Variables
+    private Long testID = 123L;
+    private BigDecimal testAmount = new BigDecimal("1500");
+    private LocalDateTime testDateTime = LocalDateTime.of(2026, 3, 5, 8, 30, 0);
+    private User testUser;
+    private Organization testOrganization;
+
+    @BeforeEach
+    public void init() {
+        testUser = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        testOrganization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+    }
+
+
+    @Test
+    public void DonationTestPositive(){
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+    }
+
+    @Test
+    public void DonationTestUserNull(){
+        testUser = null;
+        NullPointerException Exception = assertThrows(NullPointerException.class,
+                () -> new Donation (testAmount, testUser, testOrganization));
+
+        assertEquals("User cannot be null", Exception.getMessage());
+    }
+
+    @Test
+    public void DonationOrganizationNull(){
+        testOrganization = null;
+        NullPointerException Exception = assertThrows(NullPointerException.class,
+                () -> new Donation (testAmount, testUser, testOrganization));
+
+        assertEquals("Organization cannot be null", Exception.getMessage());
+    }
+
+    @Test
+    public void DonationTestAmountNegative(){
+        testAmount = new BigDecimal("-23");
+        IllegalArgumentException Exception = assertThrows(IllegalArgumentException.class,
+                () -> new Donation (testAmount, testUser, testOrganization));
+
+        assertEquals("Amount must be greater than 0", Exception.getMessage());
+    }
+
+    //Getter tests
+    /* id is never set, getter makes a NullPointerException
+    @Test
+    public void DonationTestIdGet(){
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+        assertEquals(0L, donation.getId());
+
+    }
+    */
+
+    @Test
+    public void DonationTestAmountGet(){
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+        assertEquals(testAmount, donation.getAmount());
+
+    }
+
+    @Test
+    public void DonationTestDateTimeGet(){
+        LocalDateTime now = LocalDateTime.now();
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+
+        assertTrue(Duration.between(now, donation.getDateTime()).abs().toMillis() < 1000);
+
+    }
+
+    @Test
+    public void DonationTestUserGet(){
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+        assertEquals(testUser, donation.getUser());
+
+    }
+
+    @Test
+    public void DonationTestOrganizationGet(){
+        Donation donation = new Donation(testAmount, testUser, testOrganization);
+        assertEquals(testOrganization, donation.getOrganization());
+
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/domain/OrganizationTest.java b/src/test/java/domain/OrganizationTest.java
index 815aa53..47c8024 100644
--- a/src/test/java/domain/OrganizationTest.java
+++ b/src/test/java/domain/OrganizationTest.java
@@ -1,5 +1,207 @@
 package domain;
 
+import domain.donation.Cause;
+import domain.organization.Organization;
+import domain.user.User;
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 class OrganizationTest {
+    private String testName = "Name";
+    private String testOrgNr = "123456789";
+    private Cause testCause = Cause.HEALTH;
+    private String testDescription = "Description";
+    private String testContactEmail = "test@mail.com";
+    private String testWebsite = "https://test.com";
+    private boolean testVerified = true;
+
+    //Positive tests
+    @Test
+    public void organizationTestPositive(){
+        Organization organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+    }
+
+    //Negative tests
+    @Test
+    public void organizationTestNameBlank(){
+        testName = "";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization("", testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Name cannot be null or blank", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestNameNull(){
+        testName = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Name cannot be null or blank", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestOrgNrNull(){
+        testOrgNr = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Organization number must be 9 digits", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestOrgNrLetters(){
+        testOrgNr = "12345678a";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Organization number must be 9 digits", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestOrgNrShort(){
+        testOrgNr = "12345";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Organization number must be 9 digits", exception.getMessage());
+    }
+
+    /* Mangler exception for når email er null
+    @Test
+    public void organizationTestContactEmailNull(){
+        testContactEmail = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+    }
+    */
+
+    @Test
+    public void organizationTestContactEmailTrim(){
+        testContactEmail = "test@mail.com   ";
+        Organization organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+    }
+
+    @Test
+    public void organizationTestContactEmailBlank(){
+        testContactEmail = "";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Email cannot be blank", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestContactEmailMissingAt(){
+        testContactEmail = "test.com";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Invalid email format", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestContactEmailDoubleAt(){
+        testContactEmail = "test@@mail.com";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Invalid email format", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestContactEmailMisplacedAt(){
+        testContactEmail = "@testmail.com";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Invalid email format", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestContactEmailMissingDot(){
+        testContactEmail = "test@mailcom";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Invalid email format", exception.getMessage());
+    }
+
+    @Test
+    public void organizationTestWebsiteMissingHttps(){
+        testWebsite = "test.com";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Website must start with http:// or https://", exception.getMessage());
+    }
+
+    /* Mangler exception når url mangler domain extension (.com f.eks)
+    @Test
+    public void organizationTestWebsiteMissingDot(){
+        testWebsite = "https://testcom";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Website must start with http:// or https://", exception.getMessage());
+    }
+    */
+
+    /* Mangler exception når website er null
+    @Test
+    public void organizationTestWebsiteMissingDot(){
+        testWebsite = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+
+        assertEquals("Website must start with http:// or https://", exception.getMessage());
+    }
+    */
+
+
+
+    //Getter tests
+    @Test
+    public void organizationTestNameGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testName, Organization.getName());
+    }
+
+    @Test
+    public void organizationTestOrgNrGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testOrgNr, Organization.getOrgNr());
+    }
+
+    @Test
+    public void organizationTestCauseGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testCause, Organization.getCause());
+    }
+
+    @Test
+    public void organizationDescriptionGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testDescription, Organization.getDescription());
+    }
+
+    @Test
+    public void organizationTestContactEmailGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testContactEmail, Organization.getContactEmail());
+    }
+
+    @Test
+    public void organizationTestWebsiteGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testWebsite, Organization.getWebsite());
+    }
 
+    @Test
+    public void organizationTestIsVerifiedGet(){
+        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        assertEquals(testVerified, Organization.isVerified());
+    }
 }
\ No newline at end of file
diff --git a/src/test/java/domain/UserTest.java b/src/test/java/domain/UserTest.java
index c21aa90..b1c8f14 100644
--- a/src/test/java/domain/UserTest.java
+++ b/src/test/java/domain/UserTest.java
@@ -1,5 +1,137 @@
 package domain;
 
+import domain.user.User;
+import org.junit.jupiter.api.Test;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+import static org.junit.jupiter.api.Assertions.assertThrows;
+
 class UserTest {
 
+    private String testUserName = "testUser";
+    private String testPhoneNumber = "90909090";
+    private String testEmail = "test@email.com";
+    private final String testPassword = "password";
+
+    //Positive tests
+    @Test
+    public void userTestPositive(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+    }
+
+    //Negative tests
+    @Test
+    public void userTestUserNameBlank(){
+        testUserName = "";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("Username has to be filled in", exception.getMessage());
+    }
+
+    @Test
+    public void userTestUserNameNull(){
+        testUserName = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("Username has to be filled in", exception.getMessage());
+    }
+
+    @Test
+    public void userTestPhoneNumberBlank(){
+        testPhoneNumber = "";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("Phonenumber has to be filled in", exception.getMessage());
+    }
+
+    @Test
+    public void userTestPhoneNumberNull(){
+        testPhoneNumber = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("Phonenumber has to be filled in", exception.getMessage());
+    }
+
+    @Test
+    public void userTestPhoneNumberShort() {
+        testPhoneNumber = "909090";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("Fill in a phonenumber with 8 digits", exception.getMessage());
+    }
+
+    @Test
+    public void userTestEmailBlank(){
+        testEmail = "";
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("E-mail has to be filled in", exception.getMessage());
+    }
+
+    @Test
+    public void userTestEmailNull(){
+        testEmail = null;
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+                () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
+
+        assertEquals("E-mail has to be filled in", exception.getMessage());
+    }
+
+    //Getter tests
+    @Test
+    public void userTestUserNameGet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        assertEquals(User.getUsername(), testUserName);
+    }
+
+    @Test
+    public void userTestPhoneNumberGet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        assertEquals(User.getPhoneNumber(), testPhoneNumber);
+    }
+
+    @Test
+    public void userTestEmailGet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        assertEquals(User.getEMail(), testEmail);
+    }
+
+    @Test
+    public void userTestPasswordGet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        assertEquals(User.getPassword(), testPassword);
+    }
+
+    //Setter tests
+    @Test
+    public void userTestPasswordSet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        String newPassword = "NewPassoword";
+        User.setPassword(newPassword);
+        assertEquals(newPassword, User.getPassword());
+    }
+
+    @Test
+    public void userTestUserNameSet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        String newUserName = "NewUsername";
+        User.setUsername(newUserName);
+        assertEquals(newUserName, User.getUsername());
+    }
+
+    @Test
+    public void userTestPhoneNumberSet(){
+        User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        String newPhoneNumber = "123456asdsad7"; //Trenger input validering
+        User.setPhonenumber(newPhoneNumber);
+        assertEquals(newPhoneNumber, User.getPhoneNumber());
+    }
+
+
+
 }
\ No newline at end of file
diff --git a/src/test/java/integration/security/Sha256PasswordHasherTest.java b/src/test/java/integration/security/Sha256PasswordHasherTest.java
new file mode 100644
index 0000000..67b360e
--- /dev/null
+++ b/src/test/java/integration/security/Sha256PasswordHasherTest.java
@@ -0,0 +1,26 @@
+package integration.security;
+
+import org.junit.jupiter.api.Test;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+public class Sha256PasswordHasherTest {
+    @Test
+    void hashReturnsExpectedSha256ForKnownInput() {
+        Sha256PasswordHasher hasher = new Sha256PasswordHasher();
+
+        String result = hasher.hash("password");
+
+        assertEquals("5e884898da28047151d0e56f8dc6292773603d0d6aabbdd62a11ef721d1542d8", result);
+    }
+
+    @Test
+    void hashReturns64CharacterLowercaseHexString() {
+        Sha256PasswordHasher hasher = new Sha256PasswordHasher();
+
+        String result = hasher.hash("secret");
+
+        assertEquals(64, result.length());
+        assertTrue(result.matches("[0-9a-f]{64}"));
+    }
+}

From e1eb759c77e114f5880f00bf2a49724c221a8ae3 Mon Sep 17 00:00:00 2001
From: lukaceli <lukas@celius.com>
Date: Thu, 16 Apr 2026 15:16:22 +0200
Subject: [PATCH 093/101] fixed package-import bug

---
 src/main/java/application/user/UserLogin.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/application/user/UserLogin.java b/src/main/java/application/user/UserLogin.java
index 50940ac..4392ee4 100644
--- a/src/main/java/application/user/UserLogin.java
+++ b/src/main/java/application/user/UserLogin.java
@@ -2,7 +2,7 @@
 
 import application.security.PasswordHasher;
 import domain.user.User;
-import persistence.UserRepository;
+import persistence.dao.UserRepository;
 
 public class UserLogin {
 

From 66b04753679624c5c10d2174670fc20d5a6d865b Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Sun, 19 Apr 2026 11:50:38 +0200
Subject: [PATCH 094/101] Refactor: moved OrganizationDetails to integration,
 since its job is to be an object that tranfers data

---
 src/main/java/app/Main.java                                     | 2 +-
 src/main/java/integration/InnsamlingskontrollenClient.java      | 1 -
 .../organization => integration}/OrganizationDetails.java       | 2 +-
 src/main/java/ui/controller/MainController.java                 | 2 +-
 src/main/java/ui/controller/OrganizationDetailController.java   | 2 +-
 5 files changed, 4 insertions(+), 5 deletions(-)
 rename src/main/java/{domain/organization => integration}/OrganizationDetails.java (96%)

diff --git a/src/main/java/app/Main.java b/src/main/java/app/Main.java
index 8c34abd..b6dd8e0 100644
--- a/src/main/java/app/Main.java
+++ b/src/main/java/app/Main.java
@@ -1,7 +1,7 @@
 package app;
 
 import domain.organization.Organization;
-import domain.organization.OrganizationDetails;
+import integration.OrganizationDetails;
 import integration.InnsamlingskontrollenClient;
 import application.security.PasswordHasher;
 import domain.donation.Donation;
diff --git a/src/main/java/integration/InnsamlingskontrollenClient.java b/src/main/java/integration/InnsamlingskontrollenClient.java
index 258f2e9..a4acc6d 100644
--- a/src/main/java/integration/InnsamlingskontrollenClient.java
+++ b/src/main/java/integration/InnsamlingskontrollenClient.java
@@ -8,7 +8,6 @@
 
 import com.fasterxml.jackson.databind.ObjectMapper;
 import domain.organization.Organization;
-import domain.organization.OrganizationDetails;
 import org.jsoup.Jsoup;
 import org.jsoup.nodes.Document;
 
diff --git a/src/main/java/domain/organization/OrganizationDetails.java b/src/main/java/integration/OrganizationDetails.java
similarity index 96%
rename from src/main/java/domain/organization/OrganizationDetails.java
rename to src/main/java/integration/OrganizationDetails.java
index a86920a..ca9421c 100644
--- a/src/main/java/domain/organization/OrganizationDetails.java
+++ b/src/main/java/integration/OrganizationDetails.java
@@ -1,4 +1,4 @@
-package domain.organization;
+package integration;
 
 /**
  * Holds additional details about an organization fetched from Innsamlingskontrollen's website.
diff --git a/src/main/java/ui/controller/MainController.java b/src/main/java/ui/controller/MainController.java
index 93d83be..c586dbf 100644
--- a/src/main/java/ui/controller/MainController.java
+++ b/src/main/java/ui/controller/MainController.java
@@ -3,7 +3,7 @@
 import application.user.UserRegister;
 import application.user.UserSignIn;
 import domain.organization.Organization;
-import domain.organization.OrganizationDetails;
+import integration.OrganizationDetails;
 import integration.InnsamlingskontrollenClient;
 import integration.security.Sha256PasswordHasher;
 import javafx.fxml.FXML;
diff --git a/src/main/java/ui/controller/OrganizationDetailController.java b/src/main/java/ui/controller/OrganizationDetailController.java
index 0775ea0..b741862 100644
--- a/src/main/java/ui/controller/OrganizationDetailController.java
+++ b/src/main/java/ui/controller/OrganizationDetailController.java
@@ -1,7 +1,7 @@
 package ui.controller;
 
 import domain.organization.Organization;
-import domain.organization.OrganizationDetails;
+import integration.OrganizationDetails;
 import javafx.fxml.FXML;
 import javafx.scene.control.Hyperlink;
 import javafx.scene.control.Label;

From 03559170c08d1feb819149a19fccdeee7a23a669 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 21 Apr 2026 14:11:19 +0200
Subject: [PATCH 095/101] fix: fix all tests

---
 src/main/java/domain/user/User.java           |  43 +++-
 .../java/application/user/UserLoginTest.java  |   4 +-
 .../application/user/UserRegisterTest.java    |   6 +-
 .../application/user/UserStatisticsTest.java  |  46 ++--
 src/test/java/domain/DonationTest.java        |  85 +++-----
 src/test/java/domain/OrganizationTest.java    | 198 ++----------------
 src/test/java/domain/UserTest.java            |  19 +-
 7 files changed, 126 insertions(+), 275 deletions(-)

diff --git a/src/main/java/domain/user/User.java b/src/main/java/domain/user/User.java
index 5d471cc..e423710 100644
--- a/src/main/java/domain/user/User.java
+++ b/src/main/java/domain/user/User.java
@@ -7,7 +7,7 @@
 public class User {
   private String userName;
   private String phoneNumber;
-  private final String eMail;
+  private String eMail;
   private String password;
   private Long id;
 
@@ -87,6 +87,47 @@ public String getPassword() {
    */
   public long getID() { return id; }
 
+  /**
+   * Sets the username of this user.
+   * @param userName the new username; must not be null or blank
+   */
+  public void setUsername(String userName) {
+    if (userName == null || userName.isBlank()) {
+      throw new IllegalArgumentException("Username has to be filled in");
+    }
+    this.userName = userName;
+  }
+
+  /**
+   * Sets the phone number of this user.
+   * @param phoneNumber the new phone number; must be exactly 8 digits
+   */
+  public void setPhoneNumber(String phoneNumber) {
+    if (phoneNumber == null || phoneNumber.isBlank() || phoneNumber.length() != 8) {
+      throw new IllegalArgumentException("Fill in a phonenumber with 8 digits");
+    }
+    this.phoneNumber = phoneNumber;
+  }
+
+  /**
+   * Sets the email address of this user.
+   * @param eMail the new email address; must be a valid email format
+   */
+  public void setEmail(String eMail) {
+    if (!isValidEmail(eMail)) {
+      throw new IllegalArgumentException("Invalid email address: " + eMail);
+    }
+    this.eMail = eMail.trim();
+  }
+
+  /**
+   * Sets the password hash of this user.
+   * @param password the new hashed password
+   */
+  public void setPassword(String password) {
+    this.password = password;
+  }
+
   /**
    * Sets the ID for this user.
    *
diff --git a/src/test/java/application/user/UserLoginTest.java b/src/test/java/application/user/UserLoginTest.java
index 4bd8312..20caec1 100644
--- a/src/test/java/application/user/UserLoginTest.java
+++ b/src/test/java/application/user/UserLoginTest.java
@@ -3,7 +3,7 @@
 import application.security.PasswordHasher;
 import domain.user.User;
 import org.junit.jupiter.api.Test;
-import persistence.UserRepository;
+import persistence.dao.UserRepository;
 
 import java.util.Optional;
 
@@ -155,6 +155,8 @@ public boolean existsByUsername(String username) {
         @Override
         public void insert(User user) {
         }
+
+
     }
 
 
diff --git a/src/test/java/application/user/UserRegisterTest.java b/src/test/java/application/user/UserRegisterTest.java
index c5296cd..a4807cd 100644
--- a/src/test/java/application/user/UserRegisterTest.java
+++ b/src/test/java/application/user/UserRegisterTest.java
@@ -3,7 +3,7 @@
 import application.security.PasswordHasher;
 import domain.user.User;
 import org.junit.jupiter.api.Test;
-import persistence.UserRepository;
+import persistence.dao.UserRepository;
 
 import java.util.Optional;
 
@@ -23,7 +23,7 @@ void executeInsertsUserWhenInputIsValid() {
         assertEquals("testuser", repo.insertedUser.getUsername());
         assertEquals("12345678", repo.insertedUser.getPhoneNumber());
         assertEquals("hashed-password", repo.insertedUser.getPassword());
-        assertEquals("test@example.com", repo.insertedUser.getEMail());
+        assertEquals("test@example.com", repo.insertedUser.getEmail());
     }
 
 
@@ -38,7 +38,7 @@ void executeNormalizesUsernameEmailAndPhoneBeforeInsert() {
         assertNotNull(repo.insertedUser);
         assertEquals("testuser", repo.insertedUser.getUsername());
         assertEquals("12345678", repo.insertedUser.getPhoneNumber());
-        assertEquals("test@example.com", repo.insertedUser.getEMail());
+        assertEquals("test@example.com", repo.insertedUser.getEmail());
     }
 
 
diff --git a/src/test/java/application/user/UserStatisticsTest.java b/src/test/java/application/user/UserStatisticsTest.java
index da904cb..492ac43 100644
--- a/src/test/java/application/user/UserStatisticsTest.java
+++ b/src/test/java/application/user/UserStatisticsTest.java
@@ -2,7 +2,7 @@
 
 import domain.user.User;
 import org.junit.jupiter.api.Test;
-import persistence.DonationDao;
+import persistence.dao.DonationDao;
 
 import java.lang.reflect.Field;
 import java.util.List;
@@ -12,28 +12,28 @@
 public class UserStatisticsTest {
 
     @Test
-    void userFavoriteOrganizationsReturnsListFromDonationDao() throws Exception {
+    void userFavoriteOrganization_returnsListFromDonationDao() throws Exception {
         FakeDonationDao fakeDao = new FakeDonationDao();
         fakeDao.favoriteOrganizationsToReturn = List.of(
-                "Org1 (3 donasjoner)",
-                "Org2 (2 donasjoner)"
+            "Org1 (3 donasjoner)",
+            "Org2 (2 donasjoner)"
         );
 
         UserStatistics statistics = createStatisticsWithFakeDao(fakeDao);
         User user = createUserWithId(42L);
 
-        List<String> result = statistics.userFavoriteOrganizations(user);
+        List<String> result = statistics.userFavoriteOrganization(user);
 
         assertEquals(List.of("Org1 (3 donasjoner)", "Org2 (2 donasjoner)"), result);
         assertEquals(42L, fakeDao.lastUserIdForFavorites);
     }
 
     @Test
-    void userDonationsReturnsListFromDonationDao() throws Exception {
+    void userDonations_returnsListFromDonationDao() throws Exception {
         FakeDonationDao fakeDao = new FakeDonationDao();
         fakeDao.userDonationsToReturn = List.of(
-                "Amount: 100, Date: 2026-04-15, Organization: Org1",
-                "Amount: 50, Date: 2026-04-16, Organization: Org2"
+            "Amount: 100, Date: 2026-04-15, Organization: Org1",
+            "Amount: 50, Date: 2026-04-16, Organization: Org2"
         );
 
         UserStatistics statistics = createStatisticsWithFakeDao(fakeDao);
@@ -42,14 +42,14 @@ void userDonationsReturnsListFromDonationDao() throws Exception {
         List<String> result = statistics.userDonations(user);
 
         assertEquals(List.of(
-                "Amount: 100, Date: 2026-04-15, Organization: Org1",
-                "Amount: 50, Date: 2026-04-16, Organization: Org2"
+            "Amount: 100, Date: 2026-04-15, Organization: Org1",
+            "Amount: 50, Date: 2026-04-16, Organization: Org2"
         ), result);
         assertEquals(7L, fakeDao.lastUserIdForDonations);
     }
 
     @Test
-    void userTotalDonationAmountReturnsValueFromDonationDao() throws Exception {
+    void userTotalDonationAmount_returnsValueFromDonationDao() throws Exception {
         FakeDonationDao fakeDao = new FakeDonationDao();
         fakeDao.totalDonationAmountToReturn = "250.00";
 
@@ -63,7 +63,7 @@ void userTotalDonationAmountReturnsValueFromDonationDao() throws Exception {
     }
 
     @Test
-    void getTotalDonationsMadeReturnsValueFromDonationDao() throws Exception {
+    void getTotalDonationsMade_returnsValueFromDonationDao() throws Exception {
         FakeDonationDao fakeDao = new FakeDonationDao();
         fakeDao.totalDonationsMadeToReturn = "5";
 
@@ -76,15 +76,11 @@ void getTotalDonationsMadeReturnsValueFromDonationDao() throws Exception {
         assertEquals(99L, fakeDao.lastUserIdForTotalCount);
     }
 
-
-
     private UserStatistics createStatisticsWithFakeDao(FakeDonationDao fakeDao) throws Exception {
         UserStatistics statistics = new UserStatistics();
-
         Field field = UserStatistics.class.getDeclaredField("donationDao");
         field.setAccessible(true);
         field.set(statistics, fakeDao);
-
         return statistics;
     }
 
@@ -95,18 +91,18 @@ private User createUserWithId(long id) {
     }
 
     private static class FakeDonationDao extends DonationDao {
-        private List<String> favoriteOrganizationsToReturn = List.of();
-        private List<String> userDonationsToReturn = List.of();
-        private String totalDonationAmountToReturn = "0";
-        private String totalDonationsMadeToReturn = "0";
+        List<String> favoriteOrganizationsToReturn = List.of();
+        List<String> userDonationsToReturn = List.of();
+        String totalDonationAmountToReturn = "0";
+        String totalDonationsMadeToReturn = "0";
 
-        private long lastUserIdForFavorites;
-        private long lastUserIdForDonations;
-        private long lastUserIdForTotalAmount;
-        private long lastUserIdForTotalCount;
+        long lastUserIdForFavorites;
+        long lastUserIdForDonations;
+        long lastUserIdForTotalAmount;
+        long lastUserIdForTotalCount;
 
         @Override
-        public List<String> getFavoriteOrganizations(long userId) {
+        public List<String> getFavoriteOrganization(long userId) {
             lastUserIdForFavorites = userId;
             return favoriteOrganizationsToReturn;
         }
diff --git a/src/test/java/domain/DonationTest.java b/src/test/java/domain/DonationTest.java
index ea73049..57c5be1 100644
--- a/src/test/java/domain/DonationTest.java
+++ b/src/test/java/domain/DonationTest.java
@@ -1,6 +1,5 @@
 package domain;
 
-import domain.donation.Cause;
 import domain.donation.Donation;
 import domain.organization.Organization;
 import domain.user.User;
@@ -17,104 +16,68 @@
 
 class DonationTest {
 
-    //User Variables
-    private final String testUserName = "testUser";
-    private final String testPhoneNumber = "90909090";
-    private final String testEmail = "test@email.com";
-    private final String testPassword = "password";
-
-    //Organization Variables
-    private final String testName = "Name";
-    private final String testOrgNr = "123456789";
-    private final Cause testCause = Cause.HEALTH;
-    private final String testDescription = "Description";
-    private final String testContactEmail = "test@mail.com";
-    private final String testWebsite = "https://test.com";
-    private final boolean testVerified = true;
-
-    //Donation Variables
-    private Long testID = 123L;
-    private BigDecimal testAmount = new BigDecimal("1500");
-    private LocalDateTime testDateTime = LocalDateTime.of(2026, 3, 5, 8, 30, 0);
     private User testUser;
     private Organization testOrganization;
+    private BigDecimal testAmount = new BigDecimal("1500");
 
     @BeforeEach
     public void init() {
-        testUser = new User(testUserName, testPhoneNumber, testPassword, testEmail);
-        testOrganization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
+        testUser = new User("testUser", "90909090", "password", "test@email.com");
+        testOrganization = new Organization();
+        testOrganization.setOrgNumber("123456789");
+        testOrganization.setName("Test Organization");
+        testOrganization.setStatus("approved");
+        testOrganization.setUrl("https://test.com");
     }
 
-
     @Test
-    public void DonationTestPositive(){
+    public void validDonation_createsSuccessfully() {
         Donation donation = new Donation(testAmount, testUser, testOrganization);
     }
 
     @Test
-    public void DonationTestUserNull(){
-        testUser = null;
-        NullPointerException Exception = assertThrows(NullPointerException.class,
-                () -> new Donation (testAmount, testUser, testOrganization));
-
-        assertEquals("User cannot be null", Exception.getMessage());
-    }
-
-    @Test
-    public void DonationOrganizationNull(){
-        testOrganization = null;
-        NullPointerException Exception = assertThrows(NullPointerException.class,
-                () -> new Donation (testAmount, testUser, testOrganization));
-
-        assertEquals("Organization cannot be null", Exception.getMessage());
+    public void nullUser_throwsNullPointerException() {
+        NullPointerException exception = assertThrows(NullPointerException.class,
+            () -> new Donation(testAmount, null, testOrganization));
+        assertEquals("User cannot be null", exception.getMessage());
     }
 
     @Test
-    public void DonationTestAmountNegative(){
-        testAmount = new BigDecimal("-23");
-        IllegalArgumentException Exception = assertThrows(IllegalArgumentException.class,
-                () -> new Donation (testAmount, testUser, testOrganization));
-
-        assertEquals("Amount must be greater than 0", Exception.getMessage());
+    public void nullOrganization_throwsNullPointerException() {
+        NullPointerException exception = assertThrows(NullPointerException.class,
+            () -> new Donation(testAmount, testUser, null));
+        assertEquals("Organization cannot be null", exception.getMessage());
     }
 
-    //Getter tests
-    /* id is never set, getter makes a NullPointerException
     @Test
-    public void DonationTestIdGet(){
-        Donation donation = new Donation(testAmount, testUser, testOrganization);
-        assertEquals(0L, donation.getId());
-
+    public void negativeAmount_throwsIllegalArgumentException() {
+        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+            () -> new Donation(new BigDecimal("-23"), testUser, testOrganization));
+        assertEquals("Amount must be greater than 0", exception.getMessage());
     }
-    */
 
     @Test
-    public void DonationTestAmountGet(){
+    public void getAmount_returnsCorrectValue() {
         Donation donation = new Donation(testAmount, testUser, testOrganization);
         assertEquals(testAmount, donation.getAmount());
-
     }
 
     @Test
-    public void DonationTestDateTimeGet(){
+    public void getDateTime_returnsCurrentTime() {
         LocalDateTime now = LocalDateTime.now();
         Donation donation = new Donation(testAmount, testUser, testOrganization);
-
         assertTrue(Duration.between(now, donation.getDateTime()).abs().toMillis() < 1000);
-
     }
 
     @Test
-    public void DonationTestUserGet(){
+    public void getUser_returnsCorrectUser() {
         Donation donation = new Donation(testAmount, testUser, testOrganization);
         assertEquals(testUser, donation.getUser());
-
     }
 
     @Test
-    public void DonationTestOrganizationGet(){
+    public void getOrganization_returnsCorrectOrganization() {
         Donation donation = new Donation(testAmount, testUser, testOrganization);
         assertEquals(testOrganization, donation.getOrganization());
-
     }
 }
\ No newline at end of file
diff --git a/src/test/java/domain/OrganizationTest.java b/src/test/java/domain/OrganizationTest.java
index 47c8024..b15d2da 100644
--- a/src/test/java/domain/OrganizationTest.java
+++ b/src/test/java/domain/OrganizationTest.java
@@ -1,207 +1,51 @@
 package domain;
 
-import domain.donation.Cause;
 import domain.organization.Organization;
 import domain.user.User;
+import org.junit.jupiter.api.BeforeEach;
 import org.junit.jupiter.api.Test;
 
 import static org.junit.jupiter.api.Assertions.assertEquals;
 import static org.junit.jupiter.api.Assertions.assertThrows;
+import static org.junit.jupiter.api.Assertions.assertTrue;
 
 class OrganizationTest {
-    private String testName = "Name";
-    private String testOrgNr = "123456789";
-    private Cause testCause = Cause.HEALTH;
-    private String testDescription = "Description";
-    private String testContactEmail = "test@mail.com";
-    private String testWebsite = "https://test.com";
-    private boolean testVerified = true;
 
-    //Positive tests
-    @Test
-    public void organizationTestPositive(){
-        Organization organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
-    }
+    private Organization organization;
 
-    //Negative tests
-    @Test
-    public void organizationTestNameBlank(){
-        testName = "";
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization("", testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Name cannot be null or blank", exception.getMessage());
+    @BeforeEach
+    public void init() {
+        organization = new Organization();
+        organization.setOrgNumber("123456789");
+        organization.setName("Test Organization");
+        organization.setStatus("approved");
+        organization.setUrl("https://test.com");
+        organization.setPreApproved(true);
     }
 
     @Test
-    public void organizationTestNameNull(){
-        testName = null;
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Name cannot be null or blank", exception.getMessage());
+    public void getOrgNumber_returnsCorrectValue() {
+        assertEquals("123456789", organization.getOrgNumber());
     }
 
     @Test
-    public void organizationTestOrgNrNull(){
-        testOrgNr = null;
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Organization number must be 9 digits", exception.getMessage());
+    public void getName_returnsCorrectValue() {
+        assertEquals("Test Organization", organization.getName());
     }
 
     @Test
-    public void organizationTestOrgNrLetters(){
-        testOrgNr = "12345678a";
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Organization number must be 9 digits", exception.getMessage());
+    public void getStatus_returnsCorrectValue() {
+        assertEquals("approved", organization.getStatus());
     }
 
     @Test
-    public void organizationTestOrgNrShort(){
-        testOrgNr = "12345";
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Organization number must be 9 digits", exception.getMessage());
+    public void getUrl_returnsCorrectValue() {
+        assertEquals("https://test.com", organization.getUrl());
     }
 
-    /* Mangler exception for når email er null
     @Test
-    public void organizationTestContactEmailNull(){
-        testContactEmail = null;
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
+    public void isPreApproved_returnsTrue() {
+        assertTrue(organization.isPreApproved());
     }
-    */
-
-    @Test
-    public void organizationTestContactEmailTrim(){
-        testContactEmail = "test@mail.com   ";
-        Organization organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
-    }
-
-    @Test
-    public void organizationTestContactEmailBlank(){
-        testContactEmail = "";
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Email cannot be blank", exception.getMessage());
-    }
-
-    @Test
-    public void organizationTestContactEmailMissingAt(){
-        testContactEmail = "test.com";
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Invalid email format", exception.getMessage());
-    }
-
-    @Test
-    public void organizationTestContactEmailDoubleAt(){
-        testContactEmail = "test@@mail.com";
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Invalid email format", exception.getMessage());
-    }
-
-    @Test
-    public void organizationTestContactEmailMisplacedAt(){
-        testContactEmail = "@testmail.com";
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Invalid email format", exception.getMessage());
-    }
-
-    @Test
-    public void organizationTestContactEmailMissingDot(){
-        testContactEmail = "test@mailcom";
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Invalid email format", exception.getMessage());
-    }
-
-    @Test
-    public void organizationTestWebsiteMissingHttps(){
-        testWebsite = "test.com";
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
 
-        assertEquals("Website must start with http:// or https://", exception.getMessage());
-    }
-
-    /* Mangler exception når url mangler domain extension (.com f.eks)
-    @Test
-    public void organizationTestWebsiteMissingDot(){
-        testWebsite = "https://testcom";
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Website must start with http:// or https://", exception.getMessage());
-    }
-    */
-
-    /* Mangler exception når website er null
-    @Test
-    public void organizationTestWebsiteMissingDot(){
-        testWebsite = null;
-        IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
-                () -> new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified));
-
-        assertEquals("Website must start with http:// or https://", exception.getMessage());
-    }
-    */
-
-
-
-    //Getter tests
-    @Test
-    public void organizationTestNameGet(){
-        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
-        assertEquals(testName, Organization.getName());
-    }
-
-    @Test
-    public void organizationTestOrgNrGet(){
-        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
-        assertEquals(testOrgNr, Organization.getOrgNr());
-    }
-
-    @Test
-    public void organizationTestCauseGet(){
-        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
-        assertEquals(testCause, Organization.getCause());
-    }
-
-    @Test
-    public void organizationDescriptionGet(){
-        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
-        assertEquals(testDescription, Organization.getDescription());
-    }
-
-    @Test
-    public void organizationTestContactEmailGet(){
-        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
-        assertEquals(testContactEmail, Organization.getContactEmail());
-    }
-
-    @Test
-    public void organizationTestWebsiteGet(){
-        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
-        assertEquals(testWebsite, Organization.getWebsite());
-    }
-
-    @Test
-    public void organizationTestIsVerifiedGet(){
-        Organization Organization = new Organization(testName, testOrgNr, testCause, testDescription, testContactEmail, testWebsite, testVerified);
-        assertEquals(testVerified, Organization.isVerified());
-    }
 }
\ No newline at end of file
diff --git a/src/test/java/domain/UserTest.java b/src/test/java/domain/UserTest.java
index b1c8f14..2aa440c 100644
--- a/src/test/java/domain/UserTest.java
+++ b/src/test/java/domain/UserTest.java
@@ -70,7 +70,7 @@ public void userTestEmailBlank(){
         IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
                 () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
 
-        assertEquals("E-mail has to be filled in", exception.getMessage());
+        assertEquals("Invalid email address: ", exception.getMessage());
     }
 
     @Test
@@ -79,7 +79,7 @@ public void userTestEmailNull(){
         IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
                 () -> new User(testUserName, testPhoneNumber, testPassword, testEmail));
 
-        assertEquals("E-mail has to be filled in", exception.getMessage());
+        assertEquals("Invalid email address: null", exception.getMessage());
     }
 
     //Getter tests
@@ -98,7 +98,7 @@ public void userTestPhoneNumberGet(){
     @Test
     public void userTestEmailGet(){
         User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
-        assertEquals(User.getEMail(), testEmail);
+        assertEquals(User.getEmail(), testEmail);
     }
 
     @Test
@@ -127,11 +127,16 @@ public void userTestUserNameSet(){
     @Test
     public void userTestPhoneNumberSet(){
         User User = new User(testUserName, testPhoneNumber, testPassword, testEmail);
-        String newPhoneNumber = "123456asdsad7"; //Trenger input validering
-        User.setPhonenumber(newPhoneNumber);
+        String newPhoneNumber = "12345678";
+        User.setPhoneNumber(newPhoneNumber);
         assertEquals(newPhoneNumber, User.getPhoneNumber());
     }
 
-
-
+    @Test
+    public void userTestEmailSet() {
+        User user = new User(testUserName, testPhoneNumber, testPassword, testEmail);
+        String newEmail = "new@email.com";
+        user.setEmail(newEmail);
+        assertEquals(newEmail, user.getEmail());
+    }
 }
\ No newline at end of file

From a05b1f22ba0abdaf3f40d63bc9963ccc55a512cc Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 21 Apr 2026 14:33:47 +0200
Subject: [PATCH 096/101] feat: logo is bigger and takes you to homepage on
 interaction

---
 .../java/ui/controller/NavbarController.java  |  15 +++
 src/main/resources/css/Global.css             |   2 +-
 src/main/resources/view/MyProfile.fxml        | 114 ++++++++++++++++--
 src/main/resources/view/Navbar.fxml           |   2 +-
 4 files changed, 120 insertions(+), 13 deletions(-)

diff --git a/src/main/java/ui/controller/NavbarController.java b/src/main/java/ui/controller/NavbarController.java
index 0be90c5..af0d65f 100644
--- a/src/main/java/ui/controller/NavbarController.java
+++ b/src/main/java/ui/controller/NavbarController.java
@@ -4,6 +4,7 @@
 
 import javafx.fxml.FXML;
 import javafx.scene.control.Button;
+import javafx.scene.control.Label;
 import javafx.scene.layout.HBox;
 import ui.Page;
 import util.SessionManager;
@@ -23,6 +24,8 @@ public class NavbarController {
     private Button orgBtn;
     @FXML
     private Button signInBtn;
+    @FXML
+    private Label logoLabel;
 
     /**
      * Sets the navigation callback.
@@ -56,6 +59,7 @@ public void setActivePage(Page page) {
     /**
      * Navigates to the home page.
      */
+    @FXML
     public void goHome() {
         onNavigate.accept(Page.HOME);
     }
@@ -63,6 +67,7 @@ public void goHome() {
     /**
      * Navigates to the sign in page or profile page depending on authentication state.
      */
+    @FXML
     public void goToSignIn() {
         if (SessionManager.isSignedIn()) {
             onNavigate.accept(Page.PROFILE);
@@ -74,10 +79,12 @@ public void goToSignIn() {
     /**
      * Navigates to the organizations page.
      */
+    @FXML
     public void goToOrganizations() {
         onNavigate.accept(Page.ORGANIZATIONS);
     }
 
+
     /**
      * Updates the sign in button text based on the user's authentication state.
      * Shows "My Profile" if signed in, "Sign In" otherwise.
@@ -90,6 +97,14 @@ public void updateAuthButton() {
         }
     }
 
+    /**
+     * Navigates to the home page.
+     */
+    @FXML
+    private void handleLogoClick() {
+        onNavigate.accept(Page.HOME);
+    }
+
     /**
      * Hides the navbar.
      */
diff --git a/src/main/resources/css/Global.css b/src/main/resources/css/Global.css
index 7a2eeac..e0253c6 100644
--- a/src/main/resources/css/Global.css
+++ b/src/main/resources/css/Global.css
@@ -121,7 +121,7 @@
 }
 
 .logo-label {
-    -fx-font-size: 22px;
+    -fx-font-size: 32px;
     -fx-font-family: "Times New Roman";
     -fx-text-fill: white;
     -fx-font-weight: bold;
diff --git a/src/main/resources/view/MyProfile.fxml b/src/main/resources/view/MyProfile.fxml
index 40ec2de..7ae4bde 100644
--- a/src/main/resources/view/MyProfile.fxml
+++ b/src/main/resources/view/MyProfile.fxml
@@ -4,34 +4,123 @@
 <?import javafx.geometry.Insets?>
 <?import javafx.scene.control.Button?>
 <?import javafx.scene.control.Label?>
+<?import javafx.scene.control.PasswordField?>
 <?import javafx.scene.control.ScrollPane?>
 <?import javafx.scene.control.TableColumn?>
 <?import javafx.scene.control.TableView?>
+<?import javafx.scene.control.TextField?>
 <?import javafx.scene.layout.BorderPane?>
 <?import javafx.scene.layout.FlowPane?>
 <?import javafx.scene.layout.HBox?>
+<?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 
 <BorderPane xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.MyProfileController">
    <center>
-      <ScrollPane fitToWidth="true" hbarPolicy="NEVER" BorderPane.alignment="CENTER">
+      <ScrollPane fx:id="scrollPane" fitToWidth="true" hbarPolicy="NEVER" BorderPane.alignment="CENTER">
          <content>
             <VBox prefHeight="800.0" spacing="25.0">
                <children>
                   <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
                      <children>
                         <Label styleClass="section-title" text="My Profile" />
-                        <VBox fx:id="MyProfile" prefHeight="100.0" prefWidth="187.0" spacing="10.0" styleClass="org-card">
+                        <VBox fx:id="myProfile" prefHeight="100.0" prefWidth="187.0" spacing="10.0" styleClass="org-card">
                            <children>
-                              <Label fx:id="nameLabel" styleClass="profile-label" text="Name: " />
-                              <Label fx:id="emailLabel" styleClass="profile-label" text="Email:" />
-                              <Label fx:id="phoneLabel" styleClass="profile-label" text="Phone:" />
-                              <Button mnemonicParsing="false" styleClass="page-button" text="Edit Profile" />
+                              <VBox prefHeight="200.0" prefWidth="100.0">
+                                 <children>
+                                    <Label styleClass="field-label" text="Name:" />
+                                    <Label fx:id="nameLabel" styleClass="profile-label" />
+                                 </children>
+                              </VBox>
+                              <VBox prefHeight="200.0" prefWidth="100.0">
+                                 <children>
+                                    <Label styleClass="field-label" text="Email:" />
+                                    <Label fx:id="emailLabel" styleClass="profile-label" />
+                                 </children>
+                              </VBox>
+                              <VBox prefHeight="200.0" prefWidth="100.0">
+                                 <children>
+                                    <Label styleClass="field-label" text="Phone number:" />
+                                    <Label fx:id="phoneLabel" styleClass="profile-label" />
+                                 </children>
+                              </VBox>
+                              <Button mnemonicParsing="false" onAction="#handleEditProfile" styleClass="secondary-button" text="Edit Profile" />
                            </children>
                            <padding>
                               <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
                            </padding>
                         </VBox>
+                        <VBox fx:id="editProfilePane" managed="false" styleClass="org-card" visible="false">
+                           <children>
+                              <HBox prefHeight="100.0" prefWidth="200.0">
+                                 <children>
+                                    <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0" HBox.hgrow="ALWAYS">
+                                       <children>
+                                          <VBox prefHeight="200.0" prefWidth="100.0">
+                                             <children>
+                                                <Label styleClass="field-label" text="Name" />
+                                                <TextField fx:id="editNameField" styleClass="input-field">
+                                                   <VBox.margin>
+                                                      <Insets />
+                                                   </VBox.margin>
+                                                </TextField>
+                                             </children>
+                                          </VBox>
+                                          <VBox prefHeight="200.0" prefWidth="100.0">
+                                             <children>
+                                                <Label styleClass="field-label" text="Email" />
+                                                <TextField fx:id="editEmailField" styleClass="input-field" />
+                                             </children>
+                                          </VBox>
+                                          <VBox prefHeight="200.0" prefWidth="100.0">
+                                             <children>
+                                                <Label styleClass="field-label" text="Phone number" />
+                                                <TextField fx:id="editPhoneField" styleClass="input-field" />
+                                             </children>
+                                          </VBox>
+                                       </children>
+                                       <padding>
+                                          <Insets bottom="15.0" right="15.0" top="15.0" />
+                                       </padding>
+                                    </VBox>
+                                    <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0" HBox.hgrow="ALWAYS">
+                                       <children>
+                                          <VBox prefHeight="200.0" prefWidth="100.0">
+                                             <children>
+                                                <Label styleClass="field-label" text="New passsword" />
+                                                <PasswordField fx:id="newPasswordField" styleClass="input-field" />
+                                             </children>
+                                          </VBox>
+                                          <VBox prefHeight="200.0" prefWidth="100.0">
+                                             <children>
+                                                <Label styleClass="field-label" text="Confirm password" />
+                                                <PasswordField fx:id="confirmPasswordField" styleClass="input-field" />
+                                             </children>
+                                          </VBox>
+                                          <Region prefHeight="200.0" prefWidth="200.0" />
+                                       </children>
+                                       <padding>
+                                          <Insets bottom="15.0" left="15.0" top="15.0" />
+                                       </padding>
+                                    </VBox>
+                                 </children>
+                              </HBox>
+                              <VBox alignment="TOP_RIGHT">
+                                 <children>
+                                    <HBox alignment="TOP_RIGHT" prefHeight="42.0" prefWidth="211.0" spacing="10.0">
+                                       <children>
+                                          <Button mnemonicParsing="false" onAction="#handleCancelEdit" styleClass="secondary-button" text="Cancel" />
+                                          <Button mnemonicParsing="false" onAction="#handleSaveProfile" styleClass="confirm-button" text="Save Profile" />
+                                       </children>
+                                       <padding>
+                                          <Insets left="15.0" right="15.0" />
+                                       </padding>
+                                    </HBox>
+                                    <Label fx:id="errorLabel" alignment="CENTER" styleClass="error-label" />
+                                 </children>
+                              </VBox>
+                           </children>
+                        </VBox>
                      </children>
                   </VBox>
                   <VBox fx:id="Statistics" prefHeight="100.0" prefWidth="173.0">
@@ -64,22 +153,25 @@
                         </HBox>
                      </children>
                   </VBox>
-                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
+                  <VBox spacing="10.0">
                      <children>
                         <Label styleClass="section-title" text="Donation history" />
-                        <TableView fx:id="donationTable" prefHeight="200.0" prefWidth="200.0">
+                        <TableView fx:id="donationTable" minHeight="200.0" prefHeight="200.0" VBox.vgrow="ALWAYS">
                           <columns>
-                              <TableColumn fx:id="orgColumn"    prefWidth="250.00003564357758" text="Organizations" />
+                              <TableColumn fx:id="orgColumn" prefWidth="250.00003564357758" text="Organizations" />
                               <TableColumn fx:id="amountColumn" minWidth="0.0" prefWidth="131.99998474121094" text="Amount" />
-                              <TableColumn fx:id="dateColumn"   prefWidth="116.0" text="Date" />
+                              <TableColumn fx:id="dateColumn" prefWidth="116.0" text="Date" />
                           </columns>
+                           <columnResizePolicy>
+                              <TableView fx:constant="CONSTRAINED_RESIZE_POLICY" />
+                           </columnResizePolicy>
                         </TableView>
                      </children>
                   </VBox>
                   <VBox fx:id="MyOrganizations" prefHeight="100.0" prefWidth="184.0">
                      <children>
                         <Label styleClass="section-title" text="Saved Organizations" />
-                        <FlowPane fx:id="savedOrgsPane" prefHeight="200.0" prefWidth="200.0" />
+                        <FlowPane fx:id="savedOrgsPane" hgap="15.0" prefHeight="200.0" prefWidth="200.0" vgap="15.0" />
                      </children>
                   </VBox>
                   <Button mnemonicParsing="false" onAction="#handleSignOut" styleClass="page-button" text="Log out">
diff --git a/src/main/resources/view/Navbar.fxml b/src/main/resources/view/Navbar.fxml
index 1dd0fd7..7b61d6f 100644
--- a/src/main/resources/view/Navbar.fxml
+++ b/src/main/resources/view/Navbar.fxml
@@ -7,7 +7,7 @@
 <?import javafx.scene.layout.Region?>
 
 <HBox fx:id="navBar" alignment="CENTER_LEFT" maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" prefHeight="89.0" prefWidth="595.0" spacing="15.0" styleClass="navbar" stylesheets="@../css/Global.css" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.NavbarController">
-     <Label styleClass="logo-label" text="Give Hope" />
+     <Label fx:id="logoLabel" onMouseClicked="#handleLogoClick" style="-fx-cursor: hand;" styleClass="logo-label" text="Give Hope" />
      <Region maxHeight="1.7976931348623157E308" maxWidth="1.7976931348623157E308" HBox.hgrow="ALWAYS" />
 
         <Button fx:id="homeBtn" onAction="#goHome" styleClass="nav-button" text="Home" />

From 62af02072d37ef5644da94cfc92ba694508a0d49 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 21 Apr 2026 14:43:24 +0200
Subject: [PATCH 097/101] fix: update text from norwegian to english

---
 src/main/java/persistence/dao/DonationDao.java | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/src/main/java/persistence/dao/DonationDao.java b/src/main/java/persistence/dao/DonationDao.java
index c4893ec..dcf6cb1 100644
--- a/src/main/java/persistence/dao/DonationDao.java
+++ b/src/main/java/persistence/dao/DonationDao.java
@@ -276,6 +276,6 @@ private String mapRowSimple(ResultSet rs) throws SQLException {
    */
   private String mapRowFavorite(ResultSet rs) throws SQLException {
     return rs.getString("name")
-        + " (" + rs.getInt("donation_count") + " donasjoner)";
+        + " (" + rs.getInt("donation_count") + " donations)";
   }
 }

From 8325390c02ef76e2297c94cc7ed38a96eb15b99e Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 21 Apr 2026 15:04:12 +0200
Subject: [PATCH 098/101] fix: fixes bug in description in organization detail
 pop up

---
 .../ui/controller/OrganizationDetailController.java    |  2 ++
 src/main/resources/view/OrganizationDetail.fxml        | 10 +++++-----
 2 files changed, 7 insertions(+), 5 deletions(-)

diff --git a/src/main/java/ui/controller/OrganizationDetailController.java b/src/main/java/ui/controller/OrganizationDetailController.java
index b741862..39b2e92 100644
--- a/src/main/java/ui/controller/OrganizationDetailController.java
+++ b/src/main/java/ui/controller/OrganizationDetailController.java
@@ -73,6 +73,8 @@ public void setOrganization(Organization org, OrganizationDetails details) {
     } else {
       logoImageView.setVisible(false);
     }
+    System.out.println("Beskrivelse: " + details.getDescription());
+    System.out.println("Lengde: " + details.getDescription().length());
   }
 
   /**
diff --git a/src/main/resources/view/OrganizationDetail.fxml b/src/main/resources/view/OrganizationDetail.fxml
index 7f46012..b21e906 100644
--- a/src/main/resources/view/OrganizationDetail.fxml
+++ b/src/main/resources/view/OrganizationDetail.fxml
@@ -11,7 +11,7 @@
 <?import javafx.scene.layout.Region?>
 <?import javafx.scene.layout.VBox?>
 
-<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefHeight="400.0" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.OrganizationDetailController">
+<BorderPane maxHeight="-Infinity" maxWidth="-Infinity" minHeight="-Infinity" minWidth="-Infinity" prefWidth="600.0" xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.OrganizationDetailController">
    <top>
       <HBox prefHeight="100.0" prefWidth="200.0" styleClass="detail-header" BorderPane.alignment="CENTER">
          <children>
@@ -22,17 +22,17 @@
       </HBox>
    </top>
    <center>
-      <VBox prefHeight="200.0" prefWidth="100.0" styleClass="detail-content" BorderPane.alignment="CENTER">
+      <VBox styleClass="detail-content" BorderPane.alignment="CENTER">
          <children>
-            <HBox prefHeight="100.0" prefWidth="200.0">
+            <HBox minHeight="100.0" prefHeight="100.0">
                <children>
-                  <VBox prefHeight="200.0" prefWidth="100.0" spacing="10.0">
+                  <VBox spacing="10.0">
                      <children>
                         <Label fx:id="verifiedLabel" styleClass="detail-verified" text="✓ Verified" />
                         <Label fx:id="orgNumberLabel" styleClass="detail-orgnr" text="orgNumberLabel" />
                      </children>
                   </VBox>
-                  <Region prefHeight="200.0" prefWidth="200.0" HBox.hgrow="ALWAYS" />
+                  <Region prefWidth="200.0" HBox.hgrow="ALWAYS" />
                   <ImageView fx:id="logoImageView" fitHeight="100.0" fitWidth="250.0" pickOnBounds="true" preserveRatio="true" HBox.hgrow="ALWAYS" />
                </children>
             </HBox>

From 27817bfe2f7cf46fe9442f21e5e856324d4e4f33 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 21 Apr 2026 15:16:16 +0200
Subject: [PATCH 099/101] refactor: remove unused button

---
 src/main/resources/view/Home.fxml | 3 +--
 1 file changed, 1 insertion(+), 2 deletions(-)

diff --git a/src/main/resources/view/Home.fxml b/src/main/resources/view/Home.fxml
index 342e975..0730328 100644
--- a/src/main/resources/view/Home.fxml
+++ b/src/main/resources/view/Home.fxml
@@ -9,7 +9,7 @@
 <?import javafx.scene.layout.StackPane?>
 <?import javafx.scene.layout.VBox?>
 
-<BorderPane xmlns:fx="http://javafx.com/fxml/1" xmlns="http://javafx.com/javafx/25" fx:controller="ui.controller.HomeController">
+<BorderPane xmlns="http://javafx.com/javafx/25" xmlns:fx="http://javafx.com/fxml/1" fx:controller="ui.controller.HomeController">
    <center>
       <ScrollPane fitToWidth="true" BorderPane.alignment="CENTER">
          <content>
@@ -25,7 +25,6 @@
                               <HBox spacing="12.0">
                                  <children>
                                     <Button mnemonicParsing="false" onAction="#handleBrowseOrganizations" styleClass="hero-button-primary" text="Explore Organizations" />
-                                    <Button mnemonicParsing="false" styleClass="hero-button-secondary" text="Learn More" />
                                  </children>
                               </HBox>
                            </children>

From 28062f2f7966c96d6ee8f3fcad8ca9fd0ebf9fe9 Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 21 Apr 2026 15:16:32 +0200
Subject: [PATCH 100/101] refactor: remove unused methods

---
 src/main/resources/view/MyProfile.fxml | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/src/main/resources/view/MyProfile.fxml b/src/main/resources/view/MyProfile.fxml
index 7ae4bde..8010e42 100644
--- a/src/main/resources/view/MyProfile.fxml
+++ b/src/main/resources/view/MyProfile.fxml
@@ -44,7 +44,7 @@
                                     <Label fx:id="phoneLabel" styleClass="profile-label" />
                                  </children>
                               </VBox>
-                              <Button mnemonicParsing="false" onAction="#handleEditProfile" styleClass="secondary-button" text="Edit Profile" />
+                              <Button mnemonicParsing="false" styleClass="secondary-button" text="Edit Profile" />
                            </children>
                            <padding>
                               <Insets bottom="15.0" left="15.0" right="15.0" top="15.0" />
@@ -109,8 +109,8 @@
                                  <children>
                                     <HBox alignment="TOP_RIGHT" prefHeight="42.0" prefWidth="211.0" spacing="10.0">
                                        <children>
-                                          <Button mnemonicParsing="false" onAction="#handleCancelEdit" styleClass="secondary-button" text="Cancel" />
-                                          <Button mnemonicParsing="false" onAction="#handleSaveProfile" styleClass="confirm-button" text="Save Profile" />
+                                          <Button mnemonicParsing="false"  styleClass="secondary-button" text="Cancel" />
+                                          <Button mnemonicParsing="false" styleClass="confirm-button" text="Save Profile" />
                                        </children>
                                        <padding>
                                           <Insets left="15.0" right="15.0" />

From ee1b0cd5b2fe8fc9e729fe75b60d977ba915454f Mon Sep 17 00:00:00 2001
From: Marius Klepp <Mariusklepp@icloud.com>
Date: Tue, 21 Apr 2026 15:24:58 +0200
Subject: [PATCH 101/101] fix: removed duplicate plugin

---
 pom.xml | 26 +++++---------------------
 1 file changed, 5 insertions(+), 21 deletions(-)

diff --git a/pom.xml b/pom.xml
index a888bc6..0021470 100644
--- a/pom.xml
+++ b/pom.xml
@@ -17,8 +17,6 @@
     </properties>
 
     <dependencies>
-
-        <!-- JavaFX -->
         <dependency>
             <groupId>org.openjfx</groupId>
             <artifactId>javafx-controls</artifactId>
@@ -31,7 +29,6 @@
             <version>${javafx.version}</version>
         </dependency>
 
-        <!-- JUnit -->
         <dependency>
             <groupId>org.junit.jupiter</groupId>
             <artifactId>junit-jupiter</artifactId>
@@ -42,7 +39,7 @@
         <dependency>
             <groupId>com.fasterxml.jackson.core</groupId>
             <artifactId>jackson-databind</artifactId>
-            <version>2.17.0</version>
+            <version>2.18.3</version>
         </dependency>
 
         <dependency>
@@ -61,37 +58,24 @@
 
     <build>
         <plugins>
-
-            <!-- JavaFX Plugin -->
             <plugin>
                 <groupId>org.openjfx</groupId>
                 <artifactId>javafx-maven-plugin</artifactId>
                 <version>0.0.8</version>
                 <configuration>
                     <mainClass>app.Main</mainClass>
+                    <options>
+                        <option>-Dfile.encoding=UTF-8</option>
+                        <option>-Dstdout.encoding=UTF-8</option>
+                    </options>
                 </configuration>
             </plugin>
 
-            <!-- Surefire for JUnit -->
             <plugin>
                 <groupId>org.apache.maven.plugins</groupId>
                 <artifactId>maven-surefire-plugin</artifactId>
                 <version>3.5.4</version>
             </plugin>
-
-            <plugin>
-                <groupId>org.openjfx</groupId>
-                <artifactId>javafx-maven-plugin</artifactId>
-                <version>0.0.8</version>
-                <configuration>
-                    <mainClass>app.Main</mainClass>
-                    <options>
-                        <option>-Dfile.encoding=UTF-8</option>
-                        <option>-Dstdout.encoding=UTF-8</option>
-                    </options>
-                </configuration>
-            </plugin>
-
         </plugins>
     </build>
 </project>
\ No newline at end of file