From d5c7fd58d9665428e8163aeb10dcfd8fb436cdf8 Mon Sep 17 00:00:00 2001 From: Robin Strand Prestmo Date: Tue, 10 Mar 2026 20:00:12 +0100 Subject: [PATCH 1/4] Continued working with frontPage --- .../java/ntnu/systemutvikling/team6/Main.java | 4 + .../src/main/resources/fxml/frontPage.fxml | 79 +++++++++++++++++-- 2 files changed, 76 insertions(+), 7 deletions(-) diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java index 3cc6b5d..35a9e0d 100644 --- a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/Main.java @@ -13,6 +13,10 @@ public void start(Stage stage) throws Exception { Scene scene = new Scene(fxmlLoader.load()); stage.setTitle("Help Me Help"); stage.setScene(scene); + + stage.setMinHeight(700); + stage.setMinWidth(1100); + stage.show(); } diff --git a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml index af8e832..2e39599 100644 --- a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml @@ -2,16 +2,19 @@ + + + @@ -150,15 +153,77 @@ - + + + + - - - - - + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + + - + From bad4e34f4705f00bf96d89079f2e0a70a1d06df1 Mon Sep 17 00:00:00 2001 From: Robin Strand Prestmo Date: Wed, 11 Mar 2026 18:41:59 +0100 Subject: [PATCH 2/4] Added organizationCard.fxml --- .../team6/controller/FrontpageController.java | 4 + .../src/main/resources/fxml/frontPage.fxml | 75 ++----------------- .../main/resources/fxml/organizationCard.fxml | 39 ++++++++++ 3 files changed, 48 insertions(+), 70 deletions(-) create mode 100644 helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java create mode 100644 helpmehelpapplication/src/main/resources/fxml/organizationCard.fxml diff --git a/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java new file mode 100644 index 0000000..ec668e5 --- /dev/null +++ b/helpmehelpapplication/src/main/java/ntnu/systemutvikling/team6/controller/FrontpageController.java @@ -0,0 +1,4 @@ +package ntnu.systemutvikling.team6.controller; + +public class FrontpageController { +} diff --git a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml index 2e39599..a9bdffa 100644 --- a/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml +++ b/helpmehelpapplication/src/main/resources/fxml/frontPage.fxml @@ -6,12 +6,12 @@ - + @@ -21,7 +21,7 @@ - + @@ -285,78 +285,13 @@ - + - - - - - - - - - - + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/helpmehelpapplication/src/main/resources/fxml/organizationCard.fxml b/helpmehelpapplication/src/main/resources/fxml/organizationCard.fxml new file mode 100644 index 0000000..3050aa3 --- /dev/null +++ b/helpmehelpapplication/src/main/resources/fxml/organizationCard.fxml @@ -0,0 +1,39 @@ + + + + + + + + + + + + + + + + + + + + + + + + +