From c44de5e2d76225d8edd7467df1fac31305ce449b Mon Sep 17 00:00:00 2001
From: Fabio Manganiello <blacklight86@gmail.com>
Date: Sun, 19 Jan 2020 14:47:51 +0100
Subject: [PATCH] Grouped common CSS and JS includes into separate templates

---
 .../backend/http/templates/css-common.html      |  5 +++++
 platypush/backend/http/templates/dashboard.html | 13 ++-----------
 platypush/backend/http/templates/index.html     | 17 ++---------------
 platypush/backend/http/templates/js-common.html | 11 +++++++++++
 platypush/backend/http/templates/login.html     |  4 +---
 platypush/backend/http/templates/register.html  |  4 +---
 .../backend/http/templates/settings/index.html  | 11 ++---------
 7 files changed, 24 insertions(+), 41 deletions(-)
 create mode 100644 platypush/backend/http/templates/css-common.html
 create mode 100644 platypush/backend/http/templates/js-common.html

diff --git a/platypush/backend/http/templates/css-common.html b/platypush/backend/http/templates/css-common.html
new file mode 100644
index 00000000..cd882722
--- /dev/null
+++ b/platypush/backend/http/templates/css-common.html
@@ -0,0 +1,5 @@
+<link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato">
+<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/skeleton.css') }}">
+<link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/normalize.css') }}">
+<link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.0/css/all.css"
+      integrity="sha384-REHJTs1r2ErKBuJB0fCK99gCYsVjwxHrSU0N7I1zl9vZbggVJXRMsv/sLlOAGb4M" crossorigin="anonymous">
diff --git a/platypush/backend/http/templates/dashboard.html b/platypush/backend/http/templates/dashboard.html
index 0bb43bc3..60593546 100644
--- a/platypush/backend/http/templates/dashboard.html
+++ b/platypush/backend/http/templates/dashboard.html
@@ -3,20 +3,11 @@
     <title>Platypush Dashboard</title>
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <link rel="stylesheet" type="text/css" href="//fonts.googleapis.com/css?family=Lato">
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/skeleton.css') }}">
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/normalize.css') }}">
-    <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='font-awesome/css/all.css') }}">
+    {% include 'css-common.html' %}
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/dist/dashboard.css') }}">
     <link rel="stylesheet" type="text/css" href="{{ url_for('static', filename='css/dist/webpanel/plugins/assistant.google.css') }}">
 
-    <script type="text/javascript" src="{{ url_for('static', filename='js/lib/vue.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename='js/lib/vue.min.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename='js/lib/axios.min.js') }}"></script>
-
-    <script type="text/javascript" src="{{ url_for('static', filename='js/api.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename='js/events.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename='js/notifications.js') }}"></script>
+    {% include 'js-common.html' %}
 
     <script type="text/javascript" src="{{ url_for('static', filename='js/plugins/pushbullet/index.js') }}"></script>
     <script type="text/javascript" src="{{ url_for('static', filename='js/plugins/assistant.google/index.js') }}"></script>
diff --git a/platypush/backend/http/templates/index.html b/platypush/backend/http/templates/index.html
index a0e7d317..d7a7fce5 100644
--- a/platypush/backend/http/templates/index.html
+++ b/platypush/backend/http/templates/index.html
@@ -4,10 +4,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/skeleton.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/normalize.css') }}">
-    <link rel="stylesheet" href="https://use.fontawesome.com/releases/v5.12.0/css/all.css"
-          integrity="sha384-REHJTs1r2ErKBuJB0fCK99gCYsVjwxHrSU0N7I1zl9vZbggVJXRMsv/sLlOAGb4M" crossorigin="anonymous">
+    {% include 'css-common.html' %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/dist/webpanel.css') }}">
 
     <script type="text/javascript">
@@ -34,17 +31,7 @@
         {% endif %}
     </script>
 
-    {% if utils.isfile(static_folder, 'js', 'lib', 'vue.js') %}
-    <script type="text/javascript" src="{{ url_for('static', filename='js/lib/vue.js') }}"></script>
-    {% else %}
-    <script type="text/javascript" src="{{ url_for('static', filename='js/lib/vue.min.js') }}"></script>
-    {% endif %}
-
-    <script type="text/javascript" src="{{ url_for('static', filename='js/lib/axios.min.js') }}"></script>
-
-    <script type="text/javascript" src="{{ url_for('static', filename='js/api.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename='js/events.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename='js/notifications.js') }}"></script>
+    {% include 'js-common.html' %}
     <script type="text/javascript" src="{{ url_for('static', filename='js/autocomplete.js') }}"></script>
 
     {% for style in styles.values() %}
diff --git a/platypush/backend/http/templates/js-common.html b/platypush/backend/http/templates/js-common.html
new file mode 100644
index 00000000..1182782f
--- /dev/null
+++ b/platypush/backend/http/templates/js-common.html
@@ -0,0 +1,11 @@
+{% if utils.isfile(static_folder, 'js', 'lib', 'vue.js') %}
+<script type="text/javascript" src="{{ url_for('static', filename='js/lib/vue.js') }}"></script>
+{% else %}
+<script type="text/javascript" src="{{ url_for('static', filename='js/lib/vue.min.js') }}"></script>
+{% endif %}
+
+<script type="text/javascript" src="{{ url_for('static', filename='js/lib/axios.min.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='js/api.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='js/events.js') }}"></script>
+<script type="text/javascript" src="{{ url_for('static', filename='js/notifications.js') }}"></script>
+
diff --git a/platypush/backend/http/templates/login.html b/platypush/backend/http/templates/login.html
index 173a5b8c..42e177a9 100644
--- a/platypush/backend/http/templates/login.html
+++ b/platypush/backend/http/templates/login.html
@@ -2,9 +2,7 @@
 <head>
     <title>Platypush login page</title>
 
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/skeleton.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/normalize.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='font-awesome/css/all.css') }}">
+    {% include 'css-common.html' %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/dist/login.css') }}">
 </head>
 
diff --git a/platypush/backend/http/templates/register.html b/platypush/backend/http/templates/register.html
index 48dd4a5b..45f025be 100644
--- a/platypush/backend/http/templates/register.html
+++ b/platypush/backend/http/templates/register.html
@@ -2,9 +2,7 @@
 <head>
     <title>Platypush registration page</title>
 
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/skeleton.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/normalize.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='font-awesome/css/all.css') }}">
+    {% include 'css-common.html' %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/dist/login.css') }}">
 </head>
 
diff --git a/platypush/backend/http/templates/settings/index.html b/platypush/backend/http/templates/settings/index.html
index 486748f0..2f022f17 100644
--- a/platypush/backend/http/templates/settings/index.html
+++ b/platypush/backend/http/templates/settings/index.html
@@ -4,9 +4,7 @@
 
     <meta http-equiv="X-UA-Compatible" content="IE=edge">
 
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/skeleton.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='css/normalize.css') }}">
-    <link rel="stylesheet" href="{{ url_for('static', filename='font-awesome/css/all.css') }}">
+    {% include 'css-common.html' %}
     <link rel="stylesheet" href="{{ url_for('static', filename='css/dist/settings.css') }}">
 
     <script type="text/javascript">
@@ -21,12 +19,7 @@
         {% endif %}
     </script>
 
-    <script type="text/javascript" src="{{ url_for('static', filename='js/lib/vue.min.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename='js/lib/axios.min.js') }}"></script>
-
-    <script type="text/javascript" src="{{ url_for('static', filename='js/api.js') }}"></script>
-    <script type="text/javascript" src="{{ url_for('static', filename='js/notifications.js') }}"></script>
-
+    {% include 'js-common.html' %}
     {% include 'elements.html' %}
 </head>