elementAmounts = new HashMap<>();
+ private final NavigationController nav;
+ private final DonationController donationController;
+
+ private Node currentlySelected = null;
+ private TextField customAmountField;
+ private Node selectedPaymentMethod = null;
+ private Button donateBtn;
- public DonationPageView(DonationPageController donationPageController, HeaderController headerController, MainController mainController) {
- this.controller = donationPageController;
- this.mainController = mainController;
- getStylesheets().add(getClass().getResource("/donationpage/donation.css").toExternalForm());
+ public DonationPageView(NavigationController nav, DonationController donationController) {
+ ParameterValidator.objectChecker(nav, "NavigationController");
+ ParameterValidator.objectChecker(donationController, "DonationController");
- Header headerView = new Header(headerController);
- setTop(headerView);
+ this.nav = nav;
+ this.donationController = donationController;
+
+ getStylesheets().add(Objects.requireNonNull(getClass().getResource("/donationpage/donation.css")).toExternalForm());
VBox content = new VBox();
- content.getChildren().addAll(createDonationGrid(), createDonateSection());
+ content.getChildren().addAll(createBackButton(), createDonationGrid(), createPaymentMethodSection(), createDonateSection());
+
+ content.setOnMouseClicked(e -> {
+ if (e.getTarget() == content) {
+ clearSelection();
+ }
+ });
setCenter(content);
}
+
+ private HBox createBackButton() {
+ Button backBtn = new Button("β");
+ backBtn.getStyleClass().add("back-button");
+ backBtn.setOnAction(e -> nav.showOrganizationPage());
+
+ HBox container = new HBox(backBtn);
+ container.setPadding(new Insets(10, 0, 0, 10));
+ return container;
+ }
+
private TilePane createDonationGrid(){
TilePane body = new TilePane();
body.setAlignment(Pos.CENTER);
@@ -75,14 +100,12 @@ public Button createDonationButton(String title, String amount) {
button.getStyleClass().add("donation-button");
BigDecimal parsedAmount = parseAmount(amount);
- elementAmounts.put(button, parsedAmount);
+ button.setUserData(parsedAmount);
- button.setOnAction(e -> {
- selectDonationElement(button);
- });
- allDonationElements.add(button);
+ button.setOnAction(e -> selectDonation(button));
return button;
}
+
private VBox createCustomButton() {
Text titleText = new Text("Custom Donation");
titleText.getStyleClass().add("donation-title");
@@ -93,8 +116,10 @@ private VBox createCustomButton() {
Text krText = new Text("kr");
krText.getStyleClass().add("donation-amount");
- TextField amountField = new TextField();
+ this.customAmountField = new TextField();
+ TextField amountField = customAmountField;
amountField.getStyleClass().add("donation-input");
+ amountField.setPromptText("Enter amount");
amountRow.getChildren().addAll(amountField, krText);
@@ -102,51 +127,119 @@ private VBox createCustomButton() {
box.setAlignment(Pos.CENTER);
box.getStyleClass().add("donation-button");
-
box.setOnMouseClicked(e -> {
- try {
- BigDecimal amount = new BigDecimal(amountField.getText().trim());
- elementAmounts.put(box, amount);
- selectDonationElement(box);
- } catch (NumberFormatException exception) {
- System.err.println("Invalid custom donation amount: " + amountField.getText());
- }
-
+ selectDonation(box);
+ amountField.requestFocus();
});
- allDonationElements.add(box);
+ amountField.setOnMouseClicked(e ->
+ {
+ selectDonation(box);
+ amountField.requestFocus();
+ });
+
+ // NEW: On text field input - update the amount in real-time
+ amountField.textProperty().addListener((obs, oldVal, newVal) -> {
+ if (!newVal.trim().isEmpty()) {
+ try {
+ BigDecimal amount = new BigDecimal(newVal.trim());
+ box.setUserData(amount);
+ updateDonationAmount(amount);
+ } catch (NumberFormatException ignored) {
+ // User is still typing, silently ignore
+ }
+ } else {
+ box.setUserData(null);
+ if (currentlySelected == box) {
+ updateDonationAmount(null);
+ }
+ }
+ });
return box;
}
+
private HBox createDonateSection() {
- Button donateBtn = new Button("Donate");
+ donateBtn = new Button("Donate");
donateBtn.getStyleClass().add("donate-button");
- donateBtn.setOnAction(e -> controller.handleDonationBtn());
+ donateBtn.setDisable(true);
+ donateBtn.setOnAction(e -> donationController.requestDonationConfirmation());
- HBox section = new HBox(donateBtn);
+ Button clearBtn = new Button("Clear");
+ clearBtn.getStyleClass().add("clear-button");
+ clearBtn.setOnAction(e -> clearSelection());
+
+ HBox section = new HBox(20, clearBtn, donateBtn);
section.setAlignment(Pos.CENTER);
section.setPadding(new Insets(20, 0, 30, 0));
return section;
}
- private void selectDonationElement(Node element) {
- // Remove selected class from all elements
- for (Node node : allDonationElements) {
- node.getStyleClass().remove("donation-button-selected");
+ public HBox createPaymentMethodSection() {
+ Button appleBtn = new Button("Apple Pay");
+ Button vippsBtn = new Button("Vipps");
+ Button visaBtn = new Button("Visa");
+
+ appleBtn.setUserData("Apple Pay");
+ vippsBtn.setUserData("Vipps");
+ visaBtn.setUserData("Visa");
+
+ for (Button btn : new Button[]{appleBtn, vippsBtn, visaBtn}) {
+ btn.getStyleClass().add("payment-method-button");
+ btn.setOnAction(e -> selectPaymentMethod(btn));
}
- element.getStyleClass().add("donation-button-selected");
+ HBox sectionPm = new HBox(appleBtn, vippsBtn, visaBtn);
+ sectionPm.setAlignment(Pos.CENTER);
+ sectionPm.setSpacing(20);
+ sectionPm.setPadding(new Insets(20, 20, 20, 20));
+ return sectionPm;
+ }
+
+ private void selectDonation(Node element) {
+ if (currentlySelected != null) {
+ currentlySelected.getStyleClass().remove("donation-button-selected");
+ }
+ currentlySelected = element;
+ currentlySelected.getStyleClass().add("donation-button-selected");
- // Extract and store the amount
- extractAndStoreAmount(element);
+ BigDecimal amount = (BigDecimal) element.getUserData();
+ updateDonationAmount(amount);
+ updateDonationButtonState();
}
- private void extractAndStoreAmount(Node element) {
- BigDecimal amount = elementAmounts.get(element);
- if (amount != null) {
- mainController.setCurrentDonationAmount(amount);
- } else {
- System.err.println("Error: No amount found for selected element");
+ private void selectPaymentMethod(Node element) {
+ if (selectedPaymentMethod != null) {
+ selectedPaymentMethod.getStyleClass().remove("payment-method-selected");
}
+ selectedPaymentMethod = element;
+ selectedPaymentMethod.getStyleClass().add("payment-method-selected");
+
+ String paymentMethod = (String) element.getUserData();
+ donationController.setPaymentMethod(paymentMethod);
+ updateDonationButtonState();
+ }
+
+ private void clearSelection() {
+ if (currentlySelected != null) {
+ currentlySelected.getStyleClass().remove("donation-button-selected");
+ currentlySelected = null;
+ updateDonationAmount(null);
+ }
+
+ if (selectedPaymentMethod != null) {
+ selectedPaymentMethod.getStyleClass().remove("payment-method-selected");
+ selectedPaymentMethod = null;
+ }
+
+ if (customAmountField != null) {
+ customAmountField.clear();
+ }
+
+ updateDonationButtonState();
+ }
+
+ private void updateDonationAmount(BigDecimal amount) {
+ donationController.setDonationAmount(amount);
}
private BigDecimal parseAmount(String amountStr) {
@@ -157,4 +250,8 @@ private BigDecimal parseAmount(String amountStr) {
}
}
+ private void updateDonationButtonState() {
+ donateBtn.setDisable(currentlySelected == null || selectedPaymentMethod == null);
+ }
+
}
\ No newline at end of file
diff --git a/src/main/java/edu/group5/app/view/donationpage/PaymentCompletePageView.java b/src/main/java/edu/group5/app/view/donationpage/PaymentCompletePageView.java
index d563fef..e20cfee 100644
--- a/src/main/java/edu/group5/app/view/donationpage/PaymentCompletePageView.java
+++ b/src/main/java/edu/group5/app/view/donationpage/PaymentCompletePageView.java
@@ -1,6 +1,6 @@
package edu.group5.app.view.donationpage;
-import edu.group5.app.control.donationpage.PaymentCompleteController;
+import edu.group5.app.control.NavigationController;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
@@ -9,14 +9,20 @@
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.VBox;
-import java.awt.*;
import java.util.Objects;
+/**
+ * A view for the payment complete page.
+ * When a user have donated an amount, this page opens up.
+ *
+ * The page consist of an image that says "Tank You For The Donation",
+ * and a "back to home" button at the bottom center.
+ */
public class PaymentCompletePageView extends BorderPane {
- private final PaymentCompleteController controller;
+ private final NavigationController nav;
- public PaymentCompletePageView(PaymentCompleteController paymentCompleteController) {
- this.controller = paymentCompleteController;
+ public PaymentCompletePageView(NavigationController nav) {
+ this.nav = nav;
getStylesheets().add(getClass().getResource("/donationpage/paymentcomplete.css").toExternalForm());
VBox content = new VBox(20);
@@ -40,7 +46,7 @@ public VBox getImageSection() {
public Button getHomeBtn() {
Button home = new Button("Home");
- home.setOnAction(e -> controller.handleHomeBtn());
+ home.setOnAction(e -> nav.showHomePage());
home.setId("home-button");
return home;
}
diff --git a/src/main/java/edu/group5/app/view/homepage/HomePageView.java b/src/main/java/edu/group5/app/view/homepage/HomePageView.java
index 5510daa..137e0b1 100644
--- a/src/main/java/edu/group5/app/view/homepage/HomePageView.java
+++ b/src/main/java/edu/group5/app/view/homepage/HomePageView.java
@@ -1,8 +1,6 @@
package edu.group5.app.view.homepage;
-import edu.group5.app.control.HeaderController;
-import edu.group5.app.control.HomePageController;
-import edu.group5.app.view.Header;
+import edu.group5.app.control.NavigationController;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.ScrollPane;
@@ -11,14 +9,21 @@
import javafx.scene.layout.VBox;
import javafx.scene.text.Text;
+/**
+ * A view for the homepage.
+ * In the home page a user can navigate to pages in the heading,
+ * and they can press the "donate to a cause" button or the "about us" button.
+ *
+ * The homepage includes a heading, a "donate to a cause" button,
+ * and an about us button. The page also has a charity image at the bottom.
+ */
public class HomePageView extends BorderPane {
- private final HomePageController controller;
+ private final NavigationController nav;
+
+ public HomePageView(NavigationController nav) {
+ this.nav = nav;
- public HomePageView(HomePageController homePageController, HeaderController headerController) {
- this.controller = homePageController;
getStylesheets().add(getClass().getResource("/homepage/homepage.css").toExternalForm());
- Header headerView = new Header(headerController);
- setTop(headerView);
setCenter(createBody());
}
@@ -46,10 +51,12 @@ private VBox createIntroductionSection() {
h2.setId("h2");
Button donateToACauseBtn = new Button("Donate to a cause");
- donateToACauseBtn.setOnAction(e -> controller.handleDonateToACauseBtn());
+ donateToACauseBtn.setId("donate-to-cause-btn");
+ donateToACauseBtn.setOnAction(e -> nav.showCausesPage());
Button aboutUsBtn = new Button("About us");
- aboutUsBtn.setOnAction(e -> controller.handleAboutUsBtn());
+ aboutUsBtn.setId("about-us-btn");
+ aboutUsBtn.setOnAction(e -> nav.showAboutUsPage());
introductionSection.getChildren().addAll(h1, h2, donateToACauseBtn, aboutUsBtn);
return introductionSection;
diff --git a/src/main/java/edu/group5/app/view/loginpage/LoginHeader.java b/src/main/java/edu/group5/app/view/loginpage/LoginHeader.java
index decd5a1..b5f4296 100644
--- a/src/main/java/edu/group5/app/view/loginpage/LoginHeader.java
+++ b/src/main/java/edu/group5/app/view/loginpage/LoginHeader.java
@@ -1,12 +1,15 @@
package edu.group5.app.view.loginpage;
-import edu.group5.app.control.HeaderController;
import javafx.geometry.Pos;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.BorderPane;
import javafx.scene.layout.StackPane;
+/**
+ * A header for the login page and for the SignIn page.
+ * The header includes a logo of the Help Me Help app.
+ */
public class LoginHeader extends BorderPane {
public LoginHeader() {
@@ -19,7 +22,6 @@ private StackPane getLogoSection() {
StackPane logoSection = new StackPane();
logoSection.setId("logo-section");
logoSection.setAlignment(Pos.CENTER);
- logoSection.setStyle("-fx-cursor: hand;");
ImageView logo = new ImageView(
new Image(getClass().getResource("/header/images/hmh-logo.png").toExternalForm())
diff --git a/src/main/java/edu/group5/app/view/loginpage/LoginPageView.java b/src/main/java/edu/group5/app/view/loginpage/LoginPageView.java
index 96d83d7..927a8af 100644
--- a/src/main/java/edu/group5/app/view/loginpage/LoginPageView.java
+++ b/src/main/java/edu/group5/app/view/loginpage/LoginPageView.java
@@ -1,9 +1,7 @@
package edu.group5.app.view.loginpage;
-
-import edu.group5.app.control.HeaderController;
-import edu.group5.app.control.LoginPageController;
-import javafx.geometry.Insets;
+import edu.group5.app.control.NavigationController;
+import edu.group5.app.control.AuthController;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
@@ -13,17 +11,25 @@
import java.util.Objects;
+/**
+ * A view for the login page.
+ * A user can login with email and password.
+ * If the user does not have an account they can
+ * press the register button to the SignUp page.
+ * This page involves a {@code LoginHeader}, an image at the right,
+ * a login box, an email box, a login button, and a register button.
+ */
public class LoginPageView extends BorderPane {
- private final LoginPageController controller;
+ private final NavigationController nav;
+ private final AuthController authController;
+
private TextField emailField;
private PasswordField passwordField;
private Label errorLabel;
- public LoginPageView(LoginPageController loginPageController) {
- this.controller = loginPageController;
- this.controller.setView(this);
- LoginHeader loginHeaderView = new LoginHeader();
- setTop(loginHeaderView);
+ public LoginPageView(NavigationController nav, AuthController authController) {
+ this.nav = nav;
+ this.authController = authController;
HBox content = new HBox();
content.setFillHeight(true);
@@ -58,6 +64,7 @@ private VBox getOuterSection() {
outerSection.getChildren().addAll(getLoginBox(), getRegisterBtn());
return outerSection;
}
+
private VBox getLoginBox() {
VBox loginSection = new VBox(12);
loginSection.setAlignment(Pos.CENTER);
@@ -81,6 +88,7 @@ private VBox getEmailBox() {
emailBox.getChildren().addAll(new Label("Email"), emailField);
return emailBox;
}
+
private VBox getPasswordBox() {
VBox passwordBox = new VBox();
passwordBox.setMaxWidth(300);
@@ -89,20 +97,27 @@ private VBox getPasswordBox() {
passwordBox.getChildren().addAll(new Label("Password"), passwordField);
return passwordBox;
}
+
private Button getLoginBtn() {
Button loginBtn = new Button("Log In");
loginBtn.setMaxWidth(300);
loginBtn.setId("login-btn");
- loginBtn.setOnMouseClicked(e -> controller.handleLoginBtn());
+ loginBtn.setOnMouseClicked(e -> authController.handleLogin(
+ this,
+ getEmail(),
+ getPassword()
+ ));
return loginBtn;
}
+
public Button getRegisterBtn() {
- Button registerBtn = new Button("Don't have an account? Sign In");
+ Button registerBtn = new Button("Don't have an account? Sign Up");
registerBtn.setMaxWidth(300);
- registerBtn.setOnMouseClicked(e -> controller.handleRegisterBtn());
+ registerBtn.setOnMouseClicked(e -> nav.showSignUpPage());
registerBtn.setId("register-btn");
return registerBtn;
}
+
private StackPane getImageSection() {
StackPane imageSection = new StackPane();
imageSection.setId("image-section");
diff --git a/src/main/java/edu/group5/app/view/loginpage/SignInPageView.java b/src/main/java/edu/group5/app/view/loginpage/SignUpPageView.java
similarity index 65%
rename from src/main/java/edu/group5/app/view/loginpage/SignInPageView.java
rename to src/main/java/edu/group5/app/view/loginpage/SignUpPageView.java
index 6ee0e9b..70f40ea 100644
--- a/src/main/java/edu/group5/app/view/loginpage/SignInPageView.java
+++ b/src/main/java/edu/group5/app/view/loginpage/SignUpPageView.java
@@ -1,7 +1,7 @@
package edu.group5.app.view.loginpage;
-import edu.group5.app.control.HeaderController;
-import edu.group5.app.control.SignInPageController;
+import edu.group5.app.control.NavigationController;
+import edu.group5.app.control.AuthController;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
@@ -11,19 +11,28 @@
import java.util.Objects;
+/**
+ * A view for the SignUp page.
+ * In this page a user can create an account by writing in first and last name,
+ * and by adding email and password. If the user already have an account,
+ * they can press the back to login button to login.
+ *
+ * This view contains a first name field, a surname field, a email field,
+ * a password field, a sign up button, and an back to login button.
+ */
+public class SignUpPageView extends BorderPane {
+ private final NavigationController nav;
+ private final AuthController authController;
-public class SignInPageView extends BorderPane {
- private final SignInPageController controller;
private TextField nameField;
private TextField surnameField;
private TextField emailField;
private PasswordField passwordField;
private Label errorLabel;
- public SignInPageView(SignInPageController signInPageController) {
- this.controller = signInPageController;
- this.controller.setView(this);
- setTop(new LoginHeader());
+ public SignUpPageView(NavigationController nav, AuthController authController) {
+ this.nav = nav;
+ this.authController = authController;
HBox content = new HBox();
content.setFillHeight(true);
@@ -32,14 +41,13 @@ public SignInPageView(SignInPageController signInPageController) {
content.getChildren().addAll(getOuterSection(), getImageSection());
String css = Objects.requireNonNull(
- getClass().getResource("/loginpage/signin.css")).toExternalForm();
+ getClass().getResource("/loginpage/signup.css")).toExternalForm();
content.getStylesheets().add(css);
setCenter(content);
}
-
public String getFirstName() {
return nameField.getText();
}
@@ -58,6 +66,7 @@ public char[] getPassword() {
public void showError(String message) {
errorLabel.setText(message);
+ errorLabel.setWrapText(true);
errorLabel.setStyle("-fx-text-fill: red;");
}
@@ -65,20 +74,20 @@ private VBox getOuterSection() {
VBox outerSection = new VBox(12);
outerSection.setAlignment(Pos.CENTER);
HBox.setHgrow(outerSection, Priority.ALWAYS);
- outerSection.getChildren().addAll(getSignInBox(), getBackToLoginBtn());
+ outerSection.getChildren().addAll(getSignUpBox(), getBackToLoginBtn());
return outerSection;
}
- private VBox getSignInBox() {
- VBox signInSection = new VBox(12);
- signInSection.setAlignment(Pos.CENTER);
- signInSection.setId("login-box");
- signInSection.getChildren().addAll(getErrorLabel(), getNameRow(), getEmailBox(), getPasswordBox(), getSignInBtn());
- return signInSection;
+
+ private VBox getSignUpBox() {
+ VBox signUpSection = new VBox(12);
+ signUpSection.setAlignment(Pos.CENTER);
+ signUpSection.setId("login-box");
+ signUpSection.getChildren().addAll(getErrorLabel(), getNameRow(), getEmailBox(), getPasswordBox(), getSignUpBtn());
+ return signUpSection;
}
private Label getErrorLabel() {
errorLabel = new Label();
- errorLabel.setPrefHeight(20);
return errorLabel;
}
@@ -102,6 +111,7 @@ private HBox getNameRow() {
return nameRow;
}
+
private VBox getEmailBox() {
VBox emailBox = new VBox();
emailBox.setMaxWidth(300);
@@ -111,6 +121,7 @@ private VBox getEmailBox() {
emailBox.getChildren().addAll(new Label("Email"), emailField);
return emailBox;
}
+
private VBox getPasswordBox() {
VBox passwordBox = new VBox();
passwordBox.setMaxWidth(300);
@@ -119,20 +130,29 @@ private VBox getPasswordBox() {
passwordBox.getChildren().addAll(new Label("Password"), passwordField);
return passwordBox;
}
- private Button getSignInBtn() {
- Button signInBtn = new Button("Sign In");
- signInBtn.setMaxWidth(300);
- signInBtn.setId("login-btn");
- signInBtn.setOnMouseClicked(e -> controller.handleSignInBtn());
- return signInBtn;
+
+ private Button getSignUpBtn() {
+ Button signUpBtn = new Button("Sign Up");
+ signUpBtn.setMaxWidth(300);
+ signUpBtn.setId("login-btn");
+ signUpBtn.setOnMouseClicked(e -> authController.handleSignUp(
+ this,
+ getFirstName(),
+ getLastName(),
+ getEmail(),
+ getPassword()
+ ));
+ return signUpBtn;
}
+
public Button getBackToLoginBtn() {
Button backBtn = new Button("Already have an account? Log in");
backBtn.setMaxWidth(300);
- backBtn.setOnMouseClicked(e -> controller.handleLoginBtn());
+ backBtn.setOnMouseClicked(e -> nav.showLoginPage());
backBtn.setId("register-btn");
return backBtn;
}
+
private StackPane getImageSection() {
StackPane imageSection = new StackPane();
imageSection.setId("image-section");
diff --git a/src/main/java/edu/group5/app/view/organizationpage/OrganizationPageView.java b/src/main/java/edu/group5/app/view/organizationpage/OrganizationPageView.java
index 4ec7c91..7ea3b6b 100644
--- a/src/main/java/edu/group5/app/view/organizationpage/OrganizationPageView.java
+++ b/src/main/java/edu/group5/app/view/organizationpage/OrganizationPageView.java
@@ -1,10 +1,11 @@
package edu.group5.app.view.organizationpage;
-import edu.group5.app.control.HeaderController;
-import edu.group5.app.control.MainController;
-import edu.group5.app.control.OrganizationPageController;
+import edu.group5.app.control.DonationController;
+import edu.group5.app.control.NavigationController;
+import edu.group5.app.control.OrganizationController;
import edu.group5.app.model.organization.Organization;
-import edu.group5.app.view.Header;
+import javafx.application.Platform;
+import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
@@ -17,33 +18,60 @@
import javafx.scene.layout.VBox;
import javafx.scene.text.Text;
+import java.util.Objects;
+
+/**
+ * A view for displaying information about a selected organization.
+ *
+ * The page shows the organization's logo, name, and description.
+ * If no logo is available, a fallback "No image" is displayed.
+ *
+ * The page also includes a donate button that navigates to the
+ * donation page, and a back button to return to the causes page.
+ */
public class OrganizationPageView extends BorderPane {
- private final OrganizationPageController controller;
- private final MainController mainController;
-
- public OrganizationPageView(OrganizationPageController controller, HeaderController headerController, MainController mainController) {
- this.controller = controller;
- this.mainController = mainController;
- getStylesheets().add(getClass().getResource("/organizationpage/organizationpage.css").toExternalForm());
- Header headerView = new Header(headerController);
- setTop(headerView);
- setCenter(createBody());
+ private final NavigationController nav;
+ private final OrganizationController organizationController;
+ private final DonationController donationController;
+
+ public OrganizationPageView(NavigationController nav,
+ OrganizationController organizationController,
+ DonationController donationController) {
+ this.nav = nav;
+ this.organizationController = organizationController;
+ this.donationController = donationController;
+
+ getStylesheets().add(Objects
+ .requireNonNull(getClass()
+ .getResource("/organizationpage/organizationpage.css"))
+ .toExternalForm());
+
+ VBox content = new VBox();
+ content.getChildren().addAll(createBackButton(), createBody());
+ setCenter(content);
}
private ScrollPane createBody() {
ScrollPane body = new ScrollPane();
body.setFitToWidth(true);
- body.setFitToHeight(true)
- ;
+ body.setFitToHeight(true);
+
VBox vBox = new VBox();
vBox.setId("main-container");
- vBox.getChildren().addAll(
- createOrgSection()
- );
+ vBox.getChildren().addAll(createOrgSection());
body.setContent(vBox);
return body;
}
+ private HBox createBackButton() {
+ Button backBtn = new Button("β");
+ backBtn.getStyleClass().add("back-button");
+ backBtn.setOnAction(e -> nav.showCausesPage());
+
+ HBox container = new HBox(backBtn);
+ container.setPadding(new Insets(10, 0, 0, 10));
+ return container;
+ }
private HBox createOrgSection() {
HBox orgSection = new HBox();
@@ -60,42 +88,89 @@ private StackPane createImageContainer() {
imageContainer.setId("imageContainer");
imageContainer.setPrefHeight(120);
imageContainer.setPrefWidth(120);
- imageContainer.setMaxWidth(Double.MAX_VALUE);
-
- Organization org = mainController.getCurrentOrganization();
- String imagePath = org != null ? "/browsepage/images/children_of_shambala.png" : "/browsepage/images/children_of_shambala.png";
+ imageContainer.setMaxWidth(120);
+
+ Organization org = organizationController.getCurrentOrganization();
+
+ if (org != null && org.logoUrl() != null && !org.logoUrl().isBlank()) {
+ // Load image in background thread to avoid blocking UI
+ new Thread(() -> {
+ try {
+ Image image = new Image(org.logoUrl(), 350, 350, true, true);
+ Platform.runLater(() -> {
+ ImageView logo = new ImageView(image);
+ logo.setId("logo");
+ logo.setSmooth(true);
+ logo.setPreserveRatio(true);
+ logo.setFitHeight(350);
+ logo.setFitWidth(350);
+ imageContainer.getChildren().clear();
+ imageContainer.getChildren().add(logo);
+ });
+ } catch (Exception e) {
+ // Logo failed to load, show placeholder
+ Platform.runLater(() -> {
+ imageContainer.getChildren().clear();
+ Text text = new Text("No image");
+ text.setStyle("-fx-font-size: 10;");
+ imageContainer.getChildren().add(text);
+ });
+ }
+ }, "LogoLoader").start();
+ } else {
+ Text text = new Text("No image");
+ text.setStyle("-fx-font-size: 10;");
+ imageContainer.getChildren().add(text);
+ }
- ImageView logo = new ImageView(
- new Image(getClass().getResource(imagePath).toExternalForm())
- );
-
- logo.setId("logo");
- logo.setSmooth(true);
- logo.setPreserveRatio(true);
-
- imageContainer.getChildren().add(logo);
return imageContainer;
}
private VBox createOrgInfoSection() {
- Organization org = mainController.getCurrentOrganization();
+ Organization org = organizationController.getCurrentOrganization();
VBox orgInfoSection = new VBox();
orgInfoSection.setSpacing(50);
VBox orgNameAndDescription = new VBox();
+ orgNameAndDescription.setSpacing(5);
Label orgName = new Label(org != null ? org.name() : "Unknown Organization");
orgName.setId("orgName");
- Text description = new Text(org != null ? org.description() : "No description available");
- description.setId("description");
-
- orgNameAndDescription.getChildren().addAll(orgName, description);
+ VBox descriptionBox = new VBox();
+ descriptionBox.setSpacing(15);
+ descriptionBox.setId("description-container");
+ descriptionBox.setMaxWidth(750);
+
+ if (org != null && org.description() != null) {
+ String[] rawParagraphs = org.description().split("\n{2,}");
+
+ for (String para : rawParagraphs) {
+ String cleaned = para.trim();
+ if (!cleaned.isBlank()) {
+ Label paragraph = new Label(cleaned);
+ paragraph.setId("description-paragraph");
+ paragraph.setWrapText(true);
+ descriptionBox.getChildren().add(paragraph);
+ }
+ }
+ }
+
+ ScrollPane descriptionScroll = new ScrollPane(descriptionBox);
+ descriptionScroll.setId("description-scroll");
+ descriptionScroll.setFitToWidth(true);
+ descriptionScroll.setStyle("-fx-focus-color: transparent; -fx-faint-focus-color: transparent;");
+ descriptionScroll.setPrefHeight(400);
+ descriptionScroll.setMaxHeight(400);
+ descriptionScroll.setPrefWidth(750);
+ descriptionScroll.setMinWidth(750);
+
+ orgNameAndDescription.getChildren().addAll(orgName, descriptionScroll);
Button donateBtn = new Button("Donate");
donateBtn.setId("donate-button");
- donateBtn.setOnAction(e -> controller.handleDonateClick());
+ donateBtn.setOnAction(e -> nav.showDonationPage());
orgInfoSection.getChildren().addAll(orgNameAndDescription, donateBtn);
return orgInfoSection;
diff --git a/src/main/java/edu/group5/app/view/userpage/UserPageView.java b/src/main/java/edu/group5/app/view/userpage/UserPageView.java
index 9ab73ee..aff5b32 100644
--- a/src/main/java/edu/group5/app/view/userpage/UserPageView.java
+++ b/src/main/java/edu/group5/app/view/userpage/UserPageView.java
@@ -1,40 +1,55 @@
package edu.group5.app.view.userpage;
-import edu.group5.app.control.HeaderController;
-import edu.group5.app.control.MainController;
+import edu.group5.app.control.DonationController;
+import edu.group5.app.control.NavigationController;
+import edu.group5.app.control.OrganizationController;
+import edu.group5.app.control.AuthController;
import edu.group5.app.model.donation.Donation;
import edu.group5.app.model.organization.Organization;
import edu.group5.app.model.user.User;
-import edu.group5.app.view.Header;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
+import javafx.scene.control.ScrollPane;
+import javafx.scene.control.TextField;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
import javafx.scene.layout.BorderPane;
+import javafx.scene.layout.FlowPane;
import javafx.scene.layout.HBox;
import javafx.scene.layout.VBox;
import javafx.scene.text.Text;
-
-import java.util.HashMap;
-import java.util.HashSet;
-import java.util.Set;
-
-
+import java.text.SimpleDateFormat;
+import java.util.*;
+
+/**
+ * A view for the user profile page.
+ *
+ * Displays the current user's profile information,
+ * including avatar, full name, email and location, along with a logout button.
+ * The page is divided into three sections:
+ * Profile information, Supported causes, and previous donations.
+ *
+ * Supported causes shows all the organizations that the user has donated to.
+ * Previous donations shows a list of all the user's donations,
+ * and includes a search bar to filter through them.
+ */
public class UserPageView extends BorderPane {
- private final User currentUser;
- private final MainController mainController;
-
- public UserPageView(HeaderController headerController, MainController mainController) {
- this.mainController = mainController;
- this.currentUser = mainController.getCurrentUser();
+ private final NavigationController nav;
+ private final AuthController authController;
+ private final DonationController donationController;
+ private final OrganizationController organizationController;
+
+ public UserPageView(NavigationController nav, AuthController authController,
+ DonationController donationController, OrganizationController organizationController) {
+ this.nav = nav;
+ this.authController = authController;
+ this.donationController = donationController;
+ this.organizationController = organizationController;
getStylesheets().add(getClass().getResource("/userpage/userpage.css").toExternalForm());
- Header headerView = new Header(headerController);
- setTop(headerView);
-
VBox content = new VBox(30);
content.setPadding(new Insets(40));
content.getChildren().addAll(createProfileSection(), createCausesSection(), createDonationsSection());
@@ -42,12 +57,16 @@ public UserPageView(HeaderController headerController, MainController mainContro
}
private HBox createProfileSection() {
- ImageView avatar = new ImageView(new Image(getClass().getResourceAsStream("/userpage/account_circle.png")));
+ ImageView avatar = new ImageView(new Image(Objects
+ .requireNonNull(getClass()
+ .getResourceAsStream("/userpage/account_circle.png"))));
avatar.setFitWidth(150);
avatar.setFitHeight(150);
avatar.setPreserveRatio(true);
avatar.setId("avatar");
+ User currentUser = authController.getCurrentUser();
+
Text name = new Text(currentUser.getFirstName() + " " + currentUser.getLastName());
name.setId("profile-name");
@@ -59,7 +78,7 @@ private HBox createProfileSection() {
Button logoutBtn = new Button("Logout");
logoutBtn.getStyleClass().add("logout-button");
- logoutBtn.setOnAction(e -> mainController.logout());
+ logoutBtn.setOnAction(e -> authController.handleLogout());
VBox info = new VBox(10, name, email, location, logoutBtn);
info.setAlignment(Pos.CENTER_LEFT);
@@ -68,50 +87,95 @@ private HBox createProfileSection() {
profile.setAlignment(Pos.CENTER_LEFT);
return profile;
}
-
private VBox createCausesSection() {
Text title = new Text("YOUR SUPPORTED CAUSES");
title.getStyleClass().add("section-title");
- VBox causesBox = new VBox(10);
- causesBox.getStyleClass().add("section-box");
- causesBox.setPadding(new Insets(10));
+ ScrollPane scrollPane = new ScrollPane();
+ scrollPane.setFitToWidth(true);
+ scrollPane.setStyle("-fx-focus-color: transparent; -fx-faint-focus-color: transparent;");
+
+ FlowPane causesFlow = new FlowPane(10, 10);
+ causesFlow.setStyle("-fx-padding: 10;");
+ causesFlow.getStyleClass().add("section-box");
- HashMap userDonations = mainController.getDonationService()
- .getDonationRepository().filterByUser(currentUser.getUserId());
-
- Set uniqueOrgs = new HashSet<>();
- for (Donation donation : userDonations.values()) {
- uniqueOrgs.add(donation.organizationId());
- }
+ Set uniqueOrganizations = donationController.getUniqueOrganizationIDs();
- if (uniqueOrgs.isEmpty()) {
+ if (uniqueOrganizations.isEmpty()) {
Label noCauses = new Label("No causes supported yet");
noCauses.setStyle("-fx-text-fill: #999;");
- causesBox.getChildren().add(noCauses);
+ causesFlow.getChildren().add(noCauses);
} else {
- for (int orgId : uniqueOrgs) {
- Organization org = mainController.getOrganizationService().findByOrgNumber(orgId);
+ for (int orgId : uniqueOrganizations) {
+ Organization org = organizationController.getOrganizationById(orgId);
if (org != null) {
- Label causeLabel = new Label("β’ " + org.name());
- causesBox.getChildren().add(causeLabel);
+ causesFlow.getChildren().add(createCauseChip(org));
}
}
}
+ scrollPane.setPrefHeight(275);
+ scrollPane.setContent(causesFlow);
- return new VBox(10, title, causesBox);
+ return new VBox(10, title, scrollPane);
}
private VBox createDonationsSection() {
Text title = new Text("PREVIOUS DONATIONS");
title.getStyleClass().add("section-title");
- VBox donationsBox = new VBox(10);
- donationsBox.getStyleClass().add("section-box");
+ HBox searchBox = new HBox(10);
+ searchBox.setStyle("-fx-padding: 10;");
+ TextField searchField = new TextField();
+ searchField.setPromptText("Search by organization name...");
+ searchField.setPrefWidth(300);
+ searchBox.getChildren().add(searchField);
+
+ ScrollPane scrollPane = new ScrollPane();
+ scrollPane.setFitToWidth(false);
+ scrollPane.setPrefWidth(650);
+ scrollPane.setMaxWidth(650);
+ scrollPane.setPrefHeight(400);
+ scrollPane.setStyle("-fx-focus-color: transparent; -fx-faint-focus-color: transparent;");
+
+ VBox donationsBox = new VBox(12);
+ donationsBox.getStyleClass().add("donation-list");
donationsBox.setPadding(new Insets(10));
- HashMap userDonations = mainController.getDonationService()
- .getDonationRepository().filterByUser(currentUser.getUserId());
+ User currentUser = authController.getCurrentUser();
+ Map userDonations =
+ donationController.getUserDonations(currentUser.getUserId());
+
+ // Filter donations based on search
+ searchField.textProperty().addListener((obs, oldVal, newVal) -> {
+ donationsBox.getChildren().clear();
+
+ if (userDonations.isEmpty()) {
+ Label noDonations = new Label("No donations yet");
+ noDonations.setStyle("-fx-text-fill: #999;");
+ donationsBox.getChildren().add(noDonations);
+ return;
+ }
+
+ String searchTerm = newVal.toLowerCase().trim();
+ boolean found = false;
+
+ for (Donation donation : userDonations.values()) {
+ Organization org = organizationController.getOrganizationById(donation.organizationId());
+ String orgName = (org != null) ? org.name() : "Unknown Organization";
+
+ // Filter by search term
+ if (searchTerm.isEmpty() || orgName.toLowerCase().contains(searchTerm)) {
+ donationsBox.getChildren().add(createDonationCard(donation));
+ found = true;
+ }
+ }
+
+ if (!found && !searchTerm.isEmpty()) {
+ Label noResults = new Label("No donations found for \"" + newVal + "\"");
+ noResults.setStyle("-fx-text-fill: #999;");
+ donationsBox.getChildren().add(noResults);
+ }
+ });
if (userDonations.isEmpty()) {
Label noDonations = new Label("No donations yet");
@@ -119,18 +183,55 @@ private VBox createDonationsSection() {
donationsBox.getChildren().add(noDonations);
} else {
for (Donation donation : userDonations.values()) {
- Organization org = mainController.getOrganizationService()
- .findByOrgNumber(donation.organizationId());
+ Organization org = organizationController.getOrganizationById(donation.organizationId());
String orgName = (org != null) ? org.name() : "Unknown Organization";
-
- Label donationLabel = new Label(
- orgName + " β’ " + donation.amount() + " kr" + " β’ " + donation.date()
- );
- donationsBox.getChildren().add(donationLabel);
+ donationsBox.getChildren().add(createDonationCard(donation));
}
}
- return new VBox(10, title, donationsBox);
+ scrollPane.setContent(donationsBox);
+ return new VBox(10, title, searchBox, scrollPane);
}
+ private BorderPane createDonationCard(Donation donation) {
+ Organization org = organizationController.getOrganizationById(donation.organizationId());
+ String orgName = (org != null) ? org.name() : "Unknown Organization";
+
+ // Use BorderPane to fix columns: LEFT | SPACE | RIGHT
+ BorderPane card = new BorderPane();
+ card.getStyleClass().add("donation-card");
+ card.setPadding(new Insets(12, 15, 12, 15));
+
+ // LEFT: Organization name
+ Text orgText = new Text(orgName);
+ orgText.getStyleClass().add("donation-org-name");
+ card.setLeft(orgText);
+
+ // RIGHT: Amount and date (stacked vertically)
+ VBox details = new VBox(4);
+ details.setAlignment(Pos.CENTER_RIGHT);
+
+ Label amountLabel = new Label(String.format("%.2f", donation.amount()) + " kr");
+ amountLabel.getStyleClass().add("donation-amount");
+
+ Label dateLabel = new Label(
+ new SimpleDateFormat("yyyy-MM-dd HH:mm:ss").format(donation.date()));
+ dateLabel.getStyleClass().add("donation-date");
+
+ details.getChildren().addAll(amountLabel, dateLabel);
+ card.setRight(details);
+
+ return card;
+ }
+
+ private FlowPane createCauseChip(Organization org) {
+ FlowPane chip = new FlowPane();
+ chip.getStyleClass().add("cause-chip");
+ chip.setPadding(new Insets(8, 12, 8, 12));
+
+ Label label = new Label(org.name());
+ chip.getChildren().add(label);
+
+ return chip;
+ }
}
diff --git a/src/main/resources/donationpage/donation.css b/src/main/resources/donationpage/donation.css
index 32433df..bc777b6 100644
--- a/src/main/resources/donationpage/donation.css
+++ b/src/main/resources/donationpage/donation.css
@@ -1,53 +1,149 @@
.donation-button {
- -fx-background-color: white;
- -fx-border-color: #ccc;
- -fx-border-width: 2px;
- -fx-border-radius: 8;
- -fx-background-radius: 8;
- -fx-cursor: hand;
- -fx-font-size: 18px;
- -fx-font-weight: bold;
+ -fx-background-color: white;
+ -fx-border-color: #ccc;
+ -fx-border-width: 2px;
+ -fx-border-radius: 8;
+ -fx-background-radius: 8;
+ -fx-cursor: hand;
+ -fx-font-size: 18px;
+ -fx-font-weight: bold;
}
.donation-button:hover {
- -fx-border-color: #f0f0f0;
+ -fx-border-color: #f0f0f0;
}
.donation-button-selected {
- -fx-background-color: #111;
+ -fx-background-color: #111;
+ -fx-text-fill: white;
+ -fx-border-color: #111;
+}
+
+.donation-button-selected:hover {
+ -fx-background-color: #222;
+ -fx-border-color: #222;
+}
+
+.donation-button-selected Text,
+.donation-button-selected .donation-input {
+ -fx-fill: white;
+ -fx-border-color: transparent transparent white transparent;
-fx-text-fill: white;
- -fx-border-color: #111;
+ -fx-prompt-text-fill: #ccc;
}
+
.donation-title {
- -fx-font-size: 18px;
- -fx-font-weight: bold;
- -fx-fill: #111;
+ -fx-font-size: 18px;
+ -fx-font-weight: bold;
+ -fx-fill: #111;
}
+
+
.donation-amount {
- -fx-font-size: 18px;
- -fx-fill: #111;
+ -fx-font-size: 18px;
+ -fx-fill: #111;
}
+
.donation-input {
- -fx-font-size:16px;
- -fx-pref-width: 140px;
- -fx-background-color: transparent;
- -fx-border-color: transparent transparent #333 transparent;
- -fx-alignment: center;
+ -fx-font-size: 16px;
+ -fx-pref-width: 140px;
+ -fx-background-color: transparent;
+ -fx-border-color: transparent transparent #333 transparent;
+ -fx-alignment: center;
}
+
.donation-input:focused {
- -fx-border-color: transparent transparent #4a90d9 transparent;
+ -fx-border-color: transparent transparent #4a90d9 transparent;
}
+
.donate-button {
- -fx-pref-height: 55px;
- -fx-background-color: #e03030;
+ -fx-pref-height: 55px;
+ -fx-background-color: #e03030;
+ -fx-text-fill: white;
+ -fx-font-size: 22px;
+ -fx-font-weight: bold;
+ -fx-background-radius: 8;
+ -fx-cursor: hand;
+ -fx-padding: 0 40 0 40;
+}
+
+.donate-button:hover {
+ -fx-background-color: #c02020;
+}
+
+.clear-button {
+ -fx-pref-height: 55px;
+ -fx-background-color: #f0f0f0;
+ -fx-text-fill: #333;
+ -fx-font-size: 16px;
+ -fx-font-weight: bold;
+ -fx-background-radius: 8;
+ -fx-cursor: hand;
+ -fx-padding: 0 30 0 30;
+ -fx-border-color: #ccc;
+ -fx-border-width: 1;
+}
+
+.clear-button:hover {
+ -fx-background-color: #e0e0e0;
+}
+
+.clear-button:pressed {
+ -fx-background-color: #d0d0d0;
+}
+
+.donation-button-selected .donation-title {
+ -fx-fill: white;
+}
+
+.donation-button-selected .donation-amount {
+ -fx-fill: white;
+}
+
+.donation-button-selected .donation-input {
+ -fx-text-fill: white;
+}
+
+
+.donation-button-selected .donation-input:focused {
+ -fx-text-fill: white;
+ -fx-border-color: transparent transparent white transparent;
+}
+.payment-method-button {
+ -fx-background-color: #111;
-fx-text-fill: white;
- -fx-font-size: 22px;
+ -fx-font-size: 16px;
-fx-font-weight: bold;
- -fx-background-radius: 8;
+ -fx-pref-width: 180px;
+ -fx-pref-height: 45px;
+ -fx-background-radius: 6;
+ -fx-border-radius: 6;
-fx-cursor: hand;
- -fx-padding: 0 40 0 40;
}
-.donate-button:hover {
- -fx-background-color: #c02020;
+.payment-method-button:hover {
+ -fx-background-color: #222;
}
-
+.payment-method-selected,
+.payment-method-selected:hover {
+ -fx-background-color: #e03030;
+}
+.donation-button-selected .donation-title,
+.donation-button-selected .donation-amount {
+ -fx-fill: white;
+}
+.back-button {
+ -fx-background-color: white;
+ -fx-text-fill: black;
+ -fx-font-weight: bold;
+ -fx-font-size: 20px;
+ -fx-background-radius: 50;
+ -fx-padding: 4px 10px;
+ -fx-cursor: hand;
+ -fx-border-radius: 50;
+ -fx-border-color: black;
+ -fx-border-width: 2px;
+}
+.back-button:hover {
+ -fx-background-color: #333;
+ -fx-border-color:#333;
+}
\ No newline at end of file
diff --git a/src/main/resources/header/header.css b/src/main/resources/header/header.css
index 28fcc59..23115eb 100644
--- a/src/main/resources/header/header.css
+++ b/src/main/resources/header/header.css
@@ -4,16 +4,10 @@
}
#logo-section {
- -fx-border-color: black;
- -fx-border-width: 2px;
}
#navbar {
- -fx-border-color: black;
- -fx-border-width: 2px;
}
#profile-section {
- -fx-border-color: black;
- -fx-border-width: 2px;
}
\ No newline at end of file
diff --git a/src/main/resources/homepage/homepage.css b/src/main/resources/homepage/homepage.css
index 90b090c..2579557 100644
--- a/src/main/resources/homepage/homepage.css
+++ b/src/main/resources/homepage/homepage.css
@@ -1,6 +1,4 @@
#introduction-section {
- -fx-border-color: black;
- -fx-border-width: 2px;
-fx-padding: 20px 0;
}
@@ -16,7 +14,6 @@
}
#charity-image-section {
- -fx-border-color: black;
}
#charity-image {
@@ -24,4 +21,12 @@
-fx-background-position: center 55%;
-fx-background-size: 100% auto;
-fx-background-repeat: no-repeat;
+}
+
+#donate-to-cause-btn {
+ -fx-cursor: hand;
+}
+
+#about-us-btn {
+ -fx-cursor: hand;
}
\ No newline at end of file
diff --git a/src/main/resources/loginpage/login.css b/src/main/resources/loginpage/login.css
index dc758a1..f0ffc41 100644
--- a/src/main/resources/loginpage/login.css
+++ b/src/main/resources/loginpage/login.css
@@ -1,25 +1,35 @@
#image-section {
- -fx-background-image: url("/loginpage/login-image.jpg");
- -fx-background-size: 200%;
- -fx-background-position: left center;
- -fx-background-repeat: no-repeat;
- -fx-pref-width: 50%;
+ -fx-background-image: url("/loginpage/login-image.jpg");
+ -fx-background-size: 200%;
+ -fx-background-position: left center;
+ -fx-background-repeat: no-repeat;
+ -fx-pref-width: 50%;
}
+
#login-btn {
- -fx-background-color: #000000;
- -fx-text-fill: white;
- -fx-pref-height: 35px;
+ -fx-background-color: #000000;
+ -fx-text-fill: white;
+ -fx-pref-height: 35px;
}
#register-btn {
- -fx-background-color: #000000;
- -fx-text-fill: white;
- -fx-pref-height: 35px;
+ -fx-background-color: #000000;
+ -fx-text-fill: white;
+ -fx-pref-height: 35px;
}
+
#login-box {
- -fx-border-color: #ccc;
- -fx-border-radius: 8px;
- -fx-border-width: 1px;
- -fx-padding: 24px;
- -fx-max-width: 340px;
+ -fx-border-color: #ccc;
+ -fx-border-radius: 8px;
+ -fx-border-width: 1px;
+ -fx-padding: 24px;
+ -fx-max-width: 340px;
+}
+
+#login-btn:hover {
+ -fx-cursor: hand;
+}
+
+#register-btn:hover {
+ -fx-cursor: hand;
}
\ No newline at end of file
diff --git a/src/main/resources/loginpage/signin.css b/src/main/resources/loginpage/signin.css
deleted file mode 100644
index 4ab0276..0000000
--- a/src/main/resources/loginpage/signin.css
+++ /dev/null
@@ -1,25 +0,0 @@
-#image-section {
- -fx-background-image: url("/loginpage/signin-image.png");
- -fx-background-size: auto;
- -fx-background-position: right center;
- -fx-background-repeat: no-repeat;
- -fx-pref-width: 50%;
-}
-#login-btn {
- -fx-background-color: #000000;
- -fx-text-fill: white;
- -fx-pref-height: 35px;
-}
-
-#register-btn {
- -fx-background-color: #000000;
- -fx-text-fill: white;
- -fx-pref-height: 35px;
-}
-#login-box {
- -fx-border-color: #ccc;
- -fx-border-radius: 8px;
- -fx-border-width: 1px;
- -fx-padding: 24px;
- -fx-max-width: 340px;
-}
\ No newline at end of file
diff --git a/src/main/resources/loginpage/signin-image.png b/src/main/resources/loginpage/signup-image.png
similarity index 100%
rename from src/main/resources/loginpage/signin-image.png
rename to src/main/resources/loginpage/signup-image.png
diff --git a/src/main/resources/loginpage/signup.css b/src/main/resources/loginpage/signup.css
new file mode 100644
index 0000000..fcd8751
--- /dev/null
+++ b/src/main/resources/loginpage/signup.css
@@ -0,0 +1,35 @@
+#image-section {
+ -fx-background-image: url("/loginpage/signup-image.png");
+ -fx-background-size: auto;
+ -fx-background-position: right center;
+ -fx-background-repeat: no-repeat;
+ -fx-pref-width: 50%;
+}
+
+#login-btn {
+ -fx-background-color: #000000;
+ -fx-text-fill: white;
+ -fx-pref-height: 35px;
+}
+
+#register-btn {
+ -fx-background-color: #000000;
+ -fx-text-fill: white;
+ -fx-pref-height: 35px;
+}
+
+#login-box {
+ -fx-border-color: #ccc;
+ -fx-border-radius: 8px;
+ -fx-border-width: 1px;
+ -fx-padding: 24px;
+ -fx-max-width: 340px;
+}
+
+#login-btn:hover {
+ -fx-cursor: hand;
+}
+
+#register-btn:hover {
+ -fx-cursor: hand;
+}
\ No newline at end of file
diff --git a/src/main/resources/organizationpage/organizationpage.css b/src/main/resources/organizationpage/organizationpage.css
index a7276b5..20a9ad8 100644
--- a/src/main/resources/organizationpage/organizationpage.css
+++ b/src/main/resources/organizationpage/organizationpage.css
@@ -1,31 +1,81 @@
#main-container {
- -fx-padding: 50px
+ -fx-padding: 50px
}
#logo {
- -fx-min-height: 50%;
+ -fx-min-height: 80%;
}
#orgName {
- -fx-font-weight: bold;
- -fx-font-size: 20pt;
+ -fx-font-weight: bold;
+ -fx-font-size: 28pt;
+ -fx-padding: 0 0 30 0;
+}
+
+#description-container {
+ -fx-padding: 30;
+ -fx-spacing: 22;
+ -fx-max-width: 750;
+ -fx-background-color: #f8f9fa;
+ -fx-border-radius: 8;
}
-#description {
- -fx-font-size: 10pt;
+#description-paragraph {
+ -fx-font-size: 18;
+ -fx-text-fill: #333;
+ -fx-font-family: "Segoe UI", Arial, sans-serif;
+ -fx-line-spacing: 13;
+ -fx-text-alignment: Left;
+ -fx-wrap-text: true;
+ -fx-padding: 10 0 10 0;
}
#donate-button {
- -fx-pref-height: 55px;
- -fx-background-color: #e03030;
- -fx-text-fill: white;
- -fx-font-size: 22px;
- -fx-font-weight: bold;
- -fx-background-radius: 8;
- -fx-cursor: hand;
- -fx-padding: 0 40 0 40;
+ -fx-pref-height: 55px;
+ -fx-background-color: #e03030;
+ -fx-text-fill: white;
+ -fx-font-size: 22px;
+ -fx-font-weight: bold;
+ -fx-background-radius: 8;
+ -fx-cursor: hand;
+ -fx-padding: 0 40 0 40;
+ -fx-margin-top: 30;
}
#donate-button:hover {
- -fx-background-color: #c02020;
+ -fx-background-color: #c02020;
+}
+
+#description-scroll {
+ -fx-control-inner-background: #f8f9fa;
+ -fx-padding: 0;
+}
+
+#description-scroll .scroll-bar:vertical {
+ -fx-pref-width: 8;
+}
+
+#description-scroll .scroll-bar:vertical .thumb {
+ -fx-background-radius: 4;
+ -fx-background-color: #cccccc;
+}
+
+#description-scroll .scroll-bar:vertical .thumb:hover {
+ -fx-background-color: #999999;
+}
+.back-button {
+ -fx-background-color: white;
+ -fx-text-fill: black;
+ -fx-font-weight: bold;
+ -fx-font-size: 20px;
+ -fx-background-radius: 50;
+ -fx-padding: 4px 10px;
+ -fx-cursor: hand;
+ -fx-border-radius: 50;
+ -fx-border-color: black;
+ -fx-border-width: 2px;
+}
+.back-button:hover {
+ -fx-background-color: #333;
+ -fx-border-color:#333;
}
\ No newline at end of file
diff --git a/src/main/resources/userpage/userpage.css b/src/main/resources/userpage/userpage.css
index 8401a77..8d68841 100644
--- a/src/main/resources/userpage/userpage.css
+++ b/src/main/resources/userpage/userpage.css
@@ -1,31 +1,86 @@
#profile-name {
- -fx-font-size: 28px;
- -fx-font-weight: bold;
+ -fx-font-size: 28px;
+ -fx-font-weight: bold;
}
+
.profile-info {
- -fx-font-size: 16px;
- -fx-text-fill: #444;
+ -fx-font-size: 16px;
+ -fx-text-fill: #444;
}
+
.section-title {
- -fx-font-size: 14px;
- -fx-font-weight: bold;
- -fx-fill: #888;
+ -fx-font-size: 14px;
+ -fx-font-weight: bold;
+ -fx-fill: #888;
}
+
.section-box {
- -fx-background-color: #ddd;
- -fx-pref-height: 120px;
- -fx-pref-width: 700px;
- -fx-background-radius: 6;
+ -fx-background-color: #ddd;
+ -fx-pref-height: 150px;
+ -fx-background-radius: 6;
}
+
.logout-button {
- -fx-background-color: #e03030;
- -fx-text-fill: white;
- -fx-font-size: 14px;
- -fx-font-weight: bold;
- -fx-padding: 8 20;
- -fx-background-radius: 4;
- -fx-cursor: hand;
+ -fx-background-color: #e03030;
+ -fx-text-fill: white;
+ -fx-font-size: 14px;
+ -fx-font-weight: bold;
+ -fx-padding: 8 20;
+ -fx-background-radius: 4;
+ -fx-cursor: hand;
}
+
.logout-button:hover {
- -fx-background-color: #c02020;
+ -fx-background-color: #c02020;
+}
+
+.cause-chip {
+ -fx-background-color: #4CAF50;
+ -fx-text-fill: white;
+ -fx-padding: 6 12;
+ -fx-background-radius: 20;
+ -fx-font-size: 13px;
+}
+
+.cause-chip:hover {
+ -fx-background-color: #45a049;
+ -fx-cursor: hand;
+}
+
+.donation-card {
+ -fx-background-color: #f5f5f5;
+ -fx-border-color: #ddd;
+ -fx-border-radius: 6;
+ -fx-background-radius: 6;
+}
+
+.donation-card:hover {
+ -fx-background-color: #efefef;
+ -fx-border-color: #bbb;
+}
+
+.donation-org-name {
+ -fx-font-size: 15px;
+ -fx-font-weight: bold;
+ -fx-fill: #333;
+}
+
+.donation-amount {
+ -fx-font-size: 14px;
+ -fx-font-weight: bold;
+ -fx-text-fill: #2196F3;
+}
+
+.donation-date {
+ -fx-font-size: 12px;
+ -fx-text-fill: #999;
+}
+
+.donation-list {
+ -fx-pref-height: 400px;
+}
+
+/* ScrollPane styling */
+.scroll-pane {
+ -fx-control-inner-background: #fafafa;
}
\ No newline at end of file
diff --git a/src/test/java/edu/group5/app/model/AppStateTest.java b/src/test/java/edu/group5/app/model/AppStateTest.java
new file mode 100644
index 0000000..1254033
--- /dev/null
+++ b/src/test/java/edu/group5/app/model/AppStateTest.java
@@ -0,0 +1,69 @@
+package edu.group5.app.model;
+import static org.junit.jupiter.api.Assertions.assertEquals;
+
+import java.math.BigDecimal;
+
+import org.junit.jupiter.api.Assertions.*;
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import edu.group5.app.model.organization.Organization;
+import edu.group5.app.model.user.Customer;
+import edu.group5.app.model.user.User;
+
+public class AppStateTest {
+ private User nullUser;
+ private BigDecimal nullDonationAmount;
+ private Organization nullOrganization;
+ private String nullPaymentMethod;
+
+ private User currentTestUser;
+ private BigDecimal currentTestDonationAmount;
+ private Organization currentTestOrganization;
+ private String currentTestPaymentMethod;
+
+ @BeforeEach
+ void setUp() {
+ nullUser = null;
+ nullDonationAmount = null;
+ nullOrganization = null;
+ nullPaymentMethod = null;
+
+ currentTestUser = new Customer(1, "Bob",
+ "Builder", "testuser@example.com",
+ "password123");
+
+ currentTestDonationAmount = BigDecimal.ZERO;
+
+ currentTestOrganization = new Organization(1738, "TestOrg",
+ true, "https://testorg.example.com", true,
+ "A test organization", "https://testorg.example.com/logo.png");
+
+ currentTestPaymentMethod = "Credit Card";
+ }
+
+ @Test
+ void gettersAndSetters_WorkCorrectly() {
+ AppState appState = new AppState();
+
+ // Test current user
+ assertEquals(nullUser, appState.getCurrentUser());
+ appState.setCurrentUser(currentTestUser);
+ assertEquals(currentTestUser, appState.getCurrentUser());
+
+ // Test current donation amount
+ assertEquals(nullDonationAmount, appState.getCurrentDonationAmount());
+ appState.setCurrentDonationAmount(currentTestDonationAmount);
+ assertEquals(currentTestDonationAmount, appState.getCurrentDonationAmount());
+
+ // Test current organization
+ assertEquals(nullOrganization, appState.getCurrentOrganization());
+ appState.setCurrentOrganization(currentTestOrganization);
+ assertEquals(currentTestOrganization, appState.getCurrentOrganization());
+
+ // Test current payment method
+ assertEquals(nullPaymentMethod, appState.getCurrentPaymentMethod());
+ appState.setCurrentPaymentMethod(currentTestPaymentMethod);
+ assertEquals(currentTestPaymentMethod, appState.getCurrentPaymentMethod());
+ }
+}
diff --git a/src/test/java/edu/group5/app/model/donation/DonationRepositoryTest.java b/src/test/java/edu/group5/app/model/donation/DonationRepositoryTest.java
index ce81b2a..82140a7 100644
--- a/src/test/java/edu/group5/app/model/donation/DonationRepositoryTest.java
+++ b/src/test/java/edu/group5/app/model/donation/DonationRepositoryTest.java
@@ -33,7 +33,7 @@ void setUp() {
void constructorThrowsIfNullList() {
IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
() -> new DonationRepository(null));
- assertEquals("The list of rows cannot be null", ex.getMessage());
+ assertEquals("List of donation rows can't be null", ex.getMessage());
}
@Test
@@ -88,7 +88,7 @@ void addContentDuplicateIdFails() {
void addContentNullThrows() {
IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
() -> repo.addContent(null));
- assertEquals("Donation cannot be null", ex.getMessage());
+ assertEquals("Donation can't be null", ex.getMessage());
}
@Test
@@ -102,7 +102,7 @@ void getDonationByIdSuccessfully() {
void getDonationByIdThrowsIfNegative() {
IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
() -> repo.getDonationById(0));
- assertEquals("Donation ID must be positive", ex.getMessage());
+ assertEquals("Donation ID must be a positive integer", ex.getMessage());
}
@Test
@@ -182,7 +182,7 @@ void filterByOrganizationNoMatch() {
void filterByOrganizationThrowsIfNegative() {
IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
() -> repo.filterByOrganization(0));
- assertEquals("Organization number must be positive", ex.getMessage());
+ assertEquals("Organization number must be a positive integer", ex.getMessage());
}
@Test
@@ -261,7 +261,7 @@ void filterByUserIdNoMatch() {
void filterByUserIdThrowsIfNegative() {
IllegalArgumentException ex = assertThrows(IllegalArgumentException.class,
() -> repo.filterByUser(0));
- assertEquals("User ID must be positive", ex.getMessage());
+ assertEquals("User ID must be a positive integer", ex.getMessage());
}
@Test
diff --git a/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java b/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java
index 80d37bf..3b1e5ff 100644
--- a/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java
+++ b/src/test/java/edu/group5/app/model/donation/DonationServiceTest.java
@@ -1,6 +1,7 @@
package edu.group5.app.model.donation;
import edu.group5.app.model.organization.OrganizationRepository;
+import edu.group5.app.model.organization.OrganizationScraper;
import edu.group5.app.model.user.Customer;
import org.junit.jupiter.api.BeforeEach;
@@ -11,7 +12,7 @@
import java.time.Instant;
import java.util.ArrayList;
import java.util.HashMap;
-
+import java.util.Map;
import static org.junit.jupiter.api.Assertions.*;
@@ -21,18 +22,20 @@ class DonationServiceTest {
private OrganizationRepository organizationRepository;
private DonationService donationService;
private Customer customer;
+ private OrganizationScraper scraper;
@BeforeEach
void setUp() {
+ scraper = new OrganizationScraper();
HashMap orgMap = new HashMap<>();
- orgMap.put("org_number", "101");
+ orgMap.put("org_number", "101");
orgMap.put("name", "CharityOrg");
- orgMap.put("status", "approved");
+ orgMap.put("status", "approved");
orgMap.put("url", "https://charity.org");
- orgMap.put("is_pre_approved", true);
+ orgMap.put("is_pre_approved", true);
Object[] orgInput = new Object[]{ orgMap };
- organizationRepository = new OrganizationRepository(orgInput);
+ organizationRepository = new OrganizationRepository(orgInput, scraper);
donationRepository = new DonationRepository(new ArrayList<>());
@@ -47,7 +50,7 @@ void testConstructorThrowsIfDonationRepositoryIsNull() {
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
new DonationService(null, organizationRepository);
});
- assertEquals("DonationRepository cannot be null", exception.getMessage());
+ assertEquals("DonationRepository can't be null", exception.getMessage());
}
@Test
@@ -55,17 +58,34 @@ void testConstructorThrowsIfOrganizationRepositoryIsNull() {
IllegalArgumentException exception = assertThrows(IllegalArgumentException.class, () -> {
new DonationService(donationRepository, null);
});
- assertEquals("OrganizationRepository cannot be null", exception.getMessage());
+ assertEquals("OrganizationRepository can't be null", exception.getMessage());
+ }
+
+ @Test
+ void getUserDonationsReturnsEmptyMapIfNoDonations() {
+ assertTrue(donationService.getUserDonations(customer.getUserId()).isEmpty());
}
@Test
- void testGetDonationRepository() {
- assertEquals(donationRepository, donationService.getDonationRepository());
+ void getOrganizationDonationsReturnsMapOfDonations() {
+ Donation donation1 = new Donation(1, customer.getUserId(),
+ 101, new BigDecimal("20.00"), Timestamp.from(Instant.now()), "Card");
+ Donation donation2 = new Donation(2, customer.getUserId(),
+ 101, new BigDecimal("30.00"), Timestamp.from(Instant.now()), "PayPal");
+ donationRepository.addContent(donation1);
+ donationRepository.addContent(donation2);
+
+ Map donations = donationService.getOrganizationDonations(101);
+ assertEquals(2, donations.size());
+ assertTrue(donations.containsKey(1));
+ assertTrue(donations.containsKey(2));
+ assertEquals(donation1, donations.get(1));
+ assertEquals(donation2, donations.get(2));
}
@Test
- void testGetOrganizationRepository() {
- assertEquals(organizationRepository, donationService.getOrganizationRepository());
+ void getOrganizationDonationsReturnsEmptyMapIfNoDonations() {
+ assertTrue(donationService.getOrganizationDonations(1).isEmpty());
}
@Test
diff --git a/src/test/java/edu/group5/app/model/donation/DonationTest.java b/src/test/java/edu/group5/app/model/donation/DonationTest.java
index f8f9069..1de92f9 100644
--- a/src/test/java/edu/group5/app/model/donation/DonationTest.java
+++ b/src/test/java/edu/group5/app/model/donation/DonationTest.java
@@ -74,11 +74,19 @@ void testIfThrowsExceptionWhenOrganizationIdIsNotPositive() {
amount1, date1, paymentMethod1);
}
@Test
- void testIfThrowsExceptionWhenAmountIsNotPositive() {
+ void testIfThrowsExceptionWhenAmountIsNegative() {
expectedMessage = "Amount must be positive and not null";
exceptionTest(donationId1, userId1, organizationId1,
- new BigDecimal("0.00"), date1, paymentMethod1);
+ new BigDecimal("-1.00"), date1, paymentMethod1);
}
+
+ @Test
+ void testIfThrowsExceptionWhenAmountIsNull() {
+ expectedMessage = "Amount must be positive and not null";
+ exceptionTest(donationId1, userId1, organizationId1,
+ null, date1, paymentMethod1);
+ }
+
@Test
void testIfThrowsExceptionWhenDateIsNull() {
expectedMessage = "Date must not be null";
diff --git a/src/test/java/edu/group5/app/model/organization/OrganizationRepositoryTest.java b/src/test/java/edu/group5/app/model/organization/OrganizationRepositoryTest.java
index 7a5ece5..e6b0cf9 100644
--- a/src/test/java/edu/group5/app/model/organization/OrganizationRepositoryTest.java
+++ b/src/test/java/edu/group5/app/model/organization/OrganizationRepositoryTest.java
@@ -1,137 +1,181 @@
-package edu.group5.app.model.organization;
-
-import org.junit.jupiter.api.BeforeEach;
-import org.junit.jupiter.api.Test;
-
-import java.util.Map;
-
-import static org.junit.jupiter.api.Assertions.*;
-
-class OrganizationRepositoryTest {
-
- private OrganizationRepository repository;
-
- @BeforeEach
- void setUp() {
- Object[] content = new Object[] {
- Map.of(
- "org_number", "1",
- "name", "Trusted Org1",
- "status", "approved",
- "url", "org.com",
- "is_pre_approved", true
- ),
- Map.of(
- "org_number", "2",
- "name", "Trusted Org2",
- "status", "approved",
- "url", "org.com",
- "is_pre_approved", true
- ),
- Map.of(
- "org_number", "3",
- "name", "Untrusted Org1",
- "status", "pending",
- "url", "org.com",
- "is_pre_approved", true
- ),
- Map.of(
- "org_number", "4",
- "name", "Untrusted Org2",
- "status", "pending",
- "url", "org.com",
- "is_pre_approved", true
- )
- };
- repository = new OrganizationRepository(content);
- }
-
- private void constructorTest(Object[] input, String expectedMessage) {
- IllegalArgumentException exception = assertThrows(
- IllegalArgumentException.class,
- () -> new OrganizationRepository(input)
- );
- assertEquals(expectedMessage, exception.getMessage());
- }
- @Test
- void constructor_ThrowsWhenContentIsNull() {
- constructorTest(null, "The input cannot be null");
- }
-
- @Test
- void getTrustedOrganizations_OnlyReturnsTrustedOrganizations() {
- Map trusted = repository.getTrustedOrganizations();
-
- assertEquals(2, trusted.size());
- assertTrue(trusted.containsKey(1));
- assertTrue(trusted.containsKey(2));
- assertFalse(trusted.containsKey(3));
- assertFalse(trusted.containsKey(4));
- assertTrue(trusted.values().stream().allMatch(Organization::trusted));
- }
-
- @Test
- void testFindByOrgNumberReturnsOrganization() {
- assertEquals(new Organization(1, "Trusted Org1", true,
- "org.com", true, "Information about Trusted Org1"),
- repository.findByOrgNumber(1));
- }
-
- @Test
- void testFindByOrgNumberIfOrgNumberIsIllegal() {
- IllegalArgumentException exception = assertThrows(
- IllegalArgumentException.class,
- () -> repository.findByOrgNumber(-1));
- assertEquals("The Organization number must be a positive integer", exception.getMessage());
- }
-
- @Test
- void testFindByOrgNumberIfOrgNumberNotFound() {
- assertNull(repository.findByOrgNumber(999));
- }
-
- @Test
- void testFindByOrgNameReturnsOrganization() {
- assertEquals(new Organization(1, "Trusted Org1", true,
- "org.com", true, "Information about Trusted Org1"),
- repository.findByOrgName("Trusted Org1"));
- }
-
- @Test
- void testFindByOrgNameIfNameIsIllegalThrowsException() {
- IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
- () -> repository.findByOrgName(null));
- assertEquals("The name cannot be null", exception.getMessage());
-
- IllegalArgumentException exception2 = assertThrows(IllegalArgumentException.class,
- () -> repository.findByOrgName(""));
- assertEquals("The name cannot be null", exception2.getMessage());
- }
-
- @Test
- void testFindByOrgNameIfNameNotFound() {
- assertNull(repository.findByOrgName("Nonexistent Org"));
- }
-
- @Test
- void testFindByOrgNameIsCaseInsensitive() {
- assertEquals(new Organization(1, "Trusted Org1", true,
- "org.com", true, "Information about Trusted Org1"),
- repository.findByOrgName("trusted org1"));
- }
-
- @Test
- void testExportAllOrganizations() {
- Object[] allOrgs = repository.export();
- assertEquals(4, allOrgs.length);
- }
-
- @Test
- void testExportAllOrganizationsThrowsWhenRepositoryIsEmpty() {
- OrganizationRepository emptyRepo = new OrganizationRepository(new Object[0]);
- IllegalStateException exception = assertThrows(
- IllegalStateException.class, () -> emptyRepo.export()
- );
- assertEquals("The repository is empty", exception.getMessage());
- }
+package edu.group5.app.model.organization;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+
+import java.util.Map;
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class OrganizationRepositoryTest {
+
+ private OrganizationRepository repository;
+ private OrganizationScraper scraper;
+
+ @BeforeEach
+ void setUp() {
+ scraper = new OrganizationScraper();
+ Object[] content = new Object[] {
+ Map.of(
+ "org_number", "1",
+ "name", "Trusted Org1",
+ "status", "approved",
+ "url", "org.com",
+ "is_pre_approved", true
+ ),
+ Map.of(
+ "org_number", "2",
+ "name", "Trusted Org2",
+ "status", "approved",
+ "url", "org.com",
+ "is_pre_approved", true
+ ),
+ Map.of(
+ "org_number", "3",
+ "name", "Untrusted Org1",
+ "status", "pending",
+ "url", "org.com",
+ "is_pre_approved", true
+ ),
+ Map.of(
+ "org_number", "4",
+ "name", "Untrusted Org2",
+ "status", "pending",
+ "url", "org.com",
+ "is_pre_approved", true
+ )
+ };
+ repository = new OrganizationRepository(content, scraper);
+ }
+
+ private void constructorTest(Object[] input, String expectedMessage) {
+ IllegalArgumentException exception = assertThrows(
+ IllegalArgumentException.class,
+ () -> new OrganizationRepository(input, scraper)
+ );
+ assertEquals(expectedMessage, exception.getMessage());
+ }
+ @Test
+ void constructor_ThrowsWhenContentIsNull() {
+ constructorTest(null, "Input data can't be null");
+ }
+
+ @Test
+ void constructor_SkipsOrganizationWithMissingOrgNumber() {
+ Object[] content = new Object[] {
+ Map.of(
+ "name", "Good Org",
+ "status", "approved",
+ "url", "org.com",
+ "is_pre_approved", true
+ ),
+ Map.of(
+ "org_number", "999",
+ "name", "Bad Org",
+ "status", "approved",
+ "url", "org.com",
+ "is_pre_approved", true
+ )
+ };
+
+ OrganizationRepository repo = new OrganizationRepository(content, scraper);
+
+ assertEquals(1, repo.findByOrgNumber(999) != null ? 1 : 0);
+ assertNull(repo.findByOrgNumber(1));
+ }
+
+ @Test
+ void constructor_ThrowsWhenScraperIsNull() {
+ Object[] content = new Object[] {
+ Map.of(
+ "org_number", "1",
+ "name", "Org",
+ "status", "approved",
+ "url", "org.com",
+ "is_pre_approved", true
+ )
+ };
+ IllegalArgumentException exception = assertThrows(
+ IllegalArgumentException.class,
+ () -> new OrganizationRepository(content, null)
+ );
+ assertEquals("Scraper can't be null", exception.getMessage());
+ }
+
+ @Test
+ void getTrustedOrganizations_OnlyReturnsTrustedOrganizations() {
+ Map trusted = repository.getTrustedOrganizations();
+
+ assertEquals(2, trusted.size());
+ assertTrue(trusted.containsKey(1));
+ assertTrue(trusted.containsKey(2));
+ assertFalse(trusted.containsKey(3));
+ assertFalse(trusted.containsKey(4));
+ assertTrue(trusted.values().stream().allMatch(Organization::trusted));
+ }
+
+ @Test
+ void testFindByOrgNumberReturnsOrganization() {
+ assertEquals(new Organization(1, "Trusted Org1", true,
+ "org.com", true, "Information about Trusted Org1", null),
+ repository.findByOrgNumber(1));
+ }
+
+ @Test
+ void testFindByOrgNumberIfOrgNumberIsIllegal() {
+ IllegalArgumentException exception = assertThrows(
+ IllegalArgumentException.class,
+ () -> repository.findByOrgNumber(-1));
+ assertEquals("Organization number must be a positive integer", exception.getMessage());
+ }
+
+ @Test
+ void testFindByOrgNumberIfOrgNumberNotFound() {
+ assertNull(repository.findByOrgNumber(999));
+ }
+
+ @Test
+ void testFindByOrgNameReturnsOrganization() {
+ assertEquals(new Organization(1, "Trusted Org1", true,
+ "org.com", true, "Information about Trusted Org1", null),
+ repository.findByOrgName("Trusted Org1"));
+ }
+
+ @Test
+ void testFindByOrgNameIfNameIsIllegalThrowsException() {
+ IllegalArgumentException exception = assertThrows(IllegalArgumentException.class,
+ () -> repository.findByOrgName(null));
+ assertEquals("Organization name can't be null", exception.getMessage());
+
+ IllegalArgumentException exception2 = assertThrows(IllegalArgumentException.class,
+ () -> repository.findByOrgName(""));
+ assertEquals("Organization name can't be blank", exception2.getMessage());
+ }
+
+ @Test
+ void testFindByOrgNameIfNameNotFound() {
+ assertNull(repository.findByOrgName("Nonexistent Org"));
+ }
+
+ @Test
+ void testFindByOrgNameIsCaseInsensitive() {
+ assertEquals(new Organization(1, "Trusted Org1", true,
+ "org.com", true, "Information about Trusted Org1", null),
+ repository.findByOrgName("trusted org1"));
+ }
+
+ @Test
+ void testExportAllOrganizations() {
+ Object[] allOrgs = repository.export();
+ assertEquals(4, allOrgs.length);
+ }
+
+ @Test
+ void testExportAllOrganizationsThrowsWhenRepositoryIsEmpty() {
+ OrganizationRepository emptyRepo = new OrganizationRepository(new Object[0], scraper);
+ IllegalStateException exception = assertThrows(
+ IllegalStateException.class, () -> emptyRepo.export()
+ );
+ assertEquals("The repository is empty", exception.getMessage());
+ }
}
\ No newline at end of file
diff --git a/src/test/java/edu/group5/app/model/organization/OrganizationScraperTest.java b/src/test/java/edu/group5/app/model/organization/OrganizationScraperTest.java
new file mode 100644
index 0000000..5d48428
--- /dev/null
+++ b/src/test/java/edu/group5/app/model/organization/OrganizationScraperTest.java
@@ -0,0 +1,146 @@
+package edu.group5.app.model.organization;
+
+import org.junit.jupiter.api.BeforeEach;
+import org.junit.jupiter.api.Test;
+import org.jsoup.Jsoup;
+import org.jsoup.nodes.Document;
+
+
+import static org.junit.jupiter.api.Assertions.*;
+
+class OrganizationScraperTest {
+
+ private OrganizationScraper scraper;
+
+ @BeforeEach
+ void setUp() {
+ scraper = new OrganizationScraper();
+ }
+
+ @Test
+ void fetchDescriptionReturnsNullWhenUrlIsNull() {
+ assertNull(scraper.fetchDescription(null));
+ }
+
+ @Test
+ void fetchDescriptionReturnsNullWhenUrlIsBlank() {
+ assertNull(scraper.fetchDescription(""));
+ }
+
+ @Test
+ void fetchDescriptionReturnsNullWhenUrlIsInvalid() {
+ String result = scraper.fetchDescription("https://invalid-url-that-does-not-exist-xyz123.com");
+ assertNull(result);
+ }
+
+ @Test
+ void fetchDescriptionCachesResultOnSecondCall() {
+ // Mock URLs won't work, but cache still works with null returns
+ scraper.fetchDescription("https://example.com");
+ scraper.fetchDescription("https://example.com");
+ // If no exception thrown, cache works
+ assertTrue(true);
+ }
+
+ @Test
+ void fetchLogoUrlReturnsNullWhenUrlIsNull() {
+ assertNull(scraper.fetchLogoUrl(null));
+ }
+
+ @Test
+ void fetchLogoUrlReturnsNullWhenUrlIsBlank() {
+ assertNull(scraper.fetchLogoUrl(""));
+ }
+
+ @Test
+ void fetchLogoUrlReturnsNullWhenUrlIsInvalid() {
+ String result = scraper.fetchLogoUrl("https://invalid-url-that-does-not-exist-xyz123.com");
+ assertNull(result);
+ }
+
+ @Test
+ void fetchLogoUrlCachesResultOnSecondCall() {
+ // Mock URLs won't work, but cache still works with null returns
+ scraper.fetchLogoUrl("https://example.com");
+ scraper.fetchLogoUrl("https://example.com");
+ // If no exception thrown, cache works
+ assertTrue(true);
+ }
+
+ @Test
+ void fetchDescriptionReturnsCachedValue() {
+ OrganizationScraper scraper = new OrganizationScraper();
+
+ // First call - caches (but makes real request)
+ String result1 = scraper.fetchDescription("https://example.com");
+
+ // Second call - should return cached without new request
+ String result2 = scraper.fetchDescription("https://example.com");
+
+ assertEquals(result1, result2); // Same object = cached
+ }
+
+ @Test
+ void fetchDescriptionHandlesExceptionGracefully() {
+ String result = scraper.fetchDescription("https://invalid-domain-xyz.test");
+ assertNull(result);
+ }
+
+ @Test
+ void fetchLogoUrlHandlesExceptionGracefully() {
+ String result = scraper.fetchLogoUrl("https://invalid-domain-xyz.test");
+ assertNull(result);
+ }
+
+ @Test
+ void parseDescriptionExtractsParagraphs() {
+ String html = "";
+ Document doc = Jsoup.parse(html);
+ assertTrue(scraper.parseDescription(doc).contains("First paragraph"));
+ }
+
+ @Test
+ void parseDescriptionUsesFallbackWhenNoParagraphs() {
+ String html = "";
+ Document doc = Jsoup.parse(html);
+ assertEquals("Fallback text without paragraph tags", scraper.parseDescription(doc));
+ }
+
+ @Test
+ void parseDescriptionRemovesExtraInfoDivs() {
+ String html = "";
+ Document doc = Jsoup.parse(html);
+ String result = scraper.parseDescription(doc);
+ assertTrue(result.contains("Keep this"));
+ assertFalse(result.contains("Remove this"));
+ }
+
+ @Test
+ void parseDescriptionFiltersOutLesMer() {
+ String html = "";
+ Document doc = Jsoup.parse(html);
+ assertFalse(scraper.parseDescription(doc).contains("Les mer"));
+ }
+
+ @Test
+ void parseDescriptionReturnsEmptyStringWhenNoSection() {
+ String html = "No section here
";
+ Document doc = Jsoup.parse(html);
+ assertEquals("", scraper.parseDescription(doc));
+ }
+
+ @Test
+ void parseLogoUrlExtractsImageUrl() {
+ String html = "![](\"/logo.png\")