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 ad2cc3f..8764e16 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 @@ -8,17 +8,18 @@ public class FooterController extends BaseController { @FXML private Button HelpMeHelp; - @FXML private Label aboutUsLink; - + @FXML private Button aboutUsLink; + @FXML public void switchToAboutPage(ActionEvent event) { System.out.println("Click!"); LoaderScene.LoadScene("aboutPage", event, null, null, authToken); } + @FXML public void switchToFrontPage(ActionEvent event) { System.out.println("Click!"); - LoaderScene.LoadScene("FrontPage", event, null, null, authToken); + LoaderScene.LoadScene("frontPage", event, null, null, authToken); } @Override diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarController.java index bfe181f..2a9b73f 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarController.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/components/NavbarController.java @@ -1,10 +1,14 @@ package ntnu.systemutvikling.team6.controller.components; import javafx.event.ActionEvent; +import javafx.event.Event; import javafx.fxml.FXML; import javafx.scene.control.Button; import javafx.scene.control.TextField; +import java.awt.*; +import java.awt.event.MouseEvent; + public class NavbarController extends BaseController { @FXML protected TextField frontSearchField; @FXML private Button loginButton; @@ -41,7 +45,7 @@ private void handleFrontSearch(ActionEvent event){ @FXML private void switchToFrontPage(ActionEvent event) { System.out.println("Click!"); - LoaderScene.LoadScene("FrontPage", event, null, null, authToken); + LoaderScene.LoadScene("frontPage", event, null, null, authToken); } @FXML diff --git a/helpmehelpapplication/src/main/resources/fxml/components/footer.fxml b/helpmehelpapplication/src/main/resources/fxml/components/footer.fxml index 991d42d..1e632b9 100644 --- a/helpmehelpapplication/src/main/resources/fxml/components/footer.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/components/footer.fxml @@ -1,22 +1,13 @@ - - - - - - - - - - - - + - - - - + + + + + + + + @@ -29,43 +20,47 @@ - - - + - +