Skip to content

Commit

Permalink
refactor: made app and MainView work together
Browse files Browse the repository at this point in the history
  • Loading branch information
emilfa committed Mar 10, 2026
1 parent eb54636 commit f2c74cc
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 5 deletions.
2 changes: 2 additions & 0 deletions src/main/java/edu/group5/app/App.java
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand All @@ -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();
Expand Down
13 changes: 9 additions & 4 deletions src/main/java/edu/group5/app/view/MainView.java
Original file line number Diff line number Diff line change
@@ -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() {}
}
2 changes: 1 addition & 1 deletion src/main/resources/homepage/homepage.css
Original file line number Diff line number Diff line change
Expand Up @@ -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;
Expand Down

0 comments on commit f2c74cc

Please sign in to comment.