Merge pull request #766 from ae-utbm/alpine

Alpine

core/templates/core/base.jinja

@@ -27,6 +27,9 @@
 
       {% block additional_css %}{% endblock %}
       {% block additional_js %}{% endblock %}
+
+      {# Alpine JS must be loaded after scripts that use it. #}
+      <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
     {% endblock %}
   </head>
 

core/templates/core/user_detail.jinja

@@ -9,10 +9,6 @@
   {% trans user_name=profile.get_display_name() %}{{ user_name }}'s profile{% endtrans %}
 {% endblock %}
 
-{% block additional_js %}
-  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
-{% endblock %}
-
 {% block content %}
   <div class="user_profile_page" x-data>
     <div class="user_profile">

core/templates/core/user_pictures.jinja

@@ -10,7 +10,6 @@
     window.showSaveFilePicker = showSaveFilePicker; /* Export function to normal javascript */
   </script>
   <script defer type="text/javascript" src="{{ static('core/js/zipjs/zip-fs-full.min.js') }}"></script>
-  <script defer src="{{ static("core/js/alpinejs.min.js") }}"></script>
 {% endblock %}
 
 {% block title %}

counter/templates/counter/counter_click.jinja

@@ -7,7 +7,6 @@
 
 {% block additional_js %}
   <script src="{{ static('counter/js/counter_click.js') }}" defer></script>
-  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
 {% endblock %}
 
 {% block info_boxes %}

eboutic/templates/eboutic/eboutic_main.jinja

@@ -12,7 +12,6 @@
     {# This script contains the code to perform requests to manipulate the
     user basket without having to reload the page #}
   <script src="{{ static('eboutic/js/eboutic.js') }}"></script>
-  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
 {% endblock %}
 
 {% block additional_css %}

eboutic/templates/eboutic/eboutic_makecommand.jinja

@@ -10,7 +10,6 @@
 
 {% block additional_js %}
   <script src="{{ static('eboutic/js/makecommand.js') }}" defer></script>
-  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
 {% endblock %}
 
 {% block content %}

pedagogy/templates/pedagogy/guide.jinja

@@ -4,10 +4,6 @@
   {% trans %}UV Guide{% endtrans %}
 {% endblock %}
 
-{% block additional_js %}
-  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
-{% endblock %}
-
 {% block additional_css %}
   <link rel="stylesheet" href="{{ scss('pedagogy/css/pedagogy.scss') }}">
   <link rel="stylesheet" href="{{ scss('core/pagination.scss') }}">

sas/templates/sas/picture.jinja

@@ -4,10 +4,6 @@
   <link rel="stylesheet" href="{{ scss('sas/picture.scss') }}">
 {%- endblock -%}
 
-{%- block additional_js -%}
-  <script src="{{ static('core/js/alpinejs.min.js') }}" defer></script>
-{%- endblock -%}
-
 {% block head %}
   {{ super() }}
 

sith/settings.py

@@ -738,7 +738,7 @@ SITH_FRONT_DEP_VERSIONS = {
     "https://github.com/viralpatel/jquery.shorten/": "",
     "https://github.com/getsentry/sentry-javascript/": "4.0.6",
     "https://github.com/jhuckaby/webcamjs/": "1.0.0",
-    "https://github.com/alpinejs/alpine": "3.10.5",
+    "https://github.com/alpinejs/alpine": "3.14.1",
     "https://github.com/mrdoob/three.js/": "r148",
     "https://github.com/vasturiano/three-spritetext": "1.6.5",
     "https://github.com/vasturiano/3d-force-graph/": "1.70.19",