diff --git a/src/main/java/edu/group5/app/App.java b/src/main/java/edu/group5/app/App.java index 571db34..3bd4f43 100644 --- a/src/main/java/edu/group5/app/App.java +++ b/src/main/java/edu/group5/app/App.java @@ -7,6 +7,7 @@ import edu.group5.app.view.MainView; import javafx.application.Application; import javafx.scene.Scene; +import javafx.scene.image.Image; import javafx.stage.Stage; import tools.jackson.core.type.TypeReference; import tools.jackson.databind.ObjectMapper; @@ -24,6 +25,7 @@ public void start(Stage stage) { controller.setMainView(view); Scene scene = view.createView(); + stage.getIcons().add(new Image(getClass().getResource("/header/images/hmh-logo.png").toExternalForm())); stage.setTitle("Help-Me-Help"); stage.setScene(scene); stage.show(); diff --git a/src/main/java/edu/group5/app/view/MainView.java b/src/main/java/edu/group5/app/view/MainView.java index 7efa165..78fac82 100644 --- a/src/main/java/edu/group5/app/view/MainView.java +++ b/src/main/java/edu/group5/app/view/MainView.java @@ -1,32 +1,37 @@ 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.view.homepage.HomePageView; import javafx.scene.Scene; import javafx.scene.layout.BorderPane; public class MainView { - private final MainController mainController; private final HeaderController headerController; + private final HomePageController homePageController; private final BorderPane root; public MainView(MainController mainController) { - this.mainController = mainController; this.headerController = new HeaderController(mainController); + this.homePageController = new HomePageController(mainController); this.root = new BorderPane(); } public Scene createView() { - root.setCenter(new HomePageView(headerController)); + root.setCenter(new HomePageView(homePageController, headerController)); return new Scene(root, 1280, 720); } public void showHomePage() { - root.setCenter(new HomePageView(headerController)); + root.setCenter(new HomePageView(homePageController, headerController)); } public void showLoginPage() { } + + public void showBrowsePage() {} + + public void showAboutUsPage() {} } diff --git a/src/main/resources/homepage/homepage.css b/src/main/resources/homepage/homepage.css index b1495f8..90b090c 100644 --- a/src/main/resources/homepage/homepage.css +++ b/src/main/resources/homepage/homepage.css @@ -20,7 +20,7 @@ } #charity-image { - -fx-background-image: url("/homepage/charityimage.jpg"); + -fx-background-image: url("/homepage/images/charityimage.jpg"); -fx-background-position: center 55%; -fx-background-size: 100% auto; -fx-background-repeat: no-repeat;