Skip to content

Commit

Permalink
refactor: made application run with new controller structure
Browse files Browse the repository at this point in the history
  • Loading branch information
emilfa committed Mar 20, 2026
1 parent 050f592 commit c3b2cac
Show file tree
Hide file tree
Showing 9 changed files with 41 additions and 47 deletions.
19 changes: 8 additions & 11 deletions src/main/java/edu/group5/app/view/MainView.java
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
package edu.group5.app.view;

import edu.group5.app.control.*;
import edu.group5.app.model.organization.OrganizationRepository;
import edu.group5.app.view.browsepage.BrowsePageView;
import edu.group5.app.control.*;
import edu.group5.app.control.donationpage.DonationPageController;
import edu.group5.app.control.donationpage.PaymentCompleteController;
import edu.group5.app.model.user.Customer;
import edu.group5.app.view.donationpage.DonationPageView;
import edu.group5.app.view.donationpage.PaymentCompletePageView;
Expand All @@ -31,14 +28,14 @@ public class MainView extends BorderPane {
public MainView(MainController controller) {
this.controller = controller;
Header header = new Header(controller.getPageController());
this.homePageView = new HomePageView();
this.loginPageView = new LoginPageView();
this.signInPageView = new SignInPageView();
this.browsePageView = new BrowsePageView();
this.organizationPageView = new OrganizationPageView();
this.donationPageView = new DonationPageView();
this.paymentCompletePageView = new PaymentCompletePageView();
this.userPageView = new UserPageView();
this.homePageView = new HomePageView(controller.getPageController());
this.loginPageView = new LoginPageView(controller.getPageController());
this.signInPageView = new SignInPageView(controller.getPageController());
this.browsePageView = new BrowsePageView(controller.getPageController());
this.organizationPageView = new OrganizationPageView(controller.getPageController());
this.donationPageView = new DonationPageView(controller.getPageController());
this.paymentCompletePageView = new PaymentCompletePageView(controller.getPageController());
this.userPageView = new UserPageView(controller.getPageController(), new Customer(1, "John", "Pedersen", "jh@gmail.com", "1234"));

Scene root = new Scene(this, 1280, 720);

Expand Down
9 changes: 5 additions & 4 deletions src/main/java/edu/group5/app/view/browsepage/BrowseCard.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package edu.group5.app.view.browsepage;

import edu.group5.app.control.PageController;
import javafx.geometry.Pos;
import javafx.scene.image.Image;
import javafx.scene.image.ImageView;
Expand All @@ -8,10 +9,10 @@
import javafx.scene.text.Text;

public class BrowseCard extends VBox {
private final BrowseCardController controller;
private final PageController controller;

public BrowseCard(BrowseCardController browseCardController, String img, String name) {
this.controller = browseCardController;
public BrowseCard(PageController controller, String img, String name) {
this.controller = controller;
setId("mainContainer");
getStylesheets().add(getClass().getResource("/browsepage/browse_org.css").toExternalForm());

Expand All @@ -22,7 +23,7 @@ public BrowseCard(BrowseCardController browseCardController, String img, String
);

setOnMouseClicked(e -> {
controller.handleCardClick();
controller.handleBrowseCardClick();
});

setSpacing(20);
Expand Down
11 changes: 5 additions & 6 deletions src/main/java/edu/group5/app/view/browsepage/BrowsePageView.java
Original file line number Diff line number Diff line change
@@ -1,17 +1,16 @@
package edu.group5.app.view.browsepage;

import edu.group5.app.control.PageController;
import javafx.geometry.Pos;
import javafx.scene.control.ScrollPane;
import javafx.scene.control.TextField;
import javafx.scene.layout.*;

public class BrowsePageView extends BorderPane {
private final BrowsePageController controller;
private final BrowseCardController browseCardController;
private final PageController controller;

public BrowsePageView(BrowsePageController browsePageController, BrowseCardController browseCardController) {
this.controller = browsePageController;
this.browseCardController = browseCardController;
public BrowsePageView(PageController controller) {
this.controller = controller;
getStylesheets().add(getClass().getResource("/browsepage/browsepage.css").toExternalForm());
setCenter(createBody());
}
Expand Down Expand Up @@ -48,7 +47,7 @@ private GridPane createOrganizationSection() {
int column = 0;
int row = 0;
for (int i = 0; i < 16; i++) {
BrowseCard card = new BrowseCard(browseCardController, "/browsepage/images/children_of_shambala.png", "Shambala Foundation");
BrowseCard card = new BrowseCard(controller, "/browsepage/images/children_of_shambala.png", "Shambala Foundation");

GridPane.setFillWidth(card, true);
grid.setAlignment(Pos.CENTER);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,7 +1,6 @@
package edu.group5.app.view.donationpage;

import edu.group5.app.control.donationpage.DonationPageController;
import edu.group5.app.view.Header;
import edu.group5.app.control.PageController;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
Expand All @@ -14,15 +13,12 @@
import javafx.scene.text.TextAlignment;

public class DonationPageView extends BorderPane {
private final DonationPageController controller;
private final PageController controller;

public DonationPageView(DonationPageController donationPageController, HeaderController headerController) {
this.controller = donationPageController;
public DonationPageView(PageController controller) {
this.controller = controller;
getStylesheets().add(getClass().getResource("/donationpage/donation.css").toExternalForm());

Header headerView = new Header(headerController);
setTop(headerView);

VBox content = new VBox();
content.getChildren().addAll(createDonationGrid(), createDonateSection());
setCenter(content);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
package edu.group5.app.view.donationpage;

import edu.group5.app.control.donationpage.PaymentCompleteController;
import edu.group5.app.control.PageController;
import javafx.geometry.Insets;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
Expand All @@ -13,10 +13,10 @@
import java.util.Objects;

public class PaymentCompletePageView extends BorderPane {
private final PaymentCompleteController controller;
private final PageController controller;

public PaymentCompletePageView(PaymentCompleteController paymentCompleteController) {
this.controller = paymentCompleteController;
public PaymentCompletePageView(PageController controller) {
this.controller = controller;
getStylesheets().add(getClass().getResource("/donationpage/paymentcomplete.css").toExternalForm());

VBox content = new VBox(20);
Expand Down
Original file line number Diff line number Diff line change
@@ -1,6 +1,7 @@
package edu.group5.app.view.loginpage;


import edu.group5.app.control.PageController;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
Expand All @@ -11,10 +12,10 @@
import java.util.Objects;

public class LoginPageView extends BorderPane {
private final LoginPageController controller;
private final PageController controller;

public LoginPageView(LoginPageController loginPageController) {
this.controller = loginPageController;
public LoginPageView(PageController controller) {
this.controller = controller;
LoginHeader loginHeaderView = new LoginHeader();
setTop(loginHeaderView);

Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package edu.group5.app.view.loginpage;

import edu.group5.app.control.PageController;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
import javafx.scene.control.Label;
Expand All @@ -11,10 +12,10 @@


public class SignInPageView extends BorderPane {
private final SignInPageController controller;
private final PageController controller;

public SignInPageView(SignInPageController signInPageController) {
this.controller = signInPageController;
public SignInPageView(PageController controller) {
this.controller = controller;
setTop(new LoginHeader());

HBox content = new HBox();
Expand Down
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package edu.group5.app.view.organizationpage;

import edu.group5.app.control.PageController;
import edu.group5.app.view.Header;
import javafx.geometry.Pos;
import javafx.scene.control.Button;
Expand All @@ -14,13 +15,11 @@
import javafx.scene.text.Text;

public class OrganizationPageView extends BorderPane {
private final OrganizationPageController controller;
private final PageController controller;

public OrganizationPageView(OrganizationPageController controller, HeaderController headerController) {
public OrganizationPageView(PageController controller) {
this.controller = controller;
getStylesheets().add(getClass().getResource("/organizationpage/organizationpage.css").toExternalForm());
Header headerView = new Header(headerController);
setTop(headerView);
setCenter(createBody());
}

Expand Down
8 changes: 4 additions & 4 deletions src/main/java/edu/group5/app/view/userpage/UserPageView.java
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
package edu.group5.app.view.userpage;

import edu.group5.app.control.PageController;
import edu.group5.app.model.user.Customer;
import edu.group5.app.view.Header;
import javafx.geometry.Insets;
Expand All @@ -15,15 +16,14 @@


public class UserPageView extends BorderPane {
private final PageController controller;
private final Customer customer;

public UserPageView(HeaderController headerController, Customer customer) {
public UserPageView(PageController controller, Customer customer) {
this.controller = controller;
this.customer = customer;
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());
Expand Down

0 comments on commit c3b2cac

Please sign in to comment.