Moved window management into ViewController for switching scenes

Author: MFrikken

src/main/java/com/codeboy/Main.java

@@ -1,6 +1,7 @@
 package com.codeboy;
 
 import com.codeboy.controller.FileController;
+import com.codeboy.controller.ViewController;
 import com.codeboy.controller.VulnerabilityController;
 import com.codeboy.controller.WeaknessController;
 import com.codeboy.utility.FileReaderUtility;
@@ -30,33 +31,13 @@ public void start(Stage stage) {
         WebView webView = new WebView();
         WebEngine webEngine = webView.getEngine();
 
+        ViewController viewController = new ViewController(webEngine);
+
         webEngine.setOnError(event -> LOGGER.warning("[Frontend] An error occured on the frontend: " + event.getMessage()));
         File htmlFile = new File(getClass().getResource("/html/index.html").getFile());
         webEngine.load(htmlFile.toURI().toString());
         webEngine.setJavaScriptEnabled(true);
 
-        // Wait until WebView is fully loaded before injecting WeaknessController
-        webEngine.getLoadWorker().stateProperty().addListener((obs, oldState, newState) -> {
-            if (newState == javafx.concurrent.Worker.State.SUCCEEDED) {
-                JSObject window = (JSObject) webEngine.executeScript("window");
-                window.setMember("fileController", FileController.getInstance());
-                window.setMember("weaknessController", WeaknessController.getInstance());
-                window.setMember("vulnerabilityController", VulnerabilityController.getInstance());
-                window.setMember("fileReader", FileReaderUtility.getInstance());
-
-                // TODO: remove later - just for debugging purposes
-                window.setMember("javascriptBridge", new JavaScriptBridge());
-                webEngine.executeScript("""
-                            console.log = function(msg) {
-                                javascriptBridge.log(msg);
-                            };
-                            console.error = function(msg) {
-                                javascriptBridge.error(msg);
-                            };
-                        """);
-            }
-        });
-
         StackPane root = new StackPane(webView);
         Scene scene = new Scene(root, 1500, 900);
         stage.setScene(scene);
@@ -74,4 +55,6 @@ public void start(Stage stage) {
         }
         stage.show();
     }
+
+
 }

src/main/java/com/codeboy/controller/ViewController.java

@@ -0,0 +1,41 @@
+package com.codeboy.controller;
+
+import com.codeboy.utility.FileReaderUtility;
+import com.codeboy.utility.JavaScriptBridge;
+import javafx.concurrent.Worker;
+import javafx.scene.web.WebEngine;
+import netscape.javascript.JSObject;
+
+import java.io.File;
+import java.util.function.Consumer;
+
+// TODO:
+// https://stackoverflow.com/questions/32564195/load-a-new-page-in-javafx-webview
+public class ViewController {
+
+    private JSObject window;
+
+    public ViewController(WebEngine webEngine) {
+        webEngine.getLoadWorker().stateProperty().addListener((obs, oldState, newState) -> {
+            if (newState == javafx.concurrent.Worker.State.SUCCEEDED) {
+                JSObject window = (JSObject) webEngine.executeScript("window");
+                window.setMember("viewController", new ViewController(webEngine));
+                window.setMember("fileController", FileController.getInstance());
+                window.setMember("weaknessController", WeaknessController.getInstance());
+                window.setMember("vulnerabilityController", VulnerabilityController.getInstance());
+                window.setMember("fileReader", FileReaderUtility.getInstance());
+
+                // TODO: remove later - just for debugging purposes
+                window.setMember("javascriptBridge", new JavaScriptBridge());
+                webEngine.executeScript("""
+                            console.log = function(msg) {
+                                javascriptBridge.log(msg);
+                            };
+                            console.error = function(msg) {
+                                javascriptBridge.error(msg);
+                            };
+                        """);
+            }
+        });
+    }
+}

src/main/resources/html/analytics.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Analytics</title>
+</head>
+<body>
+  <h1>Test</h1>
+</body>
+</html>

src/main/resources/html/index.html

@@ -107,6 +107,9 @@ <h3>Recent Activity</h3>
 <section>
     <ol id="list"></ol>
 </section>
+
+<button onclick="goTo('analytics.html')"></button>
+
 </body>
 
 </html>

src/main/resources/js/script.js

@@ -8,6 +8,7 @@ function handleFileProcessing() {
     handleFileSelection(filePath);
     addToRecentFiles(filePath);
     loadRecentFiles();
+    goTo('analytics.html')
 }
 
 function handleFileSelection(filePath) {
@@ -135,3 +136,7 @@ function loadRecentFiles() {
     }
 }
 
+function goTo(path) {
+    window.location.href = path;
+}
+

target/classes/html/analytics.html

@@ -0,0 +1,10 @@
+<!DOCTYPE html>
+<html lang="en">
+<head>
+  <meta charset="UTF-8">
+  <title>Analytics</title>
+</head>
+<body>
+  <h1>Test</h1>
+</body>
+</html>

target/classes/html/index.html

@@ -107,6 +107,9 @@ <h3>Recent Activity</h3>
 <section>
     <ol id="list"></ol>
 </section>
+
+<button onclick="goTo('analytics.html')"></button>
+
 </body>
 
 </html>

target/classes/icons/list.png

@@ -8,6 +8,7 @@ function handleFileProcessing() {
     handleFileSelection(filePath);
     addToRecentFiles(filePath);
     loadRecentFiles();
+    goTo('analytics.html')
 }
 
 function handleFileSelection(filePath) {
@@ -135,3 +136,7 @@ function loadRecentFiles() {
     }
 }
 
+function goTo(path) {
+    window.location.href = path;
+}
+