From 4b1cb079fb0d88c8aabc53d31f5be68104b7ac8d Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Thu, 16 Apr 2026 10:06:56 +0200 Subject: [PATCH] Feat: Attempt to implement components to other pages --- .../controller/CharityPageController.java | 33 ++-- .../team6/controller/FrontpageController.java | 6 +- .../OrganizationCardController.java | 13 +- .../src/main/resources/fxml/charityPage.fxml | 183 +----------------- .../resources/fxml/components/navbar.fxml | 54 +++--- 5 files changed, 58 insertions(+), 231 deletions(-) diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java index 121ad3be..0bd468c0 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/CharityPageController.java @@ -1,26 +1,40 @@ package ntnu.systemutvikling.team6.controller; +import com.google.errorprone.annotations.FormatMethod; import javafx.event.ActionEvent; import javafx.fxml.FXML; import javafx.scene.control.Label; import javafx.scene.control.TextField; +import ntnu.systemutvikling.team6.controller.components.BaseController; +import ntnu.systemutvikling.team6.controller.components.FooterController; import ntnu.systemutvikling.team6.controller.components.LoaderScene; +import ntnu.systemutvikling.team6.controller.components.NavbarController; import ntnu.systemutvikling.team6.models.Charity; /** * This controller represents the charity page, where the user can read about the charity and choose * to donate to it. It also has a button to return to the front page. */ -public class CharityPageController { +public class CharityPageController extends BaseController { @FXML private TextField charitySearchField; @FXML private Label CharityDescription; @FXML private Label CharityName; + @FXML private NavbarController navbarController; + @FXML private FooterController footerController; + @FXML public void initialize() {} + @Override + protected void authTokenisSet(){ + navbarController.setAuthToken(authToken); + footerController.setAuthToken(authToken); + } + + private Charity charity; /** @@ -50,22 +64,7 @@ public void setCharity(Charity charity) { @FXML public void switchToDonationPage(ActionEvent event) { System.out.println("Click"); - LoaderScene.LoadScene("donationPage", event, charity, null); + LoaderScene.LoadScene("donationPage", event, charity, null, authToken); } - /** - * This method is used to search for charities based on the input in the search field. - * - * @param event is the event that triggered the search. - */ - @FXML - public void handleSearch(ActionEvent event) { - String query = charitySearchField.getText().trim(); - - if (query.isEmpty()) { - return; - } - - LoaderScene.LoadScene("availableOrganization", event, null, query); - } } diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java index 88710bd4..42208dc0 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java @@ -42,6 +42,7 @@ public class FrontpageController extends BaseController{ @FXML private CheckBox childrenFilter; @FXML private CheckBox healthFilter; @FXML private CheckBox emergencyAidFilter; + @FXML private NavbarController navbarController; @FXML private FooterController footerController; @@ -52,6 +53,7 @@ public class FrontpageController extends BaseController{ @Override protected void authTokenisSet(){ navbarController.setAuthToken(authToken); + footerController.setAuthToken(authToken); } /** @@ -106,7 +108,7 @@ public void initialize() { * @param event */ public void switchToCharityPage(ActionEvent event) { - LoaderScene.LoadScene("CharityPage", event, featuredCharity, null); + LoaderScene.LoadScene("CharityPage", event, featuredCharity, null, authToken); } /** @@ -115,7 +117,7 @@ public void switchToCharityPage(ActionEvent event) { * @param event */ public void switchToDonationPage(ActionEvent event) { - LoaderScene.LoadScene("DonationPage", event, featuredCharity, null); + LoaderScene.LoadScene("DonationPage", event, featuredCharity, null, authToken); } /** diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java index 7644bbf8..df70bb2d 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/OrganizationCardController.java @@ -10,7 +10,7 @@ * looped upon in FronpageController. It is used to display the name and description of a charity, * and to switch to the charity page or donation page when the user clicks on the card. */ -public class OrganizationCardController { +public class OrganizationCardController extends BaseController{ @FXML private Label organizationName; @@ -18,6 +18,11 @@ public class OrganizationCardController { private Charity charity; + @Override + protected void authTokenisSet() { + + } + public void setOrganization(Charity charity) { this.charity = charity; @@ -27,10 +32,12 @@ public void setOrganization(Charity charity) { /* EVENTS */ public void switchToCharityPage(ActionEvent event) { - LoaderScene.LoadScene("CharityPage", event, charity, null); + LoaderScene.LoadScene("CharityPage", event, charity, null, authToken); } public void switchToDonationPage(ActionEvent event) { - LoaderScene.LoadScene("DonationPage", event, charity, null); + LoaderScene.LoadScene("DonationPage", event, charity, null, authToken); } + + } diff --git a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml index ae37eb60..b35e4b43 100644 --- a/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/charityPage.fxml @@ -6,13 +6,11 @@ - - @@ -36,77 +34,9 @@ - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - @@ -408,112 +338,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/helpmehelpapplication/src/main/resources/fxml/components/navbar.fxml b/helpmehelpapplication/src/main/resources/fxml/components/navbar.fxml index a7221e50..fe751b17 100644 --- a/helpmehelpapplication/src/main/resources/fxml/components/navbar.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/components/navbar.fxml @@ -1,30 +1,27 @@ + + - - - - - - - - - - - - - - - + + + + + + + + + + - + @@ -42,6 +39,16 @@ + + + + + + + +