diff --git a/src/main/java/edu/group5/app/App.java b/src/main/java/edu/group5/app/App.java index 3bd4f43..5c8c942 100644 --- a/src/main/java/edu/group5/app/App.java +++ b/src/main/java/edu/group5/app/App.java @@ -4,7 +4,6 @@ import edu.group5.app.control.MainController; import edu.group5.app.control.OrgAPIWrapper; -import edu.group5.app.view.MainView; import javafx.application.Application; import javafx.scene.Scene; import javafx.scene.image.Image; @@ -18,12 +17,10 @@ public class App extends Application { @Override public void start(Stage stage) { - // AppModel model = new AppModel(); MainController controller = new MainController(); - MainView view = new MainView(controller); - controller.setMainView(view); - Scene scene = view.createView(); + Scene scene = controller.getMainView().getScene(); + controller.showBrowsePage(); stage.getIcons().add(new Image(getClass().getResource("/header/images/hmh-logo.png").toExternalForm())); stage.setTitle("Help-Me-Help"); diff --git a/src/main/java/edu/group5/app/control/BrowseCardController.java b/src/main/java/edu/group5/app/control/BrowseCardController.java index e63be92..cc761b5 100644 --- a/src/main/java/edu/group5/app/control/BrowseCardController.java +++ b/src/main/java/edu/group5/app/control/BrowseCardController.java @@ -1,9 +1,9 @@ package edu.group5.app.control; -public class BrowseOrgController { +public class BrowseCardController { private final MainController controller; - public BrowseOrgController(MainController mainController) { + public BrowseCardController(MainController mainController) { this.controller = mainController; } } diff --git a/src/main/java/edu/group5/app/control/BrowsePageController.java b/src/main/java/edu/group5/app/control/BrowsePageController.java index 9e2802e..0922e68 100644 --- a/src/main/java/edu/group5/app/control/BrowsePageController.java +++ b/src/main/java/edu/group5/app/control/BrowsePageController.java @@ -1,4 +1,9 @@ package edu.group5.app.control; public class BrowsePageController { + private final MainController controller; + + public BrowsePageController(MainController mainController) { + this.controller = mainController; + } } diff --git a/src/main/java/edu/group5/app/control/HeaderController.java b/src/main/java/edu/group5/app/control/HeaderController.java index a02e945..bef4854 100644 --- a/src/main/java/edu/group5/app/control/HeaderController.java +++ b/src/main/java/edu/group5/app/control/HeaderController.java @@ -14,6 +14,7 @@ public void handleHomeBtn() { public void handleCausesBtn() { System.out.println("Causes button pressed"); + controller.showBrowsePage(); } public void handleAboutBtn() { diff --git a/src/main/java/edu/group5/app/control/MainController.java b/src/main/java/edu/group5/app/control/MainController.java index db47e45..cd3309a 100644 --- a/src/main/java/edu/group5/app/control/MainController.java +++ b/src/main/java/edu/group5/app/control/MainController.java @@ -3,14 +3,26 @@ import edu.group5.app.view.MainView; public class MainController { - private MainView view; + private final MainView view; + private final HeaderController headerController; + private final HomePageController homePageController; + private final BrowsePageController browsePageController; + private final BrowseCardController browseCardController; - public void setMainView(MainView view) { - this.view = view; + public MainController() { + this.view = new MainView(); + this.headerController = new HeaderController(this); + this.homePageController = new HomePageController(this); + this.browsePageController = new BrowsePageController(this); + this.browseCardController = new BrowseCardController(this); + } + + public MainView getMainView() { + return view; } public void showHomePage() { - view.showHomePage(); + view.showHomePage(homePageController, headerController); } public void showLoginPage() { @@ -18,7 +30,7 @@ public void showLoginPage() { } public void showBrowsePage() { - view.showBrowsePage(); + view.showBrowsePage(browsePageController, browseCardController, headerController); } public void showAboutUsPage() {}