Replace SCSS compilation with CSS variables (#4191)

* Replace SCSS compilation with CSS variables

* Update tests

* Update src/pretix/presale/style.py

Co-authored-by: Mira <weller@rami.io>

* Update src/pretix/presale/context.py

Co-authored-by: Mira <weller@rami.io>

* Update src/pretix/presale/views/widget.py

Co-authored-by: Mira <weller@rami.io>

* Update src/pretix/presale/context.py

Co-authored-by: Mira <weller@rami.io>

* Update src/pretix/static/pretixbase/scss/_variables.scss

Co-authored-by: Richard Schreiber <schreiber@rami.io>

* Last minor changes

* Rename file

---------

Co-authored-by: Mira <weller@rami.io>
Co-authored-by: Richard Schreiber <schreiber@rami.io>

src/tests/api/test_events.py

@@ -49,7 +49,6 @@ from pretix.base.models import (
     Event, InvoiceAddress, Order, OrderPosition, Organizer, SeatingPlan,
 )
 from pretix.base.models.orders import OrderFee
-from pretix.testutils.mock import mocker_context
 
 
 @pytest.fixture
@@ -1244,121 +1243,117 @@ def test_get_event_settings(token_client, organizer, event):
 
 @pytest.mark.django_db
 def test_patch_event_settings(token_client, organizer, event):
-    with mocker_context() as mocker:
-        mocked = mocker.patch('pretix.presale.style.regenerate_css.apply_async')
-        organizer.settings.imprint_url = 'https://example.org'
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
-            {
-                'imprint_url': 'https://example.com',
-                'confirm_texts': [
-                    {
-                        'de': 'Ich bin mit den AGB einverstanden.'
-                    }
-                ],
-                'reusable_media_active': True,  # readonly, ignored
-            },
-            format='json'
-        )
-        assert resp.status_code == 200
-        assert resp.data['imprint_url'] == "https://example.com"
-        assert not resp.data['reusable_media_active']
-        event.settings.flush()
-        assert event.settings.imprint_url == 'https://example.com'
-        assert not event.settings.reusable_media_active
-        assert event.all_logentries().filter(action_type="pretix.event.settings").count() == 1
-        mocked.assert_not_called()
+    organizer.settings.imprint_url = 'https://example.org'
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
+        {
+            'imprint_url': 'https://example.com',
+            'confirm_texts': [
+                {
+                    'de': 'Ich bin mit den AGB einverstanden.'
+                }
+            ],
+            'reusable_media_active': True,  # readonly, ignored
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    assert resp.data['imprint_url'] == "https://example.com"
+    assert not resp.data['reusable_media_active']
+    event.settings.flush()
+    assert event.settings.imprint_url == 'https://example.com'
+    assert not event.settings.reusable_media_active
+    assert event.all_logentries().filter(action_type="pretix.event.settings").count() == 1
 
-        # The same settings again do not create a new log entry
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
-            {
-                'imprint_url': 'https://example.com',
-                'confirm_texts': [
-                    {
-                        'de': 'Ich bin mit den AGB einverstanden.'
-                    }
-                ],
-                'reusable_media_active': True,  # readonly, ignored
-            },
-            format='json'
-        )
-        assert resp.status_code == 200
-        assert event.all_logentries().filter(action_type="pretix.event.settings").count() == 1
+    # The same settings again do not create a new log entry
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
+        {
+            'imprint_url': 'https://example.com',
+            'confirm_texts': [
+                {
+                    'de': 'Ich bin mit den AGB einverstanden.'
+                }
+            ],
+            'reusable_media_active': True,  # readonly, ignored
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    assert event.all_logentries().filter(action_type="pretix.event.settings").count() == 1
 
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
-            {
-                'primary_color': '#ff0000',
-                'theme_color_background': '#ff0000',
-            },
-            format='json'
-        )
-        assert resp.status_code == 200
-        event.settings.flush()
-        mocked.assert_any_call(args=(event.pk,))
-        assert event.settings.primary_color == '#ff0000'
-        assert event.all_logentries().filter(action_type="pretix.event.settings").count() == 2
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
+        {
+            'primary_color': '#ff0000',
+            'theme_color_background': '#ff0000',
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    event.settings.flush()
+    assert event.settings.primary_color == '#ff0000'
+    assert event.all_logentries().filter(action_type="pretix.event.settings").count() == 2
 
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
-            {
-                'primary_color': None,
-                'theme_color_background': None,
-            },
-            format='json'
-        )
-        assert resp.status_code == 200
-        event.settings.flush()
-        assert event.settings.primary_color != '#ff0000'
-        assert 'primary_color' not in event.settings._cache()
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
+        {
+            'primary_color': None,
+            'theme_color_background': None,
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    event.settings.flush()
+    assert event.settings.primary_color != '#ff0000'
+    assert 'primary_color' not in event.settings._cache()
 
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
-            {
-                'imprint_url': None,
-            },
-            format='json'
-        )
-        assert resp.status_code == 200
-        assert resp.data['imprint_url'] == "https://example.org"
-        event.settings.flush()
-        assert event.settings.imprint_url == 'https://example.org'
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
+        {
+            'imprint_url': None,
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    assert resp.data['imprint_url'] == "https://example.org"
+    event.settings.flush()
+    assert event.settings.imprint_url == 'https://example.org'
 
-        resp = token_client.put(
-            '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
-            {
-                'imprint_url': 'invalid'
-            },
-            format='json'
-        )
-        assert resp.status_code == 405
+    resp = token_client.put(
+        '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
+        {
+            'imprint_url': 'invalid'
+        },
+        format='json'
+    )
+    assert resp.status_code == 405
 
-        locales = event.settings.locales
+    locales = event.settings.locales
 
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
-            {
-                'locales': event.settings.locales + ['de', 'de-informal'],
-            },
-            format='json'
-        )
-        assert resp.status_code == 200
-        assert set(resp.data['locales']) == set(locales + ['de', 'de-informal'])
-        event.settings.flush()
-        assert set(event.settings.locales) == set(locales + ['de', 'de-informal'])
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
+        {
+            'locales': event.settings.locales + ['de', 'de-informal'],
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    assert set(resp.data['locales']) == set(locales + ['de', 'de-informal'])
+    event.settings.flush()
+    assert set(event.settings.locales) == set(locales + ['de', 'de-informal'])
 
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
-            {
-                'locales': locales,
-            },
-            format='json'
-        )
-        assert resp.status_code == 200
-        assert set(resp.data['locales']) == set(locales)
-        event.settings.flush()
-        assert set(event.settings.locales) == set(locales)
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/events/{}/settings/'.format(organizer.slug, event.slug),
+        {
+            'locales': locales,
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    assert set(resp.data['locales']) == set(locales)
+    event.settings.flush()
+    assert set(event.settings.locales) == set(locales)
 
 
 @pytest.mark.django_db

src/tests/api/test_organizers.py

@@ -23,8 +23,6 @@ import pytest
 from django.core.files.base import ContentFile
 from tests.const import SAMPLE_PNG
 
-from pretix.testutils.mock import mocker_context
-
 TEST_ORGANIZER_RES = {
     "name": "Dummy",
     "slug": "dummy",
@@ -69,62 +67,57 @@ def test_get_settings(token_client, organizer):
 
 @pytest.mark.django_db
 def test_patch_settings(token_client, organizer):
-    with mocker_context() as mocker:
-        mocked = mocker.patch('pretix.presale.style.regenerate_organizer_css.apply_async')
+    organizer.settings.event_list_type = 'week'
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/settings/'.format(organizer.slug),
+        {
+            'event_list_type': 'list'
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    assert resp.data['event_list_type'] == "list"
+    organizer.settings.flush()
+    assert organizer.settings.event_list_type == 'list'
 
-        organizer.settings.event_list_type = 'week'
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/settings/'.format(organizer.slug),
-            {
-                'event_list_type': 'list'
-            },
-            format='json'
-        )
-        assert resp.status_code == 200
-        assert resp.data['event_list_type'] == "list"
-        organizer.settings.flush()
-        assert organizer.settings.event_list_type == 'list'
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/settings/'.format(organizer.slug),
+        {
+            'event_list_type': None,
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
+    assert resp.data['event_list_type'] == "list"
+    organizer.settings.flush()
+    assert organizer.settings.event_list_type == 'list'
 
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/settings/'.format(organizer.slug),
-            {
-                'event_list_type': None,
-            },
-            format='json'
-        )
-        assert resp.status_code == 200
-        assert resp.data['event_list_type'] == "list"
-        organizer.settings.flush()
-        assert organizer.settings.event_list_type == 'list'
-        mocked.assert_not_called()
+    resp = token_client.put(
+        '/api/v1/organizers/{}/settings/'.format(organizer.slug),
+        {
+            'event_list_type': 'put-not-allowed'
+        },
+        format='json'
+    )
+    assert resp.status_code == 405
 
-        resp = token_client.put(
-            '/api/v1/organizers/{}/settings/'.format(organizer.slug),
-            {
-                'event_list_type': 'put-not-allowed'
-            },
-            format='json'
-        )
-        assert resp.status_code == 405
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/settings/'.format(organizer.slug),
+        {
+            'primary_color': 'invalid-color'
+        },
+        format='json'
+    )
+    assert resp.status_code == 400
 
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/settings/'.format(organizer.slug),
-            {
-                'primary_color': 'invalid-color'
-            },
-            format='json'
-        )
-        assert resp.status_code == 400
-
-        resp = token_client.patch(
-            '/api/v1/organizers/{}/settings/'.format(organizer.slug),
-            {
-                'primary_color': '#ff0000'
-            },
-            format='json'
-        )
-        assert resp.status_code == 200
-        mocked.assert_any_call(args=(organizer.pk,))
+    resp = token_client.patch(
+        '/api/v1/organizers/{}/settings/'.format(organizer.slug),
+        {
+            'primary_color': '#ff0000'
+        },
+        format='json'
+    )
+    assert resp.status_code == 200
 
 
 @pytest.mark.django_db

src/tests/control/test_events.py

@@ -47,7 +47,6 @@ from i18nfield.strings import LazyI18nString
 from tests.base import SoupTest, extract_form_fields
 
 from pretix.base.models import Event, LogEntry, Order, Organizer, Team, User
-from pretix.testutils.mock import mocker_context
 
 
 @pytest.fixture
@@ -476,18 +475,14 @@ class EventsTest(SoupTest):
         assert self.event1.settings.get('invoice_address_required', as_type=bool)
 
     def test_display_settings(self):
-        with mocker_context() as mocker:
-            mocked = mocker.patch('pretix.presale.style.regenerate_css.apply_async')
-
-            doc = self.get_doc('/control/event/%s/%s/settings/' % (self.orga1.slug, self.event1.slug))
-            data = extract_form_fields(doc.select("form")[0])
-            data['settings-primary_color'] = '#000000'
-            doc = self.post_doc('/control/event/%s/%s/settings/' % (self.orga1.slug, self.event1.slug),
-                                data, follow=True)
-            assert doc.select('.alert-success')
-            self.event1.settings.flush()
-            assert self.event1.settings.get('primary_color') == '#000000'
-            mocked.assert_any_call(args=(self.event1.pk,))
+        doc = self.get_doc('/control/event/%s/%s/settings/' % (self.orga1.slug, self.event1.slug))
+        data = extract_form_fields(doc.select("form")[0])
+        data['settings-primary_color'] = '#000000'
+        doc = self.post_doc('/control/event/%s/%s/settings/' % (self.orga1.slug, self.event1.slug),
+                            data, follow=True)
+        assert doc.select('.alert-success')
+        self.event1.settings.flush()
+        assert self.event1.settings.get('primary_color') == '#000000'
 
     def test_display_settings_do_not_override_parent(self):
         self.orga1.settings.primary_color = '#000000'

src/tests/control/test_organizer.py

@@ -81,13 +81,6 @@ class OrganizerTest(SoupTest):
         assert self.orga1.name == "CCC e.V."
 
     def test_organizer_display_settings(self):
-        called = False
-
-        def set_called(*args, **kwargs):
-            nonlocal called
-            called = True
-
-        self.monkeypatch.setattr("pretix.presale.style.regenerate_organizer_css.apply_async", set_called)
         assert not self.orga1.settings.presale_css_checksum
         doc = self.get_doc('/control/organizer/%s/edit' % (self.orga1.slug,))
         doc.select("[name=settings-primary_color]")[0]['value'] = "#33c33c"
@@ -99,7 +92,6 @@ class OrganizerTest(SoupTest):
             assert doc.select("[name=settings-primary_color]")[0]['value'] == "#33c33c"
         self.orga1.settings.flush()
         assert self.orga1.settings.primary_color == "#33c33c"
-        assert called
 
     def test_email_settings(self):
         doc = self.get_doc('/control/organizer/%s/settings/email' % self.orga1.slug)

src/tests/presale/test_style.py

@@ -20,15 +20,11 @@
 # <https://www.gnu.org/licenses/>.
 #
 import datetime
-import os.path
 
-from django.conf import settings
-from django.test import TestCase, override_settings
+from django.test import TestCase
 from django_scopes import scopes_disabled
 
 from pretix.base.models import Event, Organizer
-from pretix.multidomain.models import KnownDomain
-from pretix.presale.style import regenerate_css, regenerate_organizer_css
 
 
 class StyleTest(TestCase):
@@ -44,110 +40,19 @@ class StyleTest(TestCase):
 
     def test_organizer_generate_css_for_inherited_events(self):
         self.orga.settings.primary_color = "#33c33c"
-        regenerate_organizer_css.apply(args=(self.orga.pk,))
-        self.orga.settings.flush()
-        assert self.orga.settings.presale_css_file
-        with open(os.path.join(settings.MEDIA_ROOT, self.orga.settings.presale_css_file), 'r') as c:
-            assert '#33c33c' in c.read()
+        c = self.client.get("/ccc/theme.css").content.decode()
+        assert '#33c33c' in c
 
-        self.event.settings.flush()
-        assert self.event.settings.presale_css_file
-        with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
-            assert '#33c33c' in c.read()
+        c = self.client.get("/ccc/30c3/theme.css").content.decode()
+        assert '#33c33c' in c
 
     def test_organizer_generate_css_only_for_inherited_events(self):
         self.orga.settings.primary_color = "#33c33c"
         self.event.settings.primary_color = "#34c34c"
-        regenerate_organizer_css.apply(args=(self.orga.pk,))
-        self.orga.settings.flush()
-        assert self.orga.settings.presale_css_file
-        with open(os.path.join(settings.MEDIA_ROOT, self.orga.settings.presale_css_file), 'r') as c:
-            assert '#33c33c' in c.read()
 
-        self.event.settings.flush()
-        assert self.event.settings.presale_css_file
-        with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
-            assert '#34c34c' not in c.read()
-            assert '#33c33c' not in c.read()
+        c = self.client.get("/ccc/theme.css").content.decode()
+        assert '#33c33c' in c
 
-    def test_event_generate_css_individually(self):
-        self.orga.settings.primary_color = "#33c33c"
-        self.event.settings.primary_color = "#34c34c"
-        regenerate_css.apply(args=(self.event.pk,))
-
-        self.event.settings.flush()
-        assert self.event.settings.presale_css_file
-        with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
-            assert '#34c34c' in c.read()
-            assert '#33c33c' not in c.read()
-
-        regenerate_organizer_css.apply(args=(self.orga.pk,))
-
-        self.event.settings.flush()
-        assert self.event.settings.presale_css_file
-        with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
-            assert '#34c34c' in c.read()
-            assert '#33c33c' not in c.read()
-
-    def test_event_generate_css_new_file(self):
-        self.event.settings.primary_color = "#34c34c"
-        regenerate_css.apply(args=(self.event.pk,))
-
-        self.event.settings.flush()
-        fname = self.event.settings.presale_css_file
-
-        self.event.settings.primary_color = "#ff00ff"
-        regenerate_css.apply(args=(self.event.pk,))
-        self.event.settings.flush()
-        assert self.event.settings.presale_css_file != fname
-
-    def test_event_generate_css_cache_file(self):
-        self.event.settings.primary_color = "#34c34c"
-        regenerate_css.apply(args=(self.event.pk,))
-
-        self.event.settings.flush()
-        fname = self.event.settings.presale_css_file
-
-        self.event.settings.primary_color = "#34c34c"
-        regenerate_css.apply(args=(self.event.pk,))
-        self.event.settings.flush()
-        assert self.event.settings.presale_css_file == fname
-
-    @override_settings(
-        MEDIA_URL="https://usercontent.pretix.space/media/",
-        SITE_URL="https://pretix.eu"
-    )
-    def test_seperate_media_domain(self):
-        self.event.settings.primary_color = "#34c34c"
-        regenerate_css.apply(args=(self.event.pk,))
-        self.event.settings.flush()
-        with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
-            assert 'https://pretix.eu/static/' in c.read()
-
-    @override_settings(
-        MEDIA_URL="https://usercontent.pretix.space/media/",
-        SITE_URL="https://pretix.eu"
-    )
-    def test_seperate_media_domain_and_organizer_domain(self):
-        KnownDomain.objects.create(domainname="test.pretix.eu", organizer=self.orga)
-
-        self.event.settings.primary_color = "#34c34c"
-        regenerate_css.apply(args=(self.event.pk,))
-        self.event.settings.flush()
-        with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
-            assert 'https://test.pretix.eu/static/' in c.read()
-
-    @override_settings(
-        STATIC_URL="https://static.pretix.files/static/",
-        MEDIA_URL="https://usercontent.pretix.space/media/",
-        SITE_URL="https://pretix.eu"
-    )
-    def test_seperate_media_domain_and_static_domain(self):
-        KnownDomain.objects.create(domainname="test.pretix.eu", organizer=self.orga)
-
-        self.event.settings.primary_color = "#34c34c"
-        regenerate_css.apply(args=(self.event.pk,))
-        self.event.settings.flush()
-        with open(os.path.join(settings.MEDIA_ROOT, self.event.settings.presale_css_file), 'r') as c:
-            assert 'https://static.pretix.files/static/' in c.read()
-            assert 'https://test.pretix.eu/static/' not in c.read()
+        c = self.client.get("/ccc/30c3/theme.css").content.decode()
+        assert '#34c34c' in c
+        assert '#33c33c' not in c

src/tests/presale/test_widget.py

@@ -31,7 +31,6 @@ from django_scopes import scopes_disabled
 from freezegun import freeze_time
 
 from pretix.base.models import Order, OrderPosition
-from pretix.presale.style import regenerate_css, regenerate_organizer_css
 
 from .test_cart import CartTestMixin
 
@@ -544,23 +543,23 @@ class WidgetCartTest(CartTestMixin, TestCase):
     def test_css_customized(self):
         response = self.client.get('/%s/%s/widget/v1.css' % (self.orga.slug, self.event.slug))
         c = b"".join(response.streaming_content).decode()
-        assert '#7f5a91' in c
+        assert '#8E44B3' in c
         assert '#33c33c' not in c
         assert '#34c34c' not in c
 
         self.orga.settings.primary_color = "#33c33c"
-        regenerate_organizer_css.apply(args=(self.orga.pk,))
+        self.orga.cache.clear()
         response = self.client.get('/%s/%s/widget/v1.css' % (self.orga.slug, self.event.slug))
         c = b"".join(response.streaming_content).decode()
-        assert '#7f5a91' not in c
+        assert '#8E44B3' not in c
         assert '#33c33c' in c
         assert '#34c34c' not in c
 
         self.event.settings.primary_color = "#34c34c"
-        regenerate_css.apply(args=(self.event.pk,))
+        self.event.cache.clear()
         response = self.client.get('/%s/%s/widget/v1.css' % (self.orga.slug, self.event.slug))
         c = b"".join(response.streaming_content).decode()
-        assert '#7f5a91' not in c
+        assert '#8E44B3' not in c
         assert '#33c33c' not in c
         assert '#34c34c' in c