From 7f8feb859110fc4105422ed3a5370b3724e0eb92 Mon Sep 17 00:00:00 2001
From: bobsfriend12 <calebsethherring+github@gmail.com>
Date: Wed, 5 Jul 2023 15:34:35 -0500
Subject: [PATCH 1/6] get rid of errors in console log

---
 app/frontend/templates/panel/denied.html | 220 ++++++++++--------
 app/frontend/templates/public/login.html |   2 +-
 app/frontend/templates/public_base.html  | 269 +++++++++++++----------
 3 files changed, 278 insertions(+), 213 deletions(-)
diff --git a/app/frontend/templates/panel/denied.html b/app/frontend/templates/panel/denied.html
index d4548c05..28afd7b0 100644
--- a/app/frontend/templates/panel/denied.html
+++ b/app/frontend/templates/panel/denied.html
@@ -1,106 +1,142 @@
 <!DOCTYPE html>
 <html lang="en">
+  <head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    <title>Crafty Controller</title>
+    <!-- plugins:css -->
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/mdi/css/materialdesignicons.min.css"
+    />
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/flag-icon-css/css/flag-icon.min.css"
+    />
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/ti-icons/css/themify-icons.css"
+    />
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/typicons/typicons.css"
+    />
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/css/vendor.bundle.base.css"
+    />
 
-<head>
-  <!-- Required meta tags -->
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  <title>Crafty Controller</title>
-  <!-- plugins:css -->
-  <link rel="stylesheet" href="/static/assets/vendors/mdi/css/materialdesignicons.min.css">
-  <link rel="stylesheet" href="/static/assets/vendors/flag-icon-css/css/flag-icon.min.css">
-  <link rel="stylesheet" href="/static/assets/vendors/ti-icons/css/themify-icons.css">
-  <link rel="stylesheet" href="/static/assets/vendors/typicons/typicons.css">
-  <link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-title" content="Crafty" />
+    <link
+      rel="apple-touch-icon"
+      href="../static/assets/images/Crafty_4-0.png"
+    />
 
-  
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="mobile-web-app-capable" content="yes" />
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="Crafty">
-  <link rel="apple-touch-icon" href="../static/assets/images/Crafty_4-0.png">
+    <!-- endinject -->
+    <!-- Plugin css for this page -->
+    <!-- End Plugin css for this page -->
+    <!-- Layout styles -->
+    <link rel="stylesheet" href="/static/assets/css/dark/style.css" />
+    <!-- End Layout styles -->
+    <link
+      rel="shortcut icon"
+      type="image/svg+xml"
+      href="/static/assets/images/logo_small.svg"
+    />
+    <link rel="alternate icon" href="/static/assets/images/favicon.png" />
+  </head>
+  <style>
+    .auth.auth-bg-1 {
+      background: url("../../static/assets/images/auth/{% raw data['background'] %}"),
+        url("/static/assets/images/auth/login_1.jpg");
+      background-size: cover;
+    }
+  </style>
 
-
-  <!-- endinject -->
-  <!-- Plugin css for this page -->
-  <!-- End Plugin css for this page -->
-  <!-- Layout styles -->
-  <link rel="stylesheet" href="/static/assets/css/dark/style.css">
-  <!-- End Layout styles -->
-  <link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
-  <link rel="alternate icon" href="/static/assets/images/favicon.png" />
-</head>
-<style>
-  .auth.auth-bg-1 {
-    background: url("../../static/assets/images/auth/{% raw data['background'] %}"),
-    url("/static/assets/images/auth/login_1.jpg");
-    background-size: cover;
-  }
-</style>
-
-<body class="dark-theme">
-  <div class="container-scroller">
-    <div class="container-fluid page-body-wrapper full-page-wrapper">
-      <div class="content-wrapper d-flex align-items-center auth auth-bg-1 theme-one">
-        <div class="row w-100">
-          <div class="col-lg-4 mx-auto">
-
-            <div class="auto-form-wrapper">
-              <div class="text-center">
-                <img src="/static/assets/images/logo_long.svg"><br /><br />
-                <div class="col-sm-12 grid-margin stretch-card">
-                  <div class="card card-statistics social-card google-card card-colored">
-                    <div class="card-body">
-                      <h4 class="platform-name mb-3 mt-4 font-weight-semibold user-name">{{ translate('accessDenied',
-                        'accessDenied', data['lang']) }}</h4>
-                      <h5 class="headline font-weight-medium">{{ translate('accessDenied', 'noAccess', data['lang']) }}
-                      </h5>
-                      <p class="mb-2 comment font-weight-light">
-                        {{ translate('accessDenied', 'contactAdmin', data['lang']) }}<br /><br />
-                        <a class="d-inline font-weight-medium" href="https://discord.gg/9VJPhCE"> {{
-                          translate('accessDenied', 'contact', data['lang']) }}</a>
-                      </p>
+  <body class="dark-theme">
+    <div class="container-scroller">
+      <div class="container-fluid page-body-wrapper full-page-wrapper">
+        <div
+          class="content-wrapper d-flex align-items-center auth auth-bg-1 theme-one"
+        >
+          <div class="row w-100">
+            <div class="col-lg-4 mx-auto">
+              <div class="auto-form-wrapper">
+                <div class="text-center">
+                  <img src="/static/assets/images/logo_long.svg" /><br /><br />
+                  <div class="col-sm-12 grid-margin stretch-card">
+                    <div
+                      class="card card-statistics social-card google-card card-colored"
+                    >
+                      <div class="card-body">
+                        <h4
+                          class="platform-name mb-3 mt-4 font-weight-semibold user-name"
+                        >
+                          {{ translate('accessDenied', 'accessDenied',
+                          data['lang']) }}
+                        </h4>
+                        <h5 class="headline font-weight-medium">
+                          {{ translate('accessDenied', 'noAccess', data['lang'])
+                          }}
+                        </h5>
+                        <p class="mb-2 comment font-weight-light">
+                          {{ translate('accessDenied', 'contactAdmin',
+                          data['lang']) }}<br /><br />
+                          <a
+                            class="d-inline font-weight-medium"
+                            href="https://discord.gg/9VJPhCE"
+                          >
+                            {{ translate('accessDenied', 'contact',
+                            data['lang']) }}</a
+                          >
+                        </p>
+                      </div>
                     </div>
                   </div>
                 </div>
               </div>
-
-
             </div>
-
           </div>
         </div>
+        <!-- content-wrapper ends -->
       </div>
-      <!-- content-wrapper ends -->
+      <!-- page-body-wrapper ends -->
     </div>
-    <!-- page-body-wrapper ends -->
-  </div>
-  <!-- container-scroller -->
-  <!-- plugins:js -->
-  <script src="/static/assets/vendors/js/vendor.bundle.base.js"></script>
-  <!-- endinject -->
-  <!-- inject:js -->
-  <script src="/static/assets/js/shared/off-canvas.js"></script>
-  <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
-  <script src="/static/assets/js/shared/misc.js"></script>
-  <script src="/static/assets/js/shared/settings.js"></script>
-  <script src="/static/assets/js/shared/todolist.js"></script>
-  <!-- endinject -->
-  <script>
-    $(document).ready(function () {
-      let login_opacity_div = document.getElementById('login_opacity');
-      let opacity = login_opacity_div.getAttribute('data-value');
-      document.getElementById('login-form-background').style.background = 'rgb(34, 36, 55, ' + (opacity / 100) + ')';
-      //Register Service worker for mobile app
-      if ('serviceWorker' in navigator) {
-        navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', {scope: '/'})
-          .then(function (registration) {
-            console.error('Service Worker Registered');
-          });
-      }
-    });
-
-  </script>
-</body>
-
-</html>
\ No newline at end of file
+    <!-- container-scroller -->
+    <!-- plugins:js -->
+    <script src="/static/assets/vendors/js/vendor.bundle.base.js"></script>
+    <!-- endinject -->
+    <!-- inject:js -->
+    <script src="/static/assets/js/shared/off-canvas.js"></script>
+    <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
+    <script src="/static/assets/js/shared/misc.js"></script>
+    <script src="/static/assets/js/shared/settings.js"></script>
+    <script src="/static/assets/js/shared/todolist.js"></script>
+    <!-- endinject -->
+    <script>
+      $(document).ready(function () {
+        let login_opacity_div = document.getElementById("login_opacity");
+        let opacity = login_opacity_div.getAttribute("data-value");
+        document.getElementById("login-form-background").style.background =
+          "rgb(34, 36, 55, " + opacity / 100 + ")";
+        //Register Service worker for mobile app
+        if ("serviceWorker" in navigator) {
+          navigator.serviceWorker
+            .register("/static/assets/js/shared/service-worker.js", {
+              scope: "/",
+            })
+            .then(function (registration) {
+              console.log("Service Worker Registered");
+            });
+        }
+      });
+    </script>
+  </body>
+</html>
diff --git a/app/frontend/templates/public/login.html b/app/frontend/templates/public/login.html
index 971edca1..d4995f66 100644
--- a/app/frontend/templates/public/login.html
+++ b/app/frontend/templates/public/login.html
@@ -151,7 +151,7 @@
       if ('serviceWorker' in navigator) {
         navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', {scope: '/'})
           .then(function (registration) {
-            console.error('Service Worker Registered');
+            console.log('Service Worker Registered');
           });
       }
     });
diff --git a/app/frontend/templates/public_base.html b/app/frontend/templates/public_base.html
index 1629642c..45585f6f 100644
--- a/app/frontend/templates/public_base.html
+++ b/app/frontend/templates/public_base.html
@@ -1,136 +1,165 @@
 <!DOCTYPE html>
 <html lang="{{ data['lang_page'] }}" class="default">
+  <head>
+    <!-- Required meta tags -->
+    <meta charset="utf-8" />
+    <meta
+      name="viewport"
+      content="width=device-width, initial-scale=1, shrink-to-fit=no"
+    />
+    {% block meta %}{% end %}
+    <title>{% block title %}{{ _('Default') }}{% end %}</title>
+    <!-- plugins:css -->
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/mdi/css/materialdesignicons.min.css"
+    />
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/flag-icon-css/css/flag-icon.min.css"
+    />
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/ti-icons/css/themify-icons.css"
+    />
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/typicons/typicons.css"
+    />
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/css/vendor.bundle.base.css"
+    />
+    <link
+      rel="stylesheet"
+      href="/static/assets/vendors/fontawesome6/css/all.css"
+    />
+    <link rel="manifest" href="/static/assets/crafty.webmanifest" />
 
-<head>
-  <!-- Required meta tags -->
-  <meta charset="utf-8">
-  <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no">
-  {% block meta %}{% end %}
-  <title>{% block title %}{{ _('Default') }}{% end %}</title>
-  <!-- plugins:css -->
-  <link rel="stylesheet" href="/static/assets/vendors/mdi/css/materialdesignicons.min.css">
-  <link rel="stylesheet" href="/static/assets/vendors/flag-icon-css/css/flag-icon.min.css">
-  <link rel="stylesheet" href="/static/assets/vendors/ti-icons/css/themify-icons.css">
-  <link rel="stylesheet" href="/static/assets/vendors/typicons/typicons.css">
-  <link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css">
-  <link rel="stylesheet" href="/static/assets/vendors/fontawesome6/css/all.css">
-  <link rel="manifest" href="/static/assets/crafty.webmanifest">
+    <meta name="apple-mobile-web-app-capable" content="yes" />
+    <meta name="mobile-web-app-capable" content="yes" />
+    <meta name="apple-mobile-web-app-status-bar-style" content="black" />
+    <meta name="apple-mobile-web-app-title" content="Crafty" />
+    <link
+      rel="apple-touch-icon"
+      href="../static/assets/images/Crafty_4-0.png"
+    />
+    <!-- endinject -->
+    <!-- Plugin css for this page -->
+    <!-- End Plugin css for this page -->
+    <!-- Layout styles -->
+    <link rel="stylesheet" href="/static/assets/css/dark/style.css" />
+    <!-- End Layout styles -->
+    <link
+      rel="shortcut icon"
+      type="image/svg+xml"
+      href="/static/assets/images/logo_small.svg"
+    />
+    <link rel="alternate icon" href="/static/assets/images/favicon.png" />
+  </head>
 
-  <meta name="apple-mobile-web-app-capable" content="yes">
-  <meta name="mobile-web-app-capable" content="yes" />
-  <meta name="apple-mobile-web-app-status-bar-style" content="black">
-  <meta name="apple-mobile-web-app-title" content="Crafty">
-  <link rel="apple-touch-icon" href="../static/assets/images/Crafty_4-0.png">
-  <!-- endinject -->
-  <!-- Plugin css for this page -->
-  <!-- End Plugin css for this page -->
-  <!-- Layout styles -->
-  <link rel="stylesheet" href="/static/assets/css/dark/style.css">
-  <!-- End Layout styles -->
-  <link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg">
-  <link rel="alternate icon" href="/static/assets/images/favicon.png" />
-</head>
-
-<body>
-  <div class="container-scroller">
-    <div class="container-fluid page-body-wrapper full-page-wrapper">
-      <div class="content-wrapper d-flex align-items-sm-center auth auth-bg-1 theme-one">
-        <div class="mx-auto">
-          <div class="auto-form-wrapper">
-            {% block content %}
-            {% end %}
+  <body>
+    <div class="container-scroller">
+      <div class="container-fluid page-body-wrapper full-page-wrapper">
+        <div
+          class="content-wrapper d-flex align-items-sm-center auth auth-bg-1 theme-one"
+        >
+          <div class="mx-auto">
+            <div class="auto-form-wrapper">{% block content %} {% end %}</div>
           </div>
         </div>
+        <!-- content-wrapper ends -->
       </div>
-      <!-- content-wrapper ends -->
+      <!-- page-body-wrapper ends -->
     </div>
-    <!-- page-body-wrapper ends -->
-  </div>
-  <!-- container-scroller -->
-  <!-- plugins:js -->
-  <script src="/static/assets/vendors/js/vendor.bundle.base.js"></script>
-  <!-- endinject -->
-  <!-- inject:js -->
-  <script src="/static/assets/js/shared/off-canvas.js"></script>
-  <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
-  <script src="/static/assets/js/shared/misc.js"></script>
-  <!-- endinject -->
-  <script>
+    <!-- container-scroller -->
+    <!-- plugins:js -->
+    <script src="/static/assets/vendors/js/vendor.bundle.base.js"></script>
+    <!-- endinject -->
+    <!-- inject:js -->
+    <script src="/static/assets/js/shared/off-canvas.js"></script>
+    <script src="/static/assets/js/shared/hoverable-collapse.js"></script>
+    <script src="/static/assets/js/shared/misc.js"></script>
+    <!-- endinject -->
+    <script>
+      // {% if request.protocol == 'https' %}
+      let usingWebSockets = true;
 
-    // {% if request.protocol == 'https' %}
-    let usingWebSockets = true;
+      let listenEvents = [];
 
-    let listenEvents = [];
+      try {
+        pageQueryParams =
+          "page_query_params=" + encodeURIComponent(location.search);
+        page = "page=" + encodeURIComponent(location.pathname);
+        var wsInternal = new WebSocket(
+          "wss://" + location.host + "/ws?" + page + "&" + pageQueryParams
+        );
+        wsInternal.onopen = function () {
+          console.log("opened WebSocket connection:", wsInternal);
+        };
+        wsInternal.onmessage = function (rawMessage) {
+          var message = JSON.parse(rawMessage.data);
 
-    try {
-      pageQueryParams = 'page_query_params=' + encodeURIComponent(location.search)
-      page = 'page=' + encodeURIComponent(location.pathname)
-      var wsInternal = new WebSocket('wss://' + location.host + '/ws?' + page + '&' + pageQueryParams);
-      wsInternal.onopen = function () {
-        console.log('opened WebSocket connection:', wsInternal)
-      };
-      wsInternal.onmessage = function (rawMessage) {
-        var message = JSON.parse(rawMessage.data);
+          console.log("got message: ", message);
 
-        console.log('got message: ', message)
+          listenEvents
+            .filter((listenedEvent) => listenedEvent.event == message.event)
+            .forEach((listenedEvent) => listenedEvent.callback(message.data));
+        };
+        wsInternal.onerror = function (errorEvent) {
+          console.error("WebSocket Error", errorEvent);
+        };
+        wsInternal.onclose = function (closeEvent) {
+          console.log("Closed WebSocket", closeEvent);
+        };
 
-        listenEvents
-          .filter(listenedEvent => listenedEvent.event == message.event)
-          .forEach(listenedEvent => listenedEvent.callback(message.data))
-      };
-      wsInternal.onerror = function (errorEvent) {
-        console.error('WebSocket Error', errorEvent);
-      };
-      wsInternal.onclose = function (closeEvent) {
-        console.log('Closed WebSocket', closeEvent);
-      };
+        webSocket = {
+          on: function (event, callback) {
+            console.log("registered " + event + " event");
+            listenEvents.push({ event: event, callback: callback });
+          },
+          emit: function (event, data) {
+            var message = {
+              event: event,
+              data: data,
+            };
 
-
-      webSocket = {
-        on: function (event, callback) {
-          console.log('registered ' + event + ' event');
-          listenEvents.push({ event: event, callback: callback })
-        },
-        emit: function (event, data) {
-          var message = {
-            event: event,
-            data: data
-          }
-
-          wsInternal.send(JSON.stringify(message));
-        }
+            wsInternal.send(JSON.stringify(message));
+          },
+        };
+      } catch (error) {
+        console.error("Error while making websocket helpers", error);
+        usingWebSockets = false;
       }
-    } catch (error) {
-      console.error('Error while making websocket helpers', error);
+      // {% else %}
       usingWebSockets = false;
-    }
-    // {% else %}
-    usingWebSockets = false;
-    warn('WebSockets are not supported in Crafty if not using the https protocol')
-    var webSocket;
-// {% end%}
-
-  </script>
-  {% block js %}
-  <!-- Custom js for this page -->
-  <script>
-    $(document).ready(function () {
-      let login_opacity_div = document.getElementById('login_opacity');
-      let opacity = login_opacity_div.getAttribute('data-value');
-      document.getElementById('login-form-background').style.background = 'rgb(34, 36, 55, ' + (opacity / 100) + ')';
-      //Register Service worker for mobile app
-      if ('serviceWorker' in navigator) {
-        navigator.serviceWorker.register('/static/assets/js/shared/service-worker.js', {scope: '/'})
-          .then(function (registration) {
-            console.error('Service Worker Registered');
-          });
-      }
-    });
-
-  </script>
-  <!-- End custom js for this page -->
-  {% end %}
-
-</body>
-
-</html>
\ No newline at end of file
+      warn(
+        "WebSockets are not supported in Crafty if not using the https protocol"
+      );
+      var webSocket;
+      // {% end%}
+    </script>
+    {% block js %}
+    <!-- Custom js for this page -->
+    <script>
+      $(document).ready(function () {
+        let login_opacity_div = document.getElementById("login_opacity");
+        let opacity = login_opacity_div.getAttribute("data-value");
+        document.getElementById("login-form-background").style.background =
+          "rgb(34, 36, 55, " + opacity / 100 + ")";
+        //Register Service worker for mobile app
+        if ("serviceWorker" in navigator) {
+          navigator.serviceWorker
+            .register("/static/assets/js/shared/service-worker.js", {
+              scope: "/",
+            })
+            .then(function (registration) {
+              console.log("Service Worker Registered");
+            });
+        }
+      });
+    </script>
+    <!-- End custom js for this page -->
+    {% end %}
+  </body>
+</html>

From cd3bb238081cabb85d93f452f060527071f1e9b0 Mon Sep 17 00:00:00 2001
From: bobsfriend12 <calebsethherring+github@gmail.com>
Date: Wed, 5 Jul 2023 15:41:17 -0500
Subject: [PATCH 2/6] get rid of offline

---
 .../static/assets/js/shared/service-worker.js | 57 ++++++++++---------
 1 file changed, 29 insertions(+), 28 deletions(-)

diff --git a/app/frontend/static/assets/js/shared/service-worker.js b/app/frontend/static/assets/js/shared/service-worker.js
index f8073c39..4af0e00b 100644
--- a/app/frontend/static/assets/js/shared/service-worker.js
+++ b/app/frontend/static/assets/js/shared/service-worker.js
@@ -1,6 +1,8 @@
 // This is the "Offline page" service worker
 
-importScripts('https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js');
+importScripts(
+	"https://storage.googleapis.com/workbox-cdn/releases/5.1.2/workbox-sw.js"
+);
 
 const CACHE = "crafty-controller";
 
@@ -8,39 +10,38 @@ const CACHE = "crafty-controller";
 const offlineFallbackPage = "/offline";
 
 self.addEventListener("message", (event) => {
-  if (event.data && event.data.type === "SKIP_WAITING") {
-    self.skipWaiting();
-  }
+	if (event.data && event.data.type === "SKIP_WAITING") {
+		self.skipWaiting();
+	}
 });
 
-self.addEventListener('install', async (event) => {
-  event.waitUntil(
-    caches.open(CACHE)
-      .then((cache) => cache.add(offlineFallbackPage))
-  );
+self.addEventListener("install", async (event) => {
+	event.waitUntil(
+		caches.open(CACHE).then((cache) => cache.add(offlineFallbackPage))
+	);
 });
 
 if (workbox.navigationPreload.isSupported()) {
-  workbox.navigationPreload.enable();
+	workbox.navigationPreload.enable();
 }
 
-self.addEventListener('fetch', (event) => {
-  if (event.request.mode === 'navigate') {
-    event.respondWith((async () => {
-      try {
-        const preloadResp = await event.preloadResponse;
+// self.addEventListener('fetch', (event) => {
+//   if (event.request.mode === 'navigate') {
+//     event.respondWith((async () => {
+//       try {
+//         const preloadResp = await event.preloadResponse;
 
-        if (preloadResp) {
-          return preloadResp;
-        }
-        const networkResp = await fetch(event.request);
-        return networkResp;
-      } catch (error) {
+//         if (preloadResp) {
+//           return preloadResp;
+//         }
+//         const networkResp = await fetch(event.request);
+//         return networkResp;
+//       } catch (error) {
 
-        const cache = await caches.open(CACHE);
-        const cachedResp = await cache.match(offlineFallbackPage);
-        return cachedResp;
-      }
-    })());
-  }
-});
\ No newline at end of file
+//         const cache = await caches.open(CACHE);
+//         const cachedResp = await cache.match(offlineFallbackPage);
+//         return cachedResp;
+//       }
+//     })());
+//   }
+// });

From 86960b7c9fbde154cebc4e2b4905bea00f247479 Mon Sep 17 00:00:00 2001
From: bobsfriend12 <calebsethherring+github@gmail.com>
Date: Sat, 29 Jul 2023 16:01:29 -0500
Subject: [PATCH 3/6] fix lint issues

---
 app/frontend/templates/panel/denied.html | 5 ++++-
 app/frontend/templates/public_base.html  | 2 ++
 2 files changed, 6 insertions(+), 1 deletion(-)

diff --git a/app/frontend/templates/panel/denied.html b/app/frontend/templates/panel/denied.html
index 28afd7b0..23476af5 100644
--- a/app/frontend/templates/panel/denied.html
+++ b/app/frontend/templates/panel/denied.html
@@ -70,7 +70,10 @@
             <div class="col-lg-4 mx-auto">
               <div class="auto-form-wrapper">
                 <div class="text-center">
-                  <img src="/static/assets/images/logo_long.svg" /><br /><br />
+                  <img
+                    alt="Crafty Logo"
+                    src="/static/assets/images/logo_long.svg"
+                  /><br /><br />
                   <div class="col-sm-12 grid-margin stretch-card">
                     <div
                       class="card card-statistics social-card google-card card-colored"
diff --git a/app/frontend/templates/public_base.html b/app/frontend/templates/public_base.html
index 45585f6f..4aaae136 100644
--- a/app/frontend/templates/public_base.html
+++ b/app/frontend/templates/public_base.html
@@ -87,6 +87,8 @@
 
       let listenEvents = [];
 
+      let pageQueryParams, page;
+
       try {
         pageQueryParams =
           "page_query_params=" + encodeURIComponent(location.search);

From e76ba70d88038e8e5c46e22780eb076610baa0e9 Mon Sep 17 00:00:00 2001
From: bobsfriend12 <calebsethherring+github@gmail.com>
Date: Sat, 29 Jul 2023 16:05:27 -0500
Subject: [PATCH 4/6] get rid of cache

---
 app/frontend/static/assets/js/shared/service-worker.js | 6 ------
 1 file changed, 6 deletions(-)

diff --git a/app/frontend/static/assets/js/shared/service-worker.js b/app/frontend/static/assets/js/shared/service-worker.js
index 4af0e00b..2fdbf708 100644
--- a/app/frontend/static/assets/js/shared/service-worker.js
+++ b/app/frontend/static/assets/js/shared/service-worker.js
@@ -15,12 +15,6 @@ self.addEventListener("message", (event) => {
 	}
 });
 
-self.addEventListener("install", async (event) => {
-	event.waitUntil(
-		caches.open(CACHE).then((cache) => cache.add(offlineFallbackPage))
-	);
-});
-
 if (workbox.navigationPreload.isSupported()) {
 	workbox.navigationPreload.enable();
 }

From d60a0cf90806d67ffeb3d31533284052b9398eb9 Mon Sep 17 00:00:00 2001
From: bobsfriend12 <calebsethherring+github@gmail.com>
Date: Sat, 29 Jul 2023 16:16:09 -0500
Subject: [PATCH 5/6] decrease code density

---
 app/frontend/templates/panel/denied.html | 74 +++++-------------------
 1 file changed, 16 insertions(+), 58 deletions(-)

diff --git a/app/frontend/templates/panel/denied.html b/app/frontend/templates/panel/denied.html
index 23476af5..7107db16 100644
--- a/app/frontend/templates/panel/denied.html
+++ b/app/frontend/templates/panel/denied.html
@@ -3,41 +3,20 @@
   <head>
     <!-- Required meta tags -->
     <meta charset="utf-8" />
-    <meta
-      name="viewport"
-      content="width=device-width, initial-scale=1, shrink-to-fit=no"
-    />
+    <meta name="viewport" content="width=device-width, initial-scale=1, shrink-to-fit=no" />
     <title>Crafty Controller</title>
     <!-- plugins:css -->
-    <link
-      rel="stylesheet"
-      href="/static/assets/vendors/mdi/css/materialdesignicons.min.css"
-    />
-    <link
-      rel="stylesheet"
-      href="/static/assets/vendors/flag-icon-css/css/flag-icon.min.css"
-    />
-    <link
-      rel="stylesheet"
-      href="/static/assets/vendors/ti-icons/css/themify-icons.css"
-    />
-    <link
-      rel="stylesheet"
-      href="/static/assets/vendors/typicons/typicons.css"
-    />
-    <link
-      rel="stylesheet"
-      href="/static/assets/vendors/css/vendor.bundle.base.css"
-    />
+    <link rel="stylesheet" href="/static/assets/vendors/mdi/css/materialdesignicons.min.css" />
+    <link rel="stylesheet" href="/static/assets/vendors/flag-icon-css/css/flag-icon.min.css" />
+    <link rel="stylesheet" href="/static/assets/vendors/ti-icons/css/themify-icons.css" />
+    <link rel="stylesheet" href="/static/assets/vendors/typicons/typicons.css" />
+    <link rel="stylesheet" href="/static/assets/vendors/css/vendor.bundle.base.css" />
 
     <meta name="apple-mobile-web-app-capable" content="yes" />
     <meta name="mobile-web-app-capable" content="yes" />
     <meta name="apple-mobile-web-app-status-bar-style" content="black" />
     <meta name="apple-mobile-web-app-title" content="Crafty" />
-    <link
-      rel="apple-touch-icon"
-      href="../static/assets/images/Crafty_4-0.png"
-    />
+    <link rel="apple-touch-icon" href="../static/assets/images/Crafty_4-0.png" />
 
     <!-- endinject -->
     <!-- Plugin css for this page -->
@@ -45,11 +24,7 @@
     <!-- Layout styles -->
     <link rel="stylesheet" href="/static/assets/css/dark/style.css" />
     <!-- End Layout styles -->
-    <link
-      rel="shortcut icon"
-      type="image/svg+xml"
-      href="/static/assets/images/logo_small.svg"
-    />
+    <link rel="shortcut icon" type="image/svg+xml" href="/static/assets/images/logo_small.svg" />
     <link rel="alternate icon" href="/static/assets/images/favicon.png" />
   </head>
   <style>
@@ -63,42 +38,25 @@
   <body class="dark-theme">
     <div class="container-scroller">
       <div class="container-fluid page-body-wrapper full-page-wrapper">
-        <div
-          class="content-wrapper d-flex align-items-center auth auth-bg-1 theme-one"
-        >
+        <div class="content-wrapper d-flex align-items-center auth auth-bg-1 theme-one" >
           <div class="row w-100">
             <div class="col-lg-4 mx-auto">
               <div class="auto-form-wrapper">
                 <div class="text-center">
-                  <img
-                    alt="Crafty Logo"
-                    src="/static/assets/images/logo_long.svg"
-                  /><br /><br />
+                  <img alt="Crafty Logo" src="/static/assets/images/logo_long.svg" /><br /><br />
                   <div class="col-sm-12 grid-margin stretch-card">
-                    <div
-                      class="card card-statistics social-card google-card card-colored"
-                    >
+                    <div class="card card-statistics social-card google-card card-colored" >
                       <div class="card-body">
-                        <h4
-                          class="platform-name mb-3 mt-4 font-weight-semibold user-name"
-                        >
-                          {{ translate('accessDenied', 'accessDenied',
-                          data['lang']) }}
+                        <h4 class="platform-name mb-3 mt-4 font-weight-semibold user-name" >
+                          {{ translate('accessDenied', 'accessDenied', data['lang']) }}
                         </h4>
                         <h5 class="headline font-weight-medium">
-                          {{ translate('accessDenied', 'noAccess', data['lang'])
-                          }}
+                          {{ translate('accessDenied', 'noAccess', data['lang']) }}
                         </h5>
                         <p class="mb-2 comment font-weight-light">
                           {{ translate('accessDenied', 'contactAdmin',
-                          data['lang']) }}<br /><br />
-                          <a
-                            class="d-inline font-weight-medium"
-                            href="https://discord.gg/9VJPhCE"
-                          >
-                            {{ translate('accessDenied', 'contact',
-                            data['lang']) }}</a
-                          >
+                          data['lang']) }}<br /><br /> 
+                          <a class="d-inline font-weight-medium" href="https://discord.gg/9VJPhCE" > {{ translate('accessDenied', 'contact', data['lang']) }}</a>
                         </p>
                       </div>
                     </div>

From eec70dd894b08a24ec9273ae8a5d6c37a105ee4f Mon Sep 17 00:00:00 2001
From: Zedifus <zedifus@zediverse.gg>
Date: Sat, 2 Sep 2023 13:32:28 +0100
Subject: [PATCH 6/6] Update changelog !607

---
 CHANGELOG.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index 1caaa3d2..e42cbaab 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -3,7 +3,7 @@
 ### New features
 TBD
 ### Bug fixes
-TBD
+- PWA: Removed the custom offline page in favour of browser default ([Merge Request](https://gitlab.com/crafty-controller/crafty-4/-/merge_requests/607))
 ### Tweaks
 TBD
 ### Lang
