Restructured files and added aboutUs and Help functionality, missing the actual text tho

src/main/java/com/application/DB/Constants.java

@@ -2,26 +2,33 @@ package com.application.DB;
 
 public class Constants {
 
+    // Key name file for the database access
     public static String KEY_FILE_NAME = "sf-drying-optimization-8a2e1b7ffc14.json";
 
-    // Start- & end time
+    // Time related constants
     public static String START_TIME = "";
     public static String STOP_TIME = "";
+    public static String CURRENT_DATE = "";
+    public static String TIME_LEFT = "";
+
     // Boolean variable to tell if the drying process is finished
     public static boolean IS_FINISHED = false;
+    // Boolean variable to tell if the data is finished loading
     public static boolean LOADED_DATA = false;
+
     // User inputs
     public static String TREE_SPECIES = "";
     public static String DIMENSIONS = "";
     public static String SAWSET = "";
     public static String MOISTURE_GOAL = "";
+
     // Number of manual moisture checks
     public static int NUMBER_OF_CHECKS = 1;
+
+    // Max number of input characters for sql injection prevention
     public static int MAX_USER_INPUT_CHARACTERS = 10;
-    // Today's date
-    public static String CURRENT_DATE = "";
-    public static String TIME_LEFT = "";
 
+    // Boolean constants to toggle default launch selected or not for checkboxes for showing graphs
     public static boolean DEFAULT_IS_SELECTED_LIVE_DATA = true;
     public static boolean DEFAULT_IS_SELECTED_REGRESSION = true;
     public static boolean DEFAULT_IS_SELECTED_REGRESSION_SHADOW = false;

src/main/java/com/application/GUI/LineChartFunctionality.java

@@ -2,6 +2,7 @@ package com.application.GUI;
 
 import com.application.DB.Constants;
 import com.application.DB.Settings;
+import com.application.GUI.PopUpWindows.NotificationPopUp;
 import com.application.Main;
 import javafx.scene.chart.CategoryAxis;
 import javafx.scene.chart.LineChart;
@@ -497,7 +498,8 @@ public class LineChartFunctionality {
         if(minutes > 60){
             hours = minutes/60;
             Main.setTimeLeftText(hours + " h");
-            if(hours == 3){NotificationPopUp.displayNotificationWindow("3 Hours Left!");}
+            if(hours == 3){
+                NotificationPopUp.displayNotificationWindow("3 Hours Left!");}
         } else {
             if(minutes == 60){NotificationPopUp.displayNotificationWindow("1 Hours Left!");}
             Main.setTimeLeftText(minutes + " min");

src/main/java/com/application/GUI/Panes/MenuBar.java

@@ -2,6 +2,7 @@ package com.application.GUI.Panes;
 
 import com.application.DB.Constants;
 import com.application.GUI.LineChartFunctionality;
+import com.application.GUI.PopUpWindows.NotificationPopUp;
 import com.application.Main;
 import javafx.scene.control.CheckMenuItem;
 import javafx.scene.control.Menu;
@@ -81,7 +82,9 @@ public class MenuBar {
         });
 
         MenuItem aboutUs = new MenuItem("About Us");
+        aboutUs.setOnAction(event -> getAboutUs());
         MenuItem help = new MenuItem("Help");
+        help.setOnAction(event -> getHelp());
 
 
         menuFile.getItems().addAll(menuFileExit);
@@ -94,4 +97,15 @@ public class MenuBar {
         // Returns the menubar
         return menuBar;
     }
+
+    private static void getAboutUs(){
+        String message = "Hei! Dette er en veldig lang string som sikkert går utenfor window! Dette er About us section!";
+        NotificationPopUp.displayNotificationWindow(message);
+    }
+
+    private static void getHelp(){
+        String message = "Hei! Dette er en veldig lang string som sikkert går utenfor window! Dette er Help section!";
+        NotificationPopUp.displayNotificationWindow(message);
+    }
+
 }
\ No newline at end of file

src/main/java/com/application/GUI/Panes/SideBar.java

 package com.application.GUI.Panes;
 
 import com.application.DB.Constants;
-import com.application.DB.HelpingFunctions;
-import com.application.DB.Settings;
-import com.application.GUI.InputPopUpWindow;
-import com.application.GUI.LineChartFunctionality;
-import com.application.GUI.OutputPopUpWindow;
+import com.application.GUI.PopUpWindows.InputPopUpWindow;
+import com.application.GUI.PopUpWindows.OutputPopUpWindow;
 import com.application.GUI.ProgressBar.RingProgressIndicator;
 import com.application.Main;
 import javafx.application.Platform;
@@ -15,7 +12,6 @@ import javafx.scene.control.TextField;
 import javafx.scene.layout.Priority;
 import javafx.scene.layout.VBox;
 
-import java.util.logging.Level;
 import java.util.logging.Logger;
 
 import static com.application.DB.HelpingFunctions.isLoadedData;

src/main/java/com/application/GUI/InputPopUpWindow.java → src/main/java/com/application/GUI/PopUpWindows/InputPopUpWindow.java

-package com.application.GUI;
+package com.application.GUI.PopUpWindows;
 
 import com.application.DB.Constants;
 import javafx.application.Platform;

src/main/java/com/application/GUI/NotificationPopUp.java → src/main/java/com/application/GUI/PopUpWindows/NotificationPopUp.java

-package com.application.GUI;
+package com.application.GUI.PopUpWindows;
 
+import com.application.GUI.PopUpWindows.InputPopUpWindow;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;
 import javafx.scene.control.Label;
 import javafx.scene.layout.VBox;
+import javafx.scene.text.TextAlignment;
 import javafx.stage.Modality;
 import javafx.stage.Stage;
 
@@ -18,6 +20,8 @@ public class NotificationPopUp {
 
         Label messageLabel = new Label();
         messageLabel.setText(message);
+        messageLabel.setWrapText(true);
+        messageLabel.setTextAlignment(TextAlignment.CENTER);
 
         Button close = new Button("Close");
         close.setOnAction(event -> window.close());

src/main/java/com/application/GUI/OutputPopUpWindow.java → src/main/java/com/application/GUI/PopUpWindows/OutputPopUpWindow.java

-package com.application.GUI;
+package com.application.GUI.PopUpWindows;
 
 import com.application.DB.Constants;
 import com.application.DB.DB;
+import com.application.GUI.PopUpWindows.InputPopUpWindow;
+import com.application.GUI.PopUpWindows.NotificationPopUp;
 import javafx.geometry.Pos;
 import javafx.scene.Scene;
 import javafx.scene.control.Button;

src/main/java/com/application/Main.java

 package com.application;
 
-import com.application.GUI.InputPopUpWindow;
+import com.application.GUI.PopUpWindows.InputPopUpWindow;
 import com.application.GUI.Panes.BottomBar;
 import com.application.GUI.Panes.LogoBar;
 import com.application.GUI.Panes.SideBar;
@@ -14,7 +14,6 @@ import javafx.scene.layout.*;
 import javafx.scene.Scene;
 import javafx.stage.Stage;
 
-import java.io.FileNotFoundException;
 import java.io.IOException;
 
 /**
@@ -100,7 +99,6 @@ public class Main extends Application {
         this.sideBar = sideBar1.createSideBar();
         this.logoBar = logoBar1.createLogoBar();
 
-
         LineChart<String, Number> lineChart = LineChartFunctionality.getLineChart();
 
         //Set id's to connect to css stylesheet
@@ -112,7 +110,6 @@ public class Main extends Application {
         this.bottomBar.setId("bottomBar");
         lineChart.setId("lineChart");
 
-
         // Sett the menubar in a vbox inorder to stretch over the whole screen
         VBox vBox = new VBox(this.menuBar);