From 89e33823fa30d13898b9348e03f0160b7547f90f Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Thu, 16 Apr 2026 01:07:25 +0200 Subject: [PATCH] Feat: Frontpage sliced and decied --- .../team6/controller/FrontpageController.java | 32 ++--- .../src/main/resources/fxml/frontPage.fxml | 135 +----------------- 2 files changed, 13 insertions(+), 154 deletions(-) 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 b5b45226..88710bd4 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java @@ -8,14 +8,12 @@ import javafx.fxml.FXML; import javafx.fxml.FXMLLoader; import javafx.scene.Parent; +import javafx.scene.control.Button; import javafx.scene.control.CheckBox; import javafx.scene.control.Label; import javafx.scene.control.TextField; import javafx.scene.layout.FlowPane; -import ntnu.systemutvikling.team6.controller.components.BaseController; -import ntnu.systemutvikling.team6.controller.components.LoaderScene; -import ntnu.systemutvikling.team6.controller.components.NavbarFooterController; -import ntnu.systemutvikling.team6.controller.components.OrganizationCardController; +import ntnu.systemutvikling.team6.controller.components.*; import ntnu.systemutvikling.team6.database.DatabaseConnection; import ntnu.systemutvikling.team6.database.Readers.CharitySelect; import ntnu.systemutvikling.team6.database.Readers.DonationSelect; @@ -31,7 +29,7 @@ * it, or click on the featured charity to see more details about it. It also has buttons to switch * to the charity page and the donation page for the featured charity */ -public class FrontpageController extends BaseController implements NavbarFooterController { +public class FrontpageController extends BaseController{ @FXML private Charity featuredCharity; @FXML private FlowPane cardsContainer; @FXML private Label Carosel_Organisasjon; @@ -39,17 +37,21 @@ public class FrontpageController extends BaseController implements NavbarFooterC @FXML private Label Total_Orgnisasjon; @FXML private Label Total_Donations; @FXML private Label PreApproved_Percentage; - @FXML private TextField frontSearchField; + @FXML private CheckBox verifiedFilter; @FXML private CheckBox childrenFilter; @FXML private CheckBox healthFilter; @FXML private CheckBox emergencyAidFilter; + @FXML private NavbarController navbarController; + @FXML private FooterController footerController; private List allCharities = new ArrayList<>(); + + @Override protected void authTokenisSet(){ - + navbarController.setAuthToken(authToken); } /** @@ -126,22 +128,6 @@ public void handleCategoryFilterChange(ActionEvent event) { displayCharities(getFilteredCharities()); } - /** - * 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 handleFrontSearch(ActionEvent event) { - String query = frontSearchField.getText().trim(); - - if (query.isEmpty()) { - return; - } - - LoaderScene.LoadScene("availableOrganization", event, null, query); - } - /** * This method is used to filter the charities based on the selected filters. * diff --git a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml index 8d4edd5b..c08f91d3 100644 --- a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml @@ -33,59 +33,8 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + @@ -300,83 +249,7 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + +