Merge branch '483-caching-issues' into 'master'

Resolve "Caching issues"

Closes #483

See merge request !747

CHANGELOG.rst

@@ -27,6 +27,7 @@ Fixed
 * Fix page title bug on the impersonate page.
 * Users were able to edit the linked user if self-editing was activated.
 * Users weren't able to edit the allowed fields although they were configured correctly.
+* Provide `style.css` and icon files without any authentication to avoid caching issues.
 
 
 Removed

aleksis/core/migrations/0022_public_favicon.py

+# Generated by Django 3.2.4 on 2021-07-24 13:14
+import os
+
+from django.db import migrations, models
+import django.db.models.deletion
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('core', '0021_drop_persons_accounts_perm'),
+        ('favicon', '0004_faviconimg_favicon_size_rel_unique'),
+    ]
+
+    def _migrate_favicons(apps, schema_editor):
+        FaviconImg = apps.get_model('favicon', "FaviconImg")
+        for favicon_img in FaviconImg.objects.all():
+            old_name = favicon_img.faviconImage.name
+            new_name = os.path.join("public", old_name)
+            storage = favicon_img.faviconImage.storage
+            if storage.exists(old_name):
+                storage.save(new_name, favicon_img.faviconImage.file)
+                favicon_img.faviconImage.name = new_name
+                favicon_img.save()
+
+    operations = [
+        migrations.RunPython(_migrate_favicons)
+    ]

aleksis/core/settings.py

@@ -523,9 +523,8 @@ SASS_PROCESSOR_CUSTOM_FUNCTIONS = {
     "get-preference": "aleksis.core.util.sass_helpers.get_preference",
 }
 SASS_PROCESSOR_INCLUDE_DIRS = [
-    _settings.get("materialize.sass_path", JS_ROOT + "/materialize-css/sass/"),
-    STATIC_ROOT + "/materialize-css/sass/",
-    STATIC_ROOT,
+    _settings.get("materialize.sass_path", os.path.join(JS_ROOT, "materialize-css", "sass")),
+    os.path.join(STATIC_ROOT, "public"),
 ]
 
 ADMINS = _settings.get("contact.admins", [AUTH_INITIAL_SUPERUSER["email"]])
@@ -636,6 +635,7 @@ PWA_ICONS_CONFIG = {
     "apple_splash": [192],
     "microsoft": [144],
 }
+FAVICON_PATH = os.path.join("public", "favicon")
 
 SERVICE_WORKER_PATH = os.path.join(STATIC_ROOT, "js", "serviceworker.js")
 

aleksis/core/static/style.scss → aleksis/core/static/public/style.scss

-@import "materialize";
+@import "materialize-custom";
 
 .primary-color {
   background-color: $primary-color !important;

aleksis/core/templates/core/base.html

@@ -24,7 +24,7 @@
   {% include_css "Roboto500" %}
   {% include_css "Roboto700" %}
   {% include_css "Roboto900" %}
-  <link rel="stylesheet" href="{% sass_src 'style.scss' %}">
+  <link rel="stylesheet" href="{% sass_src 'public/style.scss' %}">
 
   {# Add JS URL resolver #}
   <script src="{% url "js_reverse" %}" type="text/javascript"></script>

aleksis/core/templates/core/base_print.html

@@ -22,7 +22,7 @@
   {% include_css "Roboto700" %}
   {% include_css "Roboto900" %}
   {% include_css "paper-css" %}
-  <link rel="stylesheet" href="{% sass_src 'style.scss' %}"/>
+  <link rel="stylesheet" href="{% sass_src 'public/style.scss' %}"/>
   <link rel="stylesheet" href="{% static "print.css" %}"/>
   {% if landscape %}
     <link rel="stylesheet" href="{% static 'print_landscape.css' %}"/>