From be2bbe35cf49763ad0258c005f3cbdddd7a21d75 Mon Sep 17 00:00:00 2001
From: Gareth Coles <gdude2002@gmail.com>
Date: Wed, 13 Jun 2018 16:43:42 +0100
Subject: Compile as much JS with Gulp as possible

This will concatenate ALL of our JS, and minify it - thus leaving us with a single file to be loaded.

There's a few libraries we can't do this with, unfortunately - these are now added in fouc.js:

* Ace Editor
* Flatpickr
* Font-Awesome
---
 templates/errors/error.html                    |  4 +---
 templates/main/base.html                       |  9 +--------
 templates/main/jams/profile.html               |  5 -----
 templates/staff/jams/edit_ending.html          |  3 ---
 templates/staff/jams/edit_info.html            |  3 ---
 templates/staff/jams/forms/preamble_edit.html  |  3 ---
 templates/staff/jams/forms/questions_edit.html |  3 ---
 templates/staff/jams/forms/questions_view.html |  5 +----
 templates/staff/jams/forms/view.html           |  5 +----
 templates/staff/jams/index.html                |  5 +----
 templates/staff/jams/infractions/view.html     |  5 +----
 templates/staff/jams/participants.html         |  5 +----
 templates/staff/tables/edit.html               |  3 ---
 templates/wiki/base.html                       | 11 ++++-------
 templates/wiki/page_edit.html                  |  3 ---
 templates/wiki/revision_list.html              |  2 +-
 16 files changed, 12 insertions(+), 62 deletions(-)

(limited to 'templates')

diff --git a/templates/errors/error.html b/templates/errors/error.html
index 6132aea1..dbb7e3b4 100644
--- a/templates/errors/error.html
+++ b/templates/errors/error.html
@@ -9,10 +9,8 @@
         window._Code = {{ code }};
         window._ErrorMsg = "{{ error_message | safe }}";
         window._Path = "{{ request.path }}";
+        window.onload = error_typewriter;
     </script>
-
-    <script src="{{ static_file('js/typewriter.js') }}" type="application/javascript"></script>
-    <script src="{{ static_file('js/500.js') }}" type="application/javascript"></script>
 {% endblock %}
 
 {% block content %}
diff --git a/templates/main/base.html b/templates/main/base.html
index 9c58fefa..bb12fc9b 100644
--- a/templates/main/base.html
+++ b/templates/main/base.html
@@ -6,12 +6,7 @@
             <meta charset="UTF-8">
             <meta name="viewport" content="width=device-width, initial-scale=1">
 
-            <!-- Prevent Flash of Unstyled Content -->
-            <script src="{{ static_file('js/fouc.js') }}"></script>
-
-            <!-- Other JS loads -->
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-beta.39/js/uikit.min.js"></script>
-            <script src="https://cdn.jsdelivr.net/npm/flatpickr"></script>
+            <script src="{{ static_file('js/script.js') }}" type="application/javascript"></script>
 
             <!-- Stylesheets -->
             <link rel="shortcut icon" href="{{ static_file('favicon.ico') }}">
@@ -54,7 +49,5 @@
                 </div>
             </div>
         </footer>
-
-        <script src='{{ static_file('js/countdown.js') }}'></script>
     </body>
 </html>
diff --git a/templates/main/jams/profile.html b/templates/main/jams/profile.html
index 660f1540..40d22490 100644
--- a/templates/main/jams/profile.html
+++ b/templates/main/jams/profile.html
@@ -2,11 +2,6 @@
 {% block title %}Code Jams | My Profile{% endblock %}
 {% block og_title %}Code Jams | My Profile{% endblock %}
 
-{% block extra_head %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment.js/2.22.1/moment.min.js" type="application/javascript"></script>
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/moment-timezone/0.5.17/moment-timezone.min.js" type="application/javascript"></script>
-{% endblock %}
-
 {% block content %}
 <div class="uk-section">
     <div class="uk-container uk-container-small">
diff --git a/templates/staff/jams/edit_ending.html b/templates/staff/jams/edit_ending.html
index 82d46978..4e70776e 100644
--- a/templates/staff/jams/edit_ending.html
+++ b/templates/staff/jams/edit_ending.html
@@ -4,9 +4,6 @@
 {% block og_description %}Edit the ending comments for a code jam{% endblock %}
 
 {% block page_classes %}uses-rst{% endblock %}
-{% block extra_head %}
-<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="application/javascript"></script>
-{% endblock %}
 
 {% block content %}
     <div class="uk-container uk-container-small uk-section">
diff --git a/templates/staff/jams/edit_info.html b/templates/staff/jams/edit_info.html
index e7abeb54..471f7aaf 100644
--- a/templates/staff/jams/edit_info.html
+++ b/templates/staff/jams/edit_info.html
@@ -4,9 +4,6 @@
 {% block og_description %}Edit the basic info for a code jam{% endblock %}
 
 {% block page_classes %}uses-rst{% endblock %}
-{% block extra_head %}
-<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="application/javascript"></script>
-{% endblock %}
 
 {% block content %}
     <div class="uk-container uk-container-small uk-section">
diff --git a/templates/staff/jams/forms/preamble_edit.html b/templates/staff/jams/forms/preamble_edit.html
index 4108481b..c2245b35 100644
--- a/templates/staff/jams/forms/preamble_edit.html
+++ b/templates/staff/jams/forms/preamble_edit.html
@@ -3,9 +3,6 @@
 {% block og_title %}Staff | Forms | Edit Preamble{% endblock %}
 
 {% block page_classes %}uses-rst{% endblock %}
-{% block extra_head %}
-<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="application/javascript"></script>
-{% endblock %}
 
 {% block content %}
     <div class="uk-container uk-container-small uk-section">
diff --git a/templates/staff/jams/forms/questions_edit.html b/templates/staff/jams/forms/questions_edit.html
index d029cc33..d6fe082c 100644
--- a/templates/staff/jams/forms/questions_edit.html
+++ b/templates/staff/jams/forms/questions_edit.html
@@ -2,9 +2,6 @@
 {% block title %}Staff | Jams | Question Edit{% endblock %}
 {% block og_title %}Staff | Jams | Question Edit{% endblock %}
 {% block og_description %}Edit a question{% endblock %}
-{% block extra_head %}
-    <script src="{{ static_file('js/jams.js') }}"></script>
-{% endblock %}
 {% block content %}
     <div class="uk-container uk-container-small uk-section">
         <h1>Question Edit</h1>
diff --git a/templates/staff/jams/forms/questions_view.html b/templates/staff/jams/forms/questions_view.html
index bebdde40..f8eeea40 100644
--- a/templates/staff/jams/forms/questions_view.html
+++ b/templates/staff/jams/forms/questions_view.html
@@ -2,9 +2,6 @@
 {% block title %}Staff | Jams | Questions{% endblock %}
 {% block og_title %}Staff | Jams | Questions{% endblock %}
 {% block og_description %}Manage all created questions{% endblock %}
-{% block extra_head %}
-    <script src="{{ static_file('js/jams.js') }}"></script>
-{% endblock %}
 {% block content %}
     <div class="uk-container uk-container-small uk-section">
         <h1>Questions List</h1>
@@ -215,7 +212,7 @@
     <script type="application/javascript">
         "use strict";
 
-        const actions = new Actions("{{ url_for("staff.jams.action") }}", "{{ csrf_token() }}");
+        const actions = new JamActions("{{ url_for("staff.jams.action") }}", "{{ csrf_token() }}");
         const table_body = document.getElementById("table-body");
         const table = document.getElementById("table");
         const no_questions_paragraph = document.getElementById("no-questions-paragraph");
diff --git a/templates/staff/jams/forms/view.html b/templates/staff/jams/forms/view.html
index 83ff1ae4..49ea672d 100644
--- a/templates/staff/jams/forms/view.html
+++ b/templates/staff/jams/forms/view.html
@@ -2,9 +2,6 @@
 {% block title %}Staff | Jams | Form{% endblock %}
 {% block og_title %}Staff | Jams | Form{% endblock %}
 {% block og_description %}Manage the form for a code jam{% endblock %}
-{% block extra_head %}
-    <script src="{{ static_file('js/jams.js') }}"></script>
-{% endblock %}
 {% block content %}
     <div class="uk-container uk-container-small uk-section">
         <h1>Application Form {{ jam.number }}: {{ jam.title }}</h1>
@@ -243,7 +240,7 @@
 
     <script type="application/javascript">
         "use strict";
-        const actions = new Actions("{{ url_for("staff.jams.action") }}", "{{ csrf_token() }}");
+        const actions = new JamActions("{{ url_for("staff.jams.action") }}", "{{ csrf_token() }}");
         const form = parseInt("{{ jam.number }}");
         const table_body = document.getElementById("table-body");
         const table = document.getElementById("table");
diff --git a/templates/staff/jams/index.html b/templates/staff/jams/index.html
index 1d7beeb8..bb6a3c21 100644
--- a/templates/staff/jams/index.html
+++ b/templates/staff/jams/index.html
@@ -1,9 +1,6 @@
 {% extends "main/base.html" %}
 {% block title %}Staff | Code Jams{% endblock %}
 {% block og_title %}Staff | Code Jams{% endblock %}
-{% block extra_head %}
-    <script src="{{ static_file('js/jams.js') }}"></script>
-{% endblock %}
 {% block content %}
     <div class="uk-container uk-container-small uk-section">
         <h1>Code Jams</h1>
@@ -159,7 +156,7 @@
 
     <script type="application/javascript">
         "use strict";
-        const actions = new Actions("{{ url_for("staff.jams.action") }}", "{{ csrf_token() }}");
+        const actions = new JamActions("{{ url_for("staff.jams.action") }}", "{{ csrf_token() }}");
 
         // State modal objects
         const state_modal = UIkit.modal(document.getElementById("state-modal"));
diff --git a/templates/staff/jams/infractions/view.html b/templates/staff/jams/infractions/view.html
index 00374632..a4391c53 100644
--- a/templates/staff/jams/infractions/view.html
+++ b/templates/staff/jams/infractions/view.html
@@ -2,9 +2,6 @@
 {% block title %}Staff | Jams | Infractions{% endblock %}
 {% block og_title %}Staff | Jams | Infractions{% endblock %}
 {% block og_description %}Manage infractions{% endblock %}
-{% block extra_head %}
-    <script src="{{ static_file('js/jams.js') }}"></script>
-{% endblock %}
 {% block content %}
     <div class="uk-container uk-container-small uk-section">
         <h1>Infractions</h1>
@@ -125,7 +122,7 @@
 
     <script type="application/javascript">
         "use strict";
-        const actions = new Actions("{{ url_for("staff.jams.action") }}", "{{ csrf_token() }}");
+        const actions = new JamActions("{{ url_for("staff.jams.action") }}", "{{ csrf_token() }}");
 
         const table_body = document.getElementById("table-body");
         const table = document.getElementById("table");
diff --git a/templates/staff/jams/participants.html b/templates/staff/jams/participants.html
index 8dc9ce03..978088bb 100644
--- a/templates/staff/jams/participants.html
+++ b/templates/staff/jams/participants.html
@@ -2,9 +2,6 @@
 {% block title %}Staff | Jams | Participants{% endblock %}
 {% block og_title %}Staff | Jams | Participants{% endblock %}
 {% block og_description %}Listing of participant applications and their status{% endblock %}
-{% block extra_head %}
-    <script src="{{ static_file('js/jams.js') }}"></script>
-{% endblock %}
 {% block content %}
     {% macro card_header(app) %}
         <div>
@@ -78,7 +75,7 @@
     </div>
 
     <script>
-        const actions = new Actions("{{ url_for("staff.jams.action") }}", "{{ csrf_token() }}");
+        const actions = new JamActions("{{ url_for("staff.jams.action") }}", "{{ csrf_token() }}");
 
         for (let elem of document.getElementsByClassName("expand-button")) {
             elem.onclick = function(result, data) {
diff --git a/templates/staff/tables/edit.html b/templates/staff/tables/edit.html
index 0c6492e5..421f6c45 100644
--- a/templates/staff/tables/edit.html
+++ b/templates/staff/tables/edit.html
@@ -2,9 +2,6 @@
 {% block title %}Staff | Home{% endblock %}
 {% block og_title %}Staff | Home{% endblock %}
 {% block og_description %}Landing page for the staff management area{% endblock %}
-{% block extra_head %}
-<script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="application/javascript"></script>
-{% endblock %}
 {% block content %}
     <div class="uk-container uk-section uk-container-small">
         {% if message %}
diff --git a/templates/wiki/base.html b/templates/wiki/base.html
index f9aa251e..0e5e9733 100644
--- a/templates/wiki/base.html
+++ b/templates/wiki/base.html
@@ -6,11 +6,7 @@
             <meta charset="UTF-8">
             <meta name="viewport" content="width=device-width, initial-scale=1">
 
-            <!-- Prevent Flash of Unstyled Content -->
-            <script src="{{ static_file('js/fouc.js') }}"></script>
-
-            <!-- Other JS loads -->
-            <script src="https://cdnjs.cloudflare.com/ajax/libs/uikit/3.0.0-rc.4/js/uikit.min.js"></script>
+            <script src="{{ static_file('js/script.js') }}" type="application/javascript"></script>
 
             <!-- Static stuff -->
             <link rel="shortcut icon" href="{{ static_file('favicon.ico') }}">
@@ -216,7 +212,8 @@
             </div>
         </footer>
 
-        <script src='{{ static_file('js/countdown.js') }}'></script>
-        <script src='{{ static_file('js/wiki.js') }}'></script>
+    <script>
+        wiki_sidebar();
+    </script>
     </body>
 </html>
diff --git a/templates/wiki/page_edit.html b/templates/wiki/page_edit.html
index 69726d93..70f426e1 100644
--- a/templates/wiki/page_edit.html
+++ b/templates/wiki/page_edit.html
@@ -4,9 +4,6 @@
 {% block og_description %}{% endblock %}
 
 {% block page_classes %}uses-rst{% endblock %}
-{% block extra_head %}
-    <script src="https://cdnjs.cloudflare.com/ajax/libs/ace/1.3.3/ace.js" type="application/javascript"></script>
-{% endblock %}
 
 {% block content %}
     <form uk-grid class="uk-grid-small" action="{{ url_for("wiki.edit", page=page) }}" method="post">
diff --git a/templates/wiki/revision_list.html b/templates/wiki/revision_list.html
index a1936c32..cd6767db 100644
--- a/templates/wiki/revision_list.html
+++ b/templates/wiki/revision_list.html
@@ -31,6 +31,6 @@
     </div>
     <script>
         let revisions = {{ revisions | tojson }};
+        revision_diff(revisions);
     </script>
-    <script src="{{ static_file("js/revision_diff.js") }}"></script>
 {% endblock %}
-- 
cgit v1.2.3