diff --git a/src/main/java/edu/group5/app/view/MainView.java b/src/main/java/edu/group5/app/view/MainView.java index 78fac82..c2d7325 100644 --- a/src/main/java/edu/group5/app/view/MainView.java +++ b/src/main/java/edu/group5/app/view/MainView.java @@ -1,29 +1,28 @@ package edu.group5.app.view; +import edu.group5.app.control.BrowseCardController; +import edu.group5.app.control.BrowsePageController; import edu.group5.app.control.HeaderController; import edu.group5.app.control.HomePageController; -import edu.group5.app.control.MainController; +import edu.group5.app.view.browsepage.BrowsePageView; import edu.group5.app.view.homepage.HomePageView; import javafx.scene.Scene; import javafx.scene.layout.BorderPane; public class MainView { - private final HeaderController headerController; - private final HomePageController homePageController; + private final Scene scene; private final BorderPane root; - public MainView(MainController mainController) { - this.headerController = new HeaderController(mainController); - this.homePageController = new HomePageController(mainController); + public MainView() { this.root = new BorderPane(); + this.scene = new Scene(root, 1280, 720); } - public Scene createView() { - root.setCenter(new HomePageView(homePageController, headerController)); - return new Scene(root, 1280, 720); + public Scene getScene() { + return this.scene; } - public void showHomePage() { + public void showHomePage(HomePageController homePageController, HeaderController headerController) { root.setCenter(new HomePageView(homePageController, headerController)); } @@ -31,7 +30,9 @@ public void showLoginPage() { } - public void showBrowsePage() {} + public void showBrowsePage(BrowsePageController browsePageController, BrowseCardController browseCardController, HeaderController headerController) { + root.setCenter(new BrowsePageView(getScene(), browsePageController, browseCardController, headerController)); + } public void showAboutUsPage() {} } diff --git a/src/main/resources/browsepage/browse_org.css b/src/main/resources/browsepage/browse_org.css index e69de29..c947cbd 100644 --- a/src/main/resources/browsepage/browse_org.css +++ b/src/main/resources/browsepage/browse_org.css @@ -0,0 +1,18 @@ +#mainContainer { + -fx-border-color: black; + -fx-border-width: 1px; + -fx-border-radius: 1em; + -fx-padding: 5px; + -fx-pref-width: 10px; +} + +#imageContainer {} + +#logo {} + +#orgName { + -fx-font-size: large; + -fx-font-weight: bold; +} + +#checkMarkContainer {} \ No newline at end of file diff --git a/src/main/resources/browsepage/browsepage.css b/src/main/resources/browsepage/browsepage.css index e69de29..c2dfef0 100644 --- a/src/main/resources/browsepage/browsepage.css +++ b/src/main/resources/browsepage/browsepage.css @@ -0,0 +1,3 @@ +#body { + -fx-padding: 20px; +} \ No newline at end of file diff --git a/src/main/resources/browsepage/images/children_of_shambala.png b/src/main/resources/browsepage/images/children_of_shambala.png new file mode 100644 index 0000000..3b1a7f7 Binary files /dev/null and b/src/main/resources/browsepage/images/children_of_shambala.png differ diff --git a/src/main/resources/browsepage/images/kfum_kfum_global.png b/src/main/resources/browsepage/images/kfum_kfum_global.png new file mode 100644 index 0000000..bd5365a Binary files /dev/null and b/src/main/resources/browsepage/images/kfum_kfum_global.png differ diff --git a/src/main/resources/verified_check.png b/src/main/resources/verified_check.png new file mode 100644 index 0000000..520f237 Binary files /dev/null and b/src/main/resources/verified_check.png differ