From 65d40b7701dc3ec1e952aee4d5727ea58594ab2a Mon Sep 17 00:00:00 2001
From: Timo Wagner <kasimos@users.noreply.github.com>
Date: Thu, 6 Jun 2024 17:52:45 +0200
Subject: [PATCH] Improve useLocalAssets behaviour

---
 populateAssets.sh                 | 22 ++++++++++++++++++++++
 views/admin/dashboard.twig        |  3 ++-
 views/admin/editBundleSlides.twig |  3 ++-
 views/admin/editBundles.twig      |  3 ++-
 views/admin/editSlide.twig        |  6 +++++-
 views/admin/link.twig             |  6 +++++-
 views/admin/overview.twig         |  6 +++++-
 views/admin/video.twig            |  6 +++++-
 views/display.twig                |  6 +++++-
 views/displayWebGl.twig           |  6 +++++-
 views/index.twig                  |  6 +++++-
 views/liteDisplay.twig            |  7 ++++++-
 views/preview.twig                |  3 ++-
 13 files changed, 71 insertions(+), 12 deletions(-)
 create mode 100644 populateAssets.sh

diff --git a/populateAssets.sh b/populateAssets.sh
new file mode 100644
index 0000000..cd11825
--- /dev/null
+++ b/populateAssets.sh
@@ -0,0 +1,22 @@
+#!/bin/bash
+
+mkdir -p public/assets/
+mkdir -p public/assets/themes/default/assets/fonts/
+cd public/assets
+
+wget https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js -O socket.io.min.js
+wget https://cdnjs.cloudflare.com/ajax/libs/animate.css/3.7.0/animate.min.css -O animate.css
+wget https://cdnjs.cloudflare.com/ajax/libs/jquery/3.4.1/jquery.min.js -O jquery.min.js
+wget https://cdnjs.cloudflare.com/ajax/libs/jqueryui/1.12.1/jquery-ui.min.js -O jquery-ui.min.js
+wget https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.js -O semantic.min.js
+wget https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/semantic.min.css -O semantic.min.css
+wget https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/themes/default/assets/fonts/icons.woff2 -O themes/default/assets/fonts/icons.woff2
+wget https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/themes/default/assets/fonts/icons.woff -O themes/default/assets/fonts/icons.woff
+wget https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/themes/default/assets/fonts/outline-icons.woff2 -O themes/default/assets/fonts/outline-icons.woff2
+wget https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/themes/default/assets/fonts/outline-icons.woff -O themes/default/assets/fonts/outline-icons.woff
+wget https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/themes/default/assets/fonts/brand-icons.woff2 -O themes/default/assets/fonts/brand-icons.woff2
+wget https://cdnjs.cloudflare.com/ajax/libs/semantic-ui/2.4.1/themes/default/assets/fonts/brand-icons.woff -O themes/default/assets/fonts/brand-icons.woff
+wget https://cdnjs.cloudflare.com/ajax/libs/fabric.js/3.6.2/fabric.min.js -O fabric.min.js
+wget https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js -O webfont.js
+wget https://cdnjs.cloudflare.com/ajax/libs/flv.js/1.6.2/flv.min.js -O flv.min.js
+wget https://cdnjs.cloudflare.com/ajax/libs/jeditable.js/2.0.6/jquery.jeditable.min.js -O jquery.jeditable.min.js
\ No newline at end of file
diff --git a/views/admin/dashboard.twig b/views/admin/dashboard.twig
index acca670..708c3aa 100644
--- a/views/admin/dashboard.twig
+++ b/views/admin/dashboard.twig
@@ -1,11 +1,12 @@
 {% extends 'layout/admin.twig' %}
 
 {% block header %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
     <script src="/js/sharedScript.js"></script>
     {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
         <script src="/assets/jquery.jeditable.min.js"></script>
     {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jeditable.js/2.0.6/jquery.jeditable.min.js"></script>
     {% endif %}
 
diff --git a/views/admin/editBundleSlides.twig b/views/admin/editBundleSlides.twig
index d6fdc97..b734fcf 100644
--- a/views/admin/editBundleSlides.twig
+++ b/views/admin/editBundleSlides.twig
@@ -1,10 +1,11 @@
 {% extends 'layout/admin.twig' %}
 
 {% block header %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
     {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
         <script src="/assets/jquery.jeditable.min.js"></script>
     {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jeditable.js/2.0.6/jquery.jeditable.min.js"></script>
     {% endif %}
 {% endblock %}
diff --git a/views/admin/editBundles.twig b/views/admin/editBundles.twig
index 60c5439..47cef36 100644
--- a/views/admin/editBundles.twig
+++ b/views/admin/editBundles.twig
@@ -1,10 +1,11 @@
 {% extends 'layout/edit.twig' %}
 
 {% block header %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
     {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
         <script src="/assets/jquery.jeditable.min.js"></script>
     {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
         <script src="https://cdnjs.cloudflare.com/ajax/libs/jeditable.js/2.0.6/jquery.jeditable.min.js"></script>
     {% endif %}
     <style>
diff --git a/views/admin/editSlide.twig b/views/admin/editSlide.twig
index e65f2ae..4b8b052 100644
--- a/views/admin/editSlide.twig
+++ b/views/admin/editSlide.twig
@@ -2,7 +2,11 @@
 
 {% block header %}
 <script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js"></script>
-<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+{% if config.useLocalAssets %}
+	<script src="/assets/socket.io.min.js"></script>
+{% else %}
+	<script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+{% endif %}
 <script src="/js/sharedScript.js"></script>
 <script>
     var bundle = "{{ bundle }}";
diff --git a/views/admin/link.twig b/views/admin/link.twig
index 401932f..424b11f 100644
--- a/views/admin/link.twig
+++ b/views/admin/link.twig
@@ -1,7 +1,11 @@
 {% extends 'layout/edit.twig' %}
 
 {% block header %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
+    {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% endif %}
     <script>
         let bundle = "{{ bundle }}";
         let file = "{{ file }}";
diff --git a/views/admin/overview.twig b/views/admin/overview.twig
index 112dcd2..eedfbe9 100644
--- a/views/admin/overview.twig
+++ b/views/admin/overview.twig
@@ -1,7 +1,11 @@
 {% extends 'layout/admin.twig' %}
 
 {% block header %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
+    {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% endif %}
     <script>
        var socket = io("{{ config.serverUrl }}/admin");
     </script>
diff --git a/views/admin/video.twig b/views/admin/video.twig
index a826067..f1d1147 100644
--- a/views/admin/video.twig
+++ b/views/admin/video.twig
@@ -1,7 +1,11 @@
 {% extends 'layout/edit.twig' %}
 
 {% block header %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
+    {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% endif %}
     <script>
         let bundle = "{{ bundle }}";
         let file = "{{ file }}";
diff --git a/views/display.twig b/views/display.twig
index 6486c5e..e340643 100644
--- a/views/display.twig
+++ b/views/display.twig
@@ -7,7 +7,11 @@
             <script src="https://cdnjs.cloudflare.com/ajax/libs/flv.js/1.6.2/flv.min.js"></script>
         {% endif %}
     {% endif %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
+    {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% endif %}
     <script src="/js/flux.js" type="text/javascript" charset="utf-8"></script>
     <title>InfoScreen3 - {{ display.name }}</title>
 {% endblock %}
diff --git a/views/displayWebGl.twig b/views/displayWebGl.twig
index 87ac5a4..322446d 100644
--- a/views/displayWebGl.twig
+++ b/views/displayWebGl.twig
@@ -7,8 +7,12 @@
             <script src="https://cdnjs.cloudflare.com/ajax/libs/flv.js/1.6.2/flv.min.js"></script>
         {% endif %}
     {% endif %}
+    {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
+    {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% endif %}
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
     <script src="/js/three.js" type="text/javascript" charset="utf-8"></script>
     <script src="/js/gl-transitions.js" type="text/javascript" charset="utf-8"></script>
     <script src="/js/tween.js" type="text/javascript" charset="utf-8"></script>
diff --git a/views/index.twig b/views/index.twig
index 6e13eef..73f903d 100644
--- a/views/index.twig
+++ b/views/index.twig
@@ -1,7 +1,11 @@
 {% extends 'layout/view.twig' %}
 
 {% block header %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
+    {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% endif %}
 {% endblock %}
 
 {% block body %}
diff --git a/views/liteDisplay.twig b/views/liteDisplay.twig
index 6b3934d..b0e0673 100644
--- a/views/liteDisplay.twig
+++ b/views/liteDisplay.twig
@@ -9,7 +9,12 @@
         {% endif %}
     {% endif %}
 
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
+    {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
+    {% endif %}
+
     <title>InfoScreen3 - {{ display.name }}</title>
 {% endblock %}
 
diff --git a/views/preview.twig b/views/preview.twig
index fe8400a..95954a0 100644
--- a/views/preview.twig
+++ b/views/preview.twig
@@ -1,10 +1,11 @@
 {% extends 'layout/view.twig' %}
 
 {% block header %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
     {% if config.useLocalAssets %}
+        <script src="/assets/socket.io.min.js"></script>
         <script src="/assets/webfont.js"></script>
     {% else %}
+        <script src="https://cdnjs.cloudflare.com/ajax/libs/socket.io/4.6.0/socket.io.min.js"></script>
         <script src="https://ajax.googleapis.com/ajax/libs/webfont/1.6.26/webfont.js"></script>
     {% endif %}
 {% endblock %}