diff --git a/src/main/java/edu/group5/app/control/MainController.java b/src/main/java/edu/group5/app/control/MainController.java index db47e45..b6e7b19 100644 --- a/src/main/java/edu/group5/app/control/MainController.java +++ b/src/main/java/edu/group5/app/control/MainController.java @@ -16,7 +16,9 @@ public void showHomePage() { public void showLoginPage() { view.showLoginPage(); } - + public void showSignInPage() { + view.showSignInPage(); + } public void showBrowsePage() { view.showBrowsePage(); } diff --git a/src/main/java/edu/group5/app/control/SignInPageController.java b/src/main/java/edu/group5/app/control/SignInPageController.java index 04167c6..e8d3442 100644 --- a/src/main/java/edu/group5/app/control/SignInPageController.java +++ b/src/main/java/edu/group5/app/control/SignInPageController.java @@ -1,4 +1,10 @@ package edu.group5.app.control; public class SignInPageController { + private final MainController controller; + + public SignInPageController(MainController controller) { + this.controller = controller; + } + } diff --git a/src/main/java/edu/group5/app/view/MainView.java b/src/main/java/edu/group5/app/view/MainView.java index 4bbdc3d..48c8058 100644 --- a/src/main/java/edu/group5/app/view/MainView.java +++ b/src/main/java/edu/group5/app/view/MainView.java @@ -1,26 +1,29 @@ package edu.group5.app.view; -import edu.group5.app.control.HeaderController; -import edu.group5.app.control.HomePageController; -import edu.group5.app.control.MainController; +import edu.group5.app.control.*; import edu.group5.app.view.homepage.HomePageView; import edu.group5.app.view.loginpage.LoginPageView; +import edu.group5.app.view.loginpage.SignInPageView; import javafx.scene.Scene; import javafx.scene.layout.BorderPane; public class MainView { private final HeaderController headerController; private final HomePageController homePageController; + private final LoginPageController loginPageController; + private final SignInPageController signInPageController; private final BorderPane root; public MainView(MainController mainController) { this.headerController = new HeaderController(mainController); this.homePageController = new HomePageController(mainController); + this.loginPageController = new LoginPageController(mainController); + this.signInPageController = new SignInPageController(mainController); this.root = new BorderPane(); } public Scene createView() { - root.setCenter(new LoginPageView(headerController)); + root.setCenter(new LoginPageView(loginPageController, headerController)); return new Scene(root, 1280, 720); } @@ -29,9 +32,11 @@ public void showHomePage() { } public void showLoginPage() { - + root.setCenter(new LoginPageView(loginPageController, headerController)); + } + public void showSignInPage() { + root.setCenter(new SignInPageView(signInPageController, headerController)); } - public void showBrowsePage() {} public void showAboutUsPage() {} diff --git a/src/main/java/edu/group5/app/view/loginpage/SignInPageView.java b/src/main/java/edu/group5/app/view/loginpage/SignInPageView.java index 6e6a07c..053f11d 100644 --- a/src/main/java/edu/group5/app/view/loginpage/SignInPageView.java +++ b/src/main/java/edu/group5/app/view/loginpage/SignInPageView.java @@ -1,4 +1,17 @@ package edu.group5.app.view.loginpage; -public class SignInView { +import edu.group5.app.control.HeaderController; +import edu.group5.app.control.SignInPageController; +import javafx.scene.layout.BorderPane; + + +public class SignInPageView extends BorderPane { + private final SignInPageController controller; + + public SignInPageView(SignInPageController signInPageController, HeaderController headerController) { + this.controller = signInPageController; + setTop(new LoginHeader(headerController)); + + + } }