live coding session with @jbuget

gip-inclusion · Jun 20, 2023 · af2643d · af2643d
1 parent 92a9374
commit af2643d
Show file tree

Hide file tree

Showing 8 changed files with 14 additions and 24 deletions.
diff --git a/config/settings/base.py b/config/settings/base.py
@@ -354,13 +354,13 @@
 # CSP
 # ---------------------------------------
 CSP_DEFAULT_SRC = ("'self'",)
-CSP_STYLE_SRC = ("'self'", "https://fonts.googleapis.com")
+CSP_STYLE_SRC = ("'self'", "https://fonts.googleapis.com", "'unsafe-inline'")
 CSP_STYLE_SRC_ELEM = CSP_STYLE_SRC
 CSP_FONT_SRC = ("'self'", "https://fonts.gstatic.com/", "data:")
 CSP_SCRIPT_SRC = ("'self'", "https://cdn.jsdelivr.net", "https://tally.so")
 CSP_SCRIPT_SRC_ELEM = CSP_SCRIPT_SRC
 CSP_IMG_SRC = ("'self'", "data:")
-CSP_INCLUDE_NONCE_IN = ["script-src", "script-src-elem", "style-src", "style-src-elem"]
+CSP_INCLUDE_NONCE_IN = ["script-src", "script-src-elem"]
 
 # HSTS
 # ---------------------------------------

diff --git a/lacommunaute/static/vendor/htmx-1.8.4/htmx.min.js b/lacommunaute/static/vendor/htmx-1.8.4/htmx.min.js
diff --git a/lacommunaute/static/vendor/htmx-1.9.2/htmx.min.js b/lacommunaute/static/vendor/htmx-1.9.2/htmx.min.js
diff --git a/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html b/lacommunaute/templates/forum_conversation/partials/topic_detail_actions.html
@@ -18,18 +18,7 @@
 {% endif %}
 
 {% if posts_count > 1 %}
-    <a hx-get="{% url 'forum_conversation_extension:showmore_posts' topic.forum.slug topic.forum.pk topic.slug topic.pk %}"
-        id="showmoreposts-button{{topic.pk}}"
-        hx-target="#showmorepostsarea{{topic.pk}}"
-        hx-swap="outerHTML"
-        class="btn btn-secondary btn-sm btn-ico matomo-event justify-content-center w-100 w-sm-auto mr-sm-1 mb-2 mb-sm-0"
-        data-matomo-category="engagement"
-        data-matomo-action="showmore"
-        data-matomo-option="post"
-        onclick=DisabledMe("showmoreposts-button{{topic.pk}}")
-        aria-label="{% trans "Show me the comment" %}"
-        role="button"
-    >
+    <a hx-get="{% url 'forum_conversation_extension:showmore_posts' topic.forum.slug topic.forum.pk topic.slug topic.pk %}" id="showmoreposts-button{{topic.pk}}" hx-target="#showmorepostsarea{{topic.pk}}" hx-swap="outerHTML" class="btn btn-secondary btn-sm btn-ico matomo-event justify-content-center w-100 w-sm-auto mr-sm-1 mb-2 mb-sm-0 showmoreposts-button" data-matomo-category="engagement" data-matomo-action="showmore" data-matomo-option="post"  aria-label="{% trans " Show me the comment" %}" role="button">
         <i class="ri-eye-line font-weight-normal" aria-hidden="true"></i>
         <span>
             {% if posts_count > 2 %}
@@ -67,7 +56,8 @@
 
 
 <script nonce="{{ request.csp_nonce }}">
-    function DisabledMe(id) {
-        document.getElementById(id).classList.add('disabled');
-    }
+    var showmorepostsButtons = document.querySelectorAll('.showmoreposts-button')
+    showmorepostsButtons.forEach((button) => button.addEventListener('click', function () {
+        button.classList.add('disabled');
+    }));
 </script>
diff --git a/lacommunaute/templates/layouts/base.html b/lacommunaute/templates/layouts/base.html
@@ -158,7 +158,7 @@
             {% if COMMU_ENVIRONMENT == 'PROD' %}
                 <script type="text/javascript" src="{% static 'javascripts/matomo.js' %}" defer></script>
             {% endif %}
-            <script type="text/javascript" src="{% static 'vendor/htmx-1.8.4/htmx.min.js' %}" defer></script>
+            <script type="text/javascript" src="{% static 'vendor/htmx-1.9.2/htmx.min.js' %}"></script>
         {% endblock %}
     </body>
 </html>
diff --git a/poetry.lock b/poetry.lock
diff --git a/requirements/base.txt b/requirements/base.txt
@@ -13,7 +13,7 @@ django-js-asset==2.0.0 ; python_version >= "3.10" and python_version < "4.0"
 django-libsass==0.9 ; python_version >= "3.10" and python_version < "4.0"
 django-machina==1.3.0 ; python_version >= "3.10" and python_version < "4.0"
 django-mptt==0.14.0 ; python_version >= "3.10" and python_version < "4.0"
-django-permissions-policy==4.15.0 ; python_version >= "3.10" and python_version < "4.0"
+django-permissions-policy==4.16.0 ; python_version >= "3.10" and python_version < "4.0"
 django-social-share==2.3.0 ; python_version >= "3.10" and python_version < "4.0"
 django-storages==1.13.2 ; python_version >= "3.10" and python_version < "4.0"
 django-taggit==3.1.0 ; python_version >= "3.10" and python_version < "4.0"

diff --git a/requirements/dev.txt b/requirements/dev.txt
@@ -27,7 +27,7 @@ django-js-asset==2.0.0 ; python_version >= "3.10" and python_version < "4.0"
 django-libsass==0.9 ; python_version >= "3.10" and python_version < "4.0"
 django-machina==1.3.0 ; python_version >= "3.10" and python_version < "4.0"
 django-mptt==0.14.0 ; python_version >= "3.10" and python_version < "4.0"
-django-permissions-policy==4.15.0 ; python_version >= "3.10" and python_version < "4.0"
+django-permissions-policy==4.16.0 ; python_version >= "3.10" and python_version < "4.0"
 django-social-share==2.3.0 ; python_version >= "3.10" and python_version < "4.0"
 django-storages==1.13.2 ; python_version >= "3.10" and python_version < "4.0"
 django-taggit==3.1.0 ; python_version >= "3.10" and python_version < "4.0"