From ec8c933dfcaafc26953aab3ece7f62ef8557e5cd Mon Sep 17 00:00:00 2001 From: AdrianBalunan Date: Tue, 21 Apr 2026 02:12:19 +0200 Subject: [PATCH] Feat: aboutPage works --- .../team6/controller/AboutPageController.java | 17 + .../components/FooterController.java | 8 +- .../src/main/resources/fxml/aboutPage.fxml | 856 ++++++++---------- .../resources/fxml/components/footer.fxml | 27 +- 4 files changed, 414 insertions(+), 494 deletions(-) create mode 100644 helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/AboutPageController.java diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/AboutPageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/AboutPageController.java new file mode 100644 index 0000000..46366db --- /dev/null +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/AboutPageController.java @@ -0,0 +1,17 @@ +package ntnu.systemutvikling.team6.controller; + +import javafx.fxml.FXML; +import ntnu.systemutvikling.team6.controller.components.BaseController; +import ntnu.systemutvikling.team6.controller.components.FooterController; +import ntnu.systemutvikling.team6.controller.components.NavbarController; + +public class AboutPageController extends BaseController { + @FXML private NavbarController navbarController; + @FXML private FooterController footerController; + + @Override + protected void authTokenisSet() { + navbarController.setAuthToken(authToken); + footerController.setAuthToken(authToken); + } +} diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/FooterController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/FooterController.java index 8764e16..05e25d1 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/FooterController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/FooterController.java @@ -7,17 +7,13 @@ import ntnu.systemutvikling.team6.service.AuthenticationService; public class FooterController extends BaseController { - @FXML private Button HelpMeHelp; - @FXML private Button aboutUsLink; - - @FXML - public void switchToAboutPage(ActionEvent event) { + private void switchToAboutPage(ActionEvent event) { System.out.println("Click!"); LoaderScene.LoadScene("aboutPage", event, null, null, authToken); } @FXML - public void switchToFrontPage(ActionEvent event) { + private void switchToFrontPage(ActionEvent event) { System.out.println("Click!"); LoaderScene.LoadScene("frontPage", event, null, null, authToken); } diff --git a/helpmehelpapplication/src/main/resources/fxml/aboutPage.fxml b/helpmehelpapplication/src/main/resources/fxml/aboutPage.fxml index 26dfe91..1d6bbe4 100644 --- a/helpmehelpapplication/src/main/resources/fxml/aboutPage.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/aboutPage.fxml @@ -18,6 +18,7 @@ + @@ -36,471 +37,400 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + + diff --git a/helpmehelpapplication/src/main/resources/fxml/components/footer.fxml b/helpmehelpapplication/src/main/resources/fxml/components/footer.fxml index 1e632b9..e3ecbb5 100644 --- a/helpmehelpapplication/src/main/resources/fxml/components/footer.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/components/footer.fxml @@ -49,36 +49,13 @@ - + - -