From db4c4a655e4de1a47255c6e418a028a57cdc9f74 Mon Sep 17 00:00:00 2001
From: Moe <github@m03.ca>
Date: Sat, 13 Aug 2022 19:49:59 -0700
Subject: [PATCH] move old core css dependencies, prepare for customAutoLoad
 assets

---
 .../css => assets/vendor}/daterangepicker.css      |   0
 .../vendor/font-awesome}/css/font-awesome.css      |   0
 .../vendor/font-awesome}/css/font-awesome.min.css  |   0
 .../vendor/font-awesome}/fonts/FontAwesome.otf     | Bin
 .../font-awesome}/fonts/fontawesome-webfont.eot    | Bin
 .../font-awesome}/fonts/fontawesome-webfont.svg    |   0
 .../font-awesome}/fonts/fontawesome-webfont.ttf    | Bin
 .../font-awesome}/fonts/fontawesome-webfont.woff   | Bin
 .../font-awesome}/fonts/fontawesome-webfont.woff2  | Bin
 .../css => assets/vendor}/fullcalendar.min.css     |   0
 .../css => assets/vendor}/gridstack-extra.min.css  |   0
 web/{libs/css => assets/vendor}/gridstack.min.css  |   0
 .../css => assets/vendor}/pnotify.custom.min.css   |   0
 web/{libs/css => assets/vendor}/vis.min.css        |   0
 web/pages/blocks/eventCounts.ejs                   |   1 -
 web/pages/blocks/header.ejs                        |  13 ++++++++-----
 web/pages/blocks/home/calendar.ejs                 |   2 +-
 web/pages/blocks/home/powerVideo.ejs               |   2 +-
 web/pages/blocks/loginTokenAddLDAP.ejs             |   6 +++---
 web/pages/dashcam.ejs                              |   3 ++-
 web/pages/factor.ejs                               |   2 +-
 web/pages/index.ejs                                |   2 +-
 web/pages/streamer.ejs                             |   2 +-
 web/pages/super.ejs                                |   7 +++++--
 24 files changed, 23 insertions(+), 17 deletions(-)
 rename web/{libs/css => assets/vendor}/daterangepicker.css (100%)
 rename web/{libs => assets/vendor/font-awesome}/css/font-awesome.css (100%)
 rename web/{libs => assets/vendor/font-awesome}/css/font-awesome.min.css (100%)
 rename web/{libs => assets/vendor/font-awesome}/fonts/FontAwesome.otf (100%)
 rename web/{libs => assets/vendor/font-awesome}/fonts/fontawesome-webfont.eot (100%)
 rename web/{libs => assets/vendor/font-awesome}/fonts/fontawesome-webfont.svg (100%)
 rename web/{libs => assets/vendor/font-awesome}/fonts/fontawesome-webfont.ttf (100%)
 rename web/{libs => assets/vendor/font-awesome}/fonts/fontawesome-webfont.woff (100%)
 rename web/{libs => assets/vendor/font-awesome}/fonts/fontawesome-webfont.woff2 (100%)
 rename web/{libs/css => assets/vendor}/fullcalendar.min.css (100%)
 rename web/{libs/css => assets/vendor}/gridstack-extra.min.css (100%)
 rename web/{libs/css => assets/vendor}/gridstack.min.css (100%)
 rename web/{libs/css => assets/vendor}/pnotify.custom.min.css (100%)
 rename web/{libs/css => assets/vendor}/vis.min.css (100%)

diff --git a/web/libs/css/daterangepicker.css b/web/assets/vendor/daterangepicker.css
similarity index 100%
rename from web/libs/css/daterangepicker.css
rename to web/assets/vendor/daterangepicker.css
diff --git a/web/libs/css/font-awesome.css b/web/assets/vendor/font-awesome/css/font-awesome.css
similarity index 100%
rename from web/libs/css/font-awesome.css
rename to web/assets/vendor/font-awesome/css/font-awesome.css
diff --git a/web/libs/css/font-awesome.min.css b/web/assets/vendor/font-awesome/css/font-awesome.min.css
similarity index 100%
rename from web/libs/css/font-awesome.min.css
rename to web/assets/vendor/font-awesome/css/font-awesome.min.css
diff --git a/web/libs/fonts/FontAwesome.otf b/web/assets/vendor/font-awesome/fonts/FontAwesome.otf
similarity index 100%
rename from web/libs/fonts/FontAwesome.otf
rename to web/assets/vendor/font-awesome/fonts/FontAwesome.otf
diff --git a/web/libs/fonts/fontawesome-webfont.eot b/web/assets/vendor/font-awesome/fonts/fontawesome-webfont.eot
similarity index 100%
rename from web/libs/fonts/fontawesome-webfont.eot
rename to web/assets/vendor/font-awesome/fonts/fontawesome-webfont.eot
diff --git a/web/libs/fonts/fontawesome-webfont.svg b/web/assets/vendor/font-awesome/fonts/fontawesome-webfont.svg
similarity index 100%
rename from web/libs/fonts/fontawesome-webfont.svg
rename to web/assets/vendor/font-awesome/fonts/fontawesome-webfont.svg
diff --git a/web/libs/fonts/fontawesome-webfont.ttf b/web/assets/vendor/font-awesome/fonts/fontawesome-webfont.ttf
similarity index 100%
rename from web/libs/fonts/fontawesome-webfont.ttf
rename to web/assets/vendor/font-awesome/fonts/fontawesome-webfont.ttf
diff --git a/web/libs/fonts/fontawesome-webfont.woff b/web/assets/vendor/font-awesome/fonts/fontawesome-webfont.woff
similarity index 100%
rename from web/libs/fonts/fontawesome-webfont.woff
rename to web/assets/vendor/font-awesome/fonts/fontawesome-webfont.woff
diff --git a/web/libs/fonts/fontawesome-webfont.woff2 b/web/assets/vendor/font-awesome/fonts/fontawesome-webfont.woff2
similarity index 100%
rename from web/libs/fonts/fontawesome-webfont.woff2
rename to web/assets/vendor/font-awesome/fonts/fontawesome-webfont.woff2
diff --git a/web/libs/css/fullcalendar.min.css b/web/assets/vendor/fullcalendar.min.css
similarity index 100%
rename from web/libs/css/fullcalendar.min.css
rename to web/assets/vendor/fullcalendar.min.css
diff --git a/web/libs/css/gridstack-extra.min.css b/web/assets/vendor/gridstack-extra.min.css
similarity index 100%
rename from web/libs/css/gridstack-extra.min.css
rename to web/assets/vendor/gridstack-extra.min.css
diff --git a/web/libs/css/gridstack.min.css b/web/assets/vendor/gridstack.min.css
similarity index 100%
rename from web/libs/css/gridstack.min.css
rename to web/assets/vendor/gridstack.min.css
diff --git a/web/libs/css/pnotify.custom.min.css b/web/assets/vendor/pnotify.custom.min.css
similarity index 100%
rename from web/libs/css/pnotify.custom.min.css
rename to web/assets/vendor/pnotify.custom.min.css
diff --git a/web/libs/css/vis.min.css b/web/assets/vendor/vis.min.css
similarity index 100%
rename from web/libs/css/vis.min.css
rename to web/assets/vendor/vis.min.css
diff --git a/web/pages/blocks/eventCounts.ejs b/web/pages/blocks/eventCounts.ejs
index 5f51cadc..b49894a2 100644
--- a/web/pages/blocks/eventCounts.ejs
+++ b/web/pages/blocks/eventCounts.ejs
@@ -39,5 +39,4 @@
     </div>
   </div>
 </div>
-<!-- <link rel="stylesheet" href="<%-window.libURL%>libs/css/dash2.eventCounts.css"> -->
 <script src="<%-window.libURL%>libs/js/dash2.eventCounts.js"></script>
diff --git a/web/pages/blocks/header.ejs b/web/pages/blocks/header.ejs
index 7c258238..f186f42c 100644
--- a/web/pages/blocks/header.ejs
+++ b/web/pages/blocks/header.ejs
@@ -22,14 +22,14 @@
     <meta name="msapplication-square150x150logo" content="libs/img/icon/mstile-150x150.png" />
     <meta name="msapplication-wide310x150logo" content="libs/img/icon/mstile-310x150.png" />
     <meta name="msapplication-square310x310logo" content="libs/img/icon/mstile-310x310.png" />
-    <link rel="stylesheet" href="<%-window.libURL%>libs/css/pnotify.custom.min.css">
+    <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/pnotify.custom.min.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/bootstrap5/css/bootstrap.min.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/bootstrap-table/bootstrap-table.min.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/bootstrap5-theme.css">
-    <link rel="stylesheet" href="<%-window.libURL%>libs/css/font-awesome.min.css">
-    <link rel="stylesheet" href="<%-window.libURL%>libs/css/daterangepicker.css">
-    <link rel="stylesheet" href="<%-window.libURL%>libs/css/gridstack.min.css">
-    <link rel="stylesheet" href="<%-window.libURL%>libs/css/gridstack-extra.min.css">
+    <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/font-awesome/font-awesome.min.css">
+    <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/daterangepicker.css">
+    <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/gridstack.min.css">
+    <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/gridstack-extra.min.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/clock.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/bs5.liveGrid.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/bs5.regionEditor.css">
@@ -71,6 +71,9 @@
     <% customAutoLoad.LibsCss.forEach(function(lib){ %>
         <link rel="stylesheet" href="<%-window.libURL%>libs/css/<%-lib%>">
     <% }) %>
+    <% customAutoLoad.AssetsCss.forEach(function(lib){ %>
+        <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/<%-lib%>">
+    <% }) %>
     <style id="theme">
         <% details.theme = details.theme || config.defaultTheme %>
         <% try{ %>
diff --git a/web/pages/blocks/home/calendar.ejs b/web/pages/blocks/home/calendar.ejs
index cdc04292..0b86c184 100644
--- a/web/pages/blocks/home/calendar.ejs
+++ b/web/pages/blocks/home/calendar.ejs
@@ -12,7 +12,7 @@
               drawBlock(theBlock)
           }) %>
     </div>
-    <link rel="stylesheet" href="<%-window.libURL%>libs/css/fullcalendar.min.css">
+    <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/fullcalendar.min.css">
     <script src="<%-window.libURL%>libs/js/fullcalendar.min.js"></script>
     <script src="<%-window.libURL%>assets/js/bs5.calendar.js"></script>
 </main>
diff --git a/web/pages/blocks/home/powerVideo.ejs b/web/pages/blocks/home/powerVideo.ejs
index d12e3189..88cf7ff7 100644
--- a/web/pages/blocks/home/powerVideo.ejs
+++ b/web/pages/blocks/home/powerVideo.ejs
@@ -12,7 +12,7 @@
               drawBlock(theBlock)
           }) %>
     </div>
-    <link rel="stylesheet" href="<%-window.libURL%>libs/css/vis.min.css">
+    <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/vis.min.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/bs5.powerVideo.css">
     <script src="<%-window.libURL%>assets/js/bs5.powerVideo.js"></script>
     <script src="<%-window.libURL%>libs/js/vis.min.js" async></script>
diff --git a/web/pages/blocks/loginTokenAddLDAP.ejs b/web/pages/blocks/loginTokenAddLDAP.ejs
index 71ff940d..80ee4f35 100644
--- a/web/pages/blocks/loginTokenAddLDAP.ejs
+++ b/web/pages/blocks/loginTokenAddLDAP.ejs
@@ -2,9 +2,9 @@
     details = $user.details
     window.libURL = originalURL + global.s.checkCorrectPathEnding(config.webPaths.home)
 %>
-<link rel="stylesheet" href="<%-window.libURL%>libs/css/bootstrap4.min.css" />
-<link rel="stylesheet" href="<%-window.libURL%>libs/css/dash2.basic.css">
-<link rel="stylesheet" href="<%-window.libURL%>libs/css/dash2.forms.css">
+<link rel="stylesheet" href="<%-window.libURL%>assets/vendor/bootstrap5/css/bootstrap.min.css">
+<link rel="stylesheet" href="<%-window.libURL%>assets/css/bootstrap5-theme.css">
+<link rel="stylesheet" href="<%-window.libURL%>assets/css/bs5.forms.css">
 <script src="<%-window.libURL%>libs/js/jquery.min.js"></script>
 <script src="<%-window.libURL%>libs/js/jquery.serialize.js"></script>
 <style>
diff --git a/web/pages/dashcam.ejs b/web/pages/dashcam.ejs
index ea63d107..711d38bd 100644
--- a/web/pages/dashcam.ejs
+++ b/web/pages/dashcam.ejs
@@ -1,6 +1,7 @@
 <% include blocks/header %>
 <script>var $user=<%- JSON.stringify($user) %>;</script>
-<link rel="stylesheet" href="<%-window.libURL%>libs/css/bootstrap.min.css">
+<link rel="stylesheet" href="<%-window.libURL%>assets/vendor/bootstrap5/css/bootstrap.min.css">
+<link rel="stylesheet" href="<%-window.libURL%>assets/css/bootstrap5-theme.css">
 <div id="main" class="container">
     <a class="btn btn-danger btn-lg" record>Stream</a>
     <div>
diff --git a/web/pages/factor.ejs b/web/pages/factor.ejs
index 5d5c3740..91203317 100644
--- a/web/pages/factor.ejs
+++ b/web/pages/factor.ejs
@@ -8,7 +8,7 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
     <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/bootstrap5/css/bootstrap.min.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/bootstrap5-theme.css">
-    <link rel="stylesheet" href="<%-window.libURL%>libs/css/font-awesome.min.css">
+    <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/font-awesome/font-awesome.min.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/login.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/gradients.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/bs5.darktheme.css">
diff --git a/web/pages/index.ejs b/web/pages/index.ejs
index a444e8a6..ab58eacc 100644
--- a/web/pages/index.ejs
+++ b/web/pages/index.ejs
@@ -12,7 +12,7 @@
 <meta http-equiv="X-UA-Compatible" content="IE=edge">
 <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/bootstrap5/css/bootstrap.min.css">
 <link rel="stylesheet" href="<%-window.libURL%>assets/css/bootstrap5-theme.css">
-<link rel="stylesheet" href="<%-window.libURL%>libs/css/font-awesome.min.css">
+<link rel="stylesheet" href="<%-window.libURL%>assets/vendor/font-awesome/font-awesome.min.css">
 <link rel="stylesheet" href="<%-window.libURL%>assets/css/login.css">
 <link rel="stylesheet" href="<%-window.libURL%>assets/css/gradients.css">
 <link rel="stylesheet" href="<%-window.libURL%>assets/css/bs5.darktheme.css">
diff --git a/web/pages/streamer.ejs b/web/pages/streamer.ejs
index f604833c..6b4d7ff8 100644
--- a/web/pages/streamer.ejs
+++ b/web/pages/streamer.ejs
@@ -1,6 +1,6 @@
 <% include blocks/header %>
 <script>var $user=<%- JSON.stringify($user) %>;</script>
-<link rel="stylesheet" href="<%-window.libURL%>libs/css/bootstrap.min.css">
+<link rel="stylesheet" href="<%-window.libURL%>assets/vendor/bootstrap5/css/bootstrap.min.css">
 <div id="main" class="container">
     <a class="btn btn-danger btn-lg" record>Stream</a>
     <div>
diff --git a/web/pages/super.ejs b/web/pages/super.ejs
index 46f509f7..12addc67 100644
--- a/web/pages/super.ejs
+++ b/web/pages/super.ejs
@@ -8,11 +8,11 @@
     <meta http-equiv="X-UA-Compatible" content="IE=edge,chrome=1" />
     <meta content='width=device-width, initial-scale=1.0, maximum-scale=1.0, user-scalable=0, shrink-to-fit=no' name='viewport' />
     <!--     Fonts and icons     -->
-    <link href="<%-window.libURL%>libs/css/font-awesome.min.css" rel="stylesheet" />
+    <link href="<%-window.libURL%>assets/vendor/font-awesome/font-awesome.min.css" rel="stylesheet" />
     <!-- CSS Files -->
     <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/bootstrap5/css/bootstrap.min.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/bootstrap5-theme.css">
-    <link rel="stylesheet" href="<%-window.libURL%>libs/css/pnotify.custom.min.css">
+    <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/pnotify.custom.min.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/bs5.forms.css">
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/gradients.css" />
     <link rel="stylesheet" href="<%-window.libURL%>assets/css/super-page.css" />
@@ -32,6 +32,9 @@
     <% customAutoLoad.superLibsCss.forEach(function(lib){ %>
         <link rel="stylesheet" href="<%-window.libURL%>libs/css/<%-lib%>">
     <% }) %>
+    <% customAutoLoad.superAssetsCss.forEach(function(lib){ %>
+        <link rel="stylesheet" href="<%-window.libURL%>assets/vendor/<%-lib%>">
+    <% }) %>
 </head>
 <script>$user=<%-JSON.stringify($user)%></script>