From e729ec48c8ad1ea501137b9dcbff1e1d9c5f2479 Mon Sep 17 00:00:00 2001
From: George Lacey <git@george.ooo>
Date: Fri, 21 May 2021 18:03:51 +0100
Subject: [PATCH] Remove versions numbers from js libraries

---
 borgweb/borg/static/{ => borg}/css/index.css         | 0
 borgweb/borg/static/{ => borg}/js/index.js           | 0
 borgweb/borg/templates/borg/base.html                | 2 +-
 borgweb/borg/templates/borg/index.html               | 4 ++--
 borgweb/borg/templates/borg/repo.html                | 3 +--
 borgweb/static/js/{chart-3.2.1.min.js => chart.js}   | 0
 borgweb/static/js/{jquery-3.6.0.min.js => jquery.js} | 0
 borgweb/templates/registration/login.html            | 4 +---
 8 files changed, 5 insertions(+), 8 deletions(-)
 rename borgweb/borg/static/{ => borg}/css/index.css (100%)
 rename borgweb/borg/static/{ => borg}/js/index.js (100%)
 rename borgweb/static/js/{chart-3.2.1.min.js => chart.js} (100%)
 rename borgweb/static/js/{jquery-3.6.0.min.js => jquery.js} (100%)

diff --git a/borgweb/borg/static/css/index.css b/borgweb/borg/static/borg/css/index.css
similarity index 100%
rename from borgweb/borg/static/css/index.css
rename to borgweb/borg/static/borg/css/index.css
diff --git a/borgweb/borg/static/js/index.js b/borgweb/borg/static/borg/js/index.js
similarity index 100%
rename from borgweb/borg/static/js/index.js
rename to borgweb/borg/static/borg/js/index.js
diff --git a/borgweb/borg/templates/borg/base.html b/borgweb/borg/templates/borg/base.html
index 1b30ab6..5e9d008 100644
--- a/borgweb/borg/templates/borg/base.html
+++ b/borgweb/borg/templates/borg/base.html
@@ -12,7 +12,7 @@
     <link type="text/x-scss" href="{% static 'theme.scss' %}" rel="stylesheet" media="screen">
     {% endcompress %}
 
-    <script src="{% static 'js/jquery-3.6.0.min.js' %}"></script>
+    <script src="{% static 'js/jquery.js' %}"></script>
     {% block script %}{% endblock %}
 
     <style>{% block style %}{% endblock %}</style>
diff --git a/borgweb/borg/templates/borg/index.html b/borgweb/borg/templates/borg/index.html
index f3a00bf..d2150c2 100644
--- a/borgweb/borg/templates/borg/index.html
+++ b/borgweb/borg/templates/borg/index.html
@@ -4,9 +4,9 @@
 
 {% block title %}Borg Summary{% endblock %}
 {% block script %}
-    <script src="{% static 'js/chart-3.2.1.min.js' %}"></script>
+    <script src="{% static 'js/chart.js' %}"></script>
     {{ hour_list|json_script:"hour_list" }}
-    <script src="{% static 'js/index.js' %}"></script>
+    <script src="{% static 'borg/js/index.js' %}"></script>
 {% endblock %}
 
 {% block style %}
diff --git a/borgweb/borg/templates/borg/repo.html b/borgweb/borg/templates/borg/repo.html
index 92c7dde..a125559 100644
--- a/borgweb/borg/templates/borg/repo.html
+++ b/borgweb/borg/templates/borg/repo.html
@@ -4,9 +4,8 @@
 {% load static %}
 {% block script %}
     {{block.super}}
-    <script src="{% static 'js/chart-3.2.1.min.js' %}"></script>
+    <script src="{% static 'js/chart.js' %}"></script>
     {{ hour_list|json_script:"hour_list" }}
-{#    <script src="{% static 'js/index.js' %}"></script>#}
 {% endblock %}
 
 {% block style %}
diff --git a/borgweb/static/js/chart-3.2.1.min.js b/borgweb/static/js/chart.js
similarity index 100%
rename from borgweb/static/js/chart-3.2.1.min.js
rename to borgweb/static/js/chart.js
diff --git a/borgweb/static/js/jquery-3.6.0.min.js b/borgweb/static/js/jquery.js
similarity index 100%
rename from borgweb/static/js/jquery-3.6.0.min.js
rename to borgweb/static/js/jquery.js
diff --git a/borgweb/templates/registration/login.html b/borgweb/templates/registration/login.html
index d12e139..4942894 100644
--- a/borgweb/templates/registration/login.html
+++ b/borgweb/templates/registration/login.html
@@ -4,9 +4,7 @@
 {% load static %}
 {% block script %}
     {{block.super}}
-    <script src="https://cdn.jsdelivr.net/npm/chart.js"></script>
-    {{ hour_list|json_script:"hour_list" }}
-    <script src="{% static 'js/index.js' %}"></script>
+    <script src="{% static 'js/chart.js' %}"></script>
 {% endblock %}
 
 {% block style %}