CO2 Gadget Beta v0.14.005

Update web server files
melkati · Jun 8, 2024 · 55b335c · 55b335c
1 parent ee4e3be
commit 55b335c
Show file tree

Hide file tree

Showing 22 changed files with 56 additions and 71 deletions.
diff --git a/data/combined.js.gz b/data/combined.js.gz
diff --git a/data/index.html.gz b/data/index.html.gz
diff --git a/data/index.js.gz b/data/index.js.gz
diff --git a/data/main.js.gz b/data/main.js.gz
diff --git a/data/main.min.js b/data/main.min.js
diff --git a/data/ota.html.gz b/data/ota.html.gz
diff --git a/data/ota.js.gz b/data/ota.js.gz
diff --git a/data/preferences.html.gz b/data/preferences.html.gz
diff --git a/data/preferences.js.gz b/data/preferences.js.gz
diff --git a/data/preferences.min.js b/data/preferences.min.js
diff --git a/data/status.html.gz b/data/status.html.gz
diff --git a/data/status.js.gz b/data/status.js.gz
diff --git a/data/status.min.js b/data/status.min.js
diff --git a/data/style.css.gz b/data/style.css.gz
diff --git a/webserver/captiveportal.js b/webserver/captiveportal.js
@@ -22,26 +22,6 @@ var previousData = {
     captivePortalNoTimeout: false
 };
 
-// CO2 Gadget Features: SUPPORT_BLE, SUPPORT_BUZZER, SUPPORT_ESPNOW, SUPPORT_MDNS, SUPPORT_MQTT, SUPPORT_MQTT_DISCOVERY, SUPPORT_OTA
-// {
-//     "BLE": true,
-//     "Buzzer": true,
-//     "ESPNow": false,
-//     "mDNS": true,
-//     "MQTT": true,
-//     "MQTTDiscovery": true,
-//     "OTA": true
-// }
-var features = {
-    SUPPORT_BLE: false,
-    SUPPORT_BUZZER: false,
-    SUPPORT_ESPNOW: false,
-    SUPPORT_MDNS: false,
-    SUPPORT_MQTT: false,
-    SUPPORT_MQTT_DISCOVERY: false,
-    SUPPORT_OTA: false
-};
-
 /**
  * Sets the captive portal settings and sends them to the server.
  * @param {number} timeToWait - The time to wait for the captive portal.
@@ -267,20 +247,6 @@ function setupInitialSettings() {
     setCaptivePortalSettings(60, true);
 }
 
-/**
- * Adds the 'active' class to the current page link in the navigation bar.
- */
-function highlightCurrentPage() {
-    const currentPage = window.location.pathname.split("/").pop();
-    const navLinks = document.querySelectorAll(".navbar .nav-content a");
-
-    navLinks.forEach(link => {
-        if (link.getAttribute("href") === currentPage) {
-            link.classList.add("active");
-        }
-    });
-}
-
 /**
  * Initialize the captive portal for preferences.html.
  */
@@ -329,23 +295,25 @@ document.addEventListener("DOMContentLoaded", function () {
     if (currentPage === "preferences.html") {
         initializeCaptivePortal();
         highlightCurrentPage(); // Highlight the current page in the navigation bar
-    } else {
-        if (captivePortalDebug) console.log('Not on preferences.html, skipping debug window initialization');
-    }
 
-    const debugWindow = document.getElementById('debug-window');
-    if (captivePortalDebug || debugWindowActive) {
-        if (debugWindow) {
-            createDebugWindow(debugWindow);
-            debugWindowActive = true;
-            debugWindow.style.display = 'block';
+        const debugWindow = document.getElementById('debug-window');
+        if (captivePortalDebug || debugWindowActive) {
+            if (debugWindow) {
+                createDebugWindow(debugWindow);
+                debugWindowActive = true;
+                debugWindow.style.display = 'block';
+            } else {
+                console.error('Element with ID "debug-window" not found.');
+            }
         } else {
-            console.error('Element with ID "debug-window" not found.');
+            if (debugWindow) {
+                debugWindow.style.display = 'none';
+                debugWindowActive = false;
+            }
         }
     } else {
-        if (debugWindow) {
-            debugWindow.style.display = 'none';
-            debugWindowActive = false;
-        }
+        if (captivePortalDebug) console.log('Not on preferences.html, skipping debug window initialization');
     }
+
+
 });
diff --git a/webserver/common.js b/webserver/common.js
@@ -20,4 +20,29 @@ var previousData = {
     relaxedSecurity: false,
     forcedCaptivePortalDebug: false,
     captivePortalNoTimeout: false
-};
+};
+
+// Global variables to store the CO2 Gadget features supported by the device (selected at compile time)
+var features = {
+    SUPPORT_BLE: false,
+    SUPPORT_BUZZER: false,
+    SUPPORT_ESPNOW: false,
+    SUPPORT_MDNS: false,
+    SUPPORT_MQTT: false,
+    SUPPORT_MQTT_DISCOVERY: false,
+    SUPPORT_OTA: false
+};
+
+/**
+ * Adds the 'active' class to the current page link in the navigation bar.
+ */
+function highlightCurrentPage() {
+    const currentPage = window.location.pathname.split("/").pop();
+    const navLinks = document.querySelectorAll(".navbar .nav-content a");
+
+    navLinks.forEach(link => {
+        if (link.getAttribute("href") === currentPage) {
+            link.classList.add("active");
+        }
+    });
+}
diff --git a/webserver/index.html b/webserver/index.html
@@ -15,8 +15,8 @@
         })();
     </script>
     <link rel="stylesheet" type="text/css" href="./style.css" />
-    <script defer type="text/javascript" src="./main.js"></script>
-    <script defer type="text/javascript" src="./combined.js"></script>
+    <script defer type="text/javascript" src="./index.js"></script>
+    <!-- <script defer type="text/javascript" src="./combined.js"></script> -->
 </head>
 
 <body>