set browserslist

.gitignore

@@ -1,3 +1,4 @@
 .vscode
 .DS_Store
 *.swp
+scratch/

dnscms/associations/admin.py

@@ -0,0 +1,57 @@
+from django.utils.translation import gettext_lazy as _
+from wagtail.admin.ui.tables import Column, DateColumn
+from wagtail.admin.ui.tables.pages import PageStatusColumn, PageTitleColumn
+from wagtail.admin.viewsets.pages import PageListingViewSet, PageViewSet
+
+from associations.models import AssociationPage
+from dnscms.admin import ListingRedirectChooseParentView
+
+
+class AssociationTypeColumn(Column):
+    def get_value(self, instance):
+        return instance.get_association_type_display()
+
+
+class AssociationChooseParentView(ListingRedirectChooseParentView):
+    listing_url_name = "associations:index"
+
+
+class AssociationListingMixin:
+    """Shared model + columns for the standalone listing and the page explorer."""
+
+    model = AssociationPage
+    icon = "group"
+    columns = [
+        PageTitleColumn("title", label=_("Title"), sort_key="title", classname="title"),
+        AssociationTypeColumn(
+            "association_type",
+            label=_("Type"),
+            sort_key="association_type",
+            width="15%",
+        ),
+        DateColumn(
+            "latest_revision_created_at",
+            label=_("Updated"),
+            sort_key="latest_revision_created_at",
+            width="10%",
+        ),
+        PageStatusColumn("status", label=_("Status"), sort_key="live", width="10%"),
+    ]
+
+
+class AssociationSidebarViewSet(AssociationListingMixin, PageListingViewSet):
+    """Standalone 'Associations' sidebar entry, reached independently of the page tree."""
+
+    choose_parent_view_class = AssociationChooseParentView
+    menu_label = _("Associations")
+    menu_order = 2
+    add_to_admin_menu = True
+    ordering = "title"
+
+
+class AssociationExplorerViewSet(AssociationListingMixin, PageViewSet):
+    """Applies the same columns when navigating into AssociationIndex via the page explorer."""
+
+
+association_sidebar_viewset = AssociationSidebarViewSet("associations")
+association_explorer_viewset = AssociationExplorerViewSet()

dnscms/associations/migrations/0026_alter_association_options.py

@@ -0,0 +1,26 @@
+# Generated by Django 6.0.5 on 2026-05-19 19:36
+
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('associations', '0025_associationpage_lead'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='associationindex',
+            options={'verbose_name': 'association index', 'verbose_name_plural': 'association indexes'},
+        ),
+        migrations.AlterModelOptions(
+            name='associationpage',
+            options={'verbose_name': 'association', 'verbose_name_plural': 'associations'},
+        ),
+        migrations.AlterField(
+            model_name='associationpage',
+            name='association_type',
+            field=models.CharField(choices=[('forening', 'Association'), ('utvalg', 'Committee')], default='forening', max_length=64),
+        ),
+    ]

dnscms/associations/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.utils.translation import gettext_lazy as _
 from grapple.helpers import register_singular_query_field
 from grapple.models import (
     GraphQLImage,
@@ -8,15 +9,20 @@ from grapple.models import (
 )
 from wagtail.admin.panels import FieldPanel
 from wagtail.fields import RichTextField
-from wagtail.models import Page
+from wagtail.models import Page, PageManager
 from wagtail.search import index
+from wagtail_headless_preview.models import HeadlessMixin
 
 from dnscms.fields import CommonStreamField
-from dnscms.wordpress.models import WPImportedPageMixin
+from dnscms.wordpress.models import DeferWPFieldsManagerMixin, WPImportedPageMixin
+
+
+class AssociationPageManager(DeferWPFieldsManagerMixin, PageManager):
+    pass
 
 
 @register_singular_query_field("associationIndex")
-class AssociationIndex(Page):
+class AssociationIndex(HeadlessMixin, Page):
     max_count = 1
     subpage_types = ["associations.AssociationPage"]
 
@@ -25,8 +31,8 @@ class AssociationIndex(Page):
     body = CommonStreamField
 
     content_panels = Page.content_panels + [
-        FieldPanel("lead", heading="Ingress"),
+        FieldPanel("lead", heading=_("Lead")),
-        FieldPanel("body", heading="Innhold"),
+        FieldPanel("body", heading=_("Content")),
     ]
 
     graphql_fields = [
@@ -36,15 +42,21 @@ class AssociationIndex(Page):
 
     search_fields = Page.search_fields
 
+    class Meta:
+        verbose_name = _("association index")
+        verbose_name_plural = _("association indexes")
 
-class AssociationPage(WPImportedPageMixin, Page):
+
+class AssociationPage(HeadlessMixin, WPImportedPageMixin, Page):
     subpage_types = []
     parent_page_types = ["associations.AssociationIndex"]
     show_in_menus = False
 
+    objects = AssociationPageManager()
+
     class AssociationType(models.TextChoices):
-        FORENING = "forening", "Forening"
+        FORENING = "forening", _("Association")
-        UTVALG = "utvalg", "Utvalg"
+        UTVALG = "utvalg", _("Committee")
 
     excerpt = models.TextField(max_length=512, blank=False)
     lead = RichTextField(features=["italic", "link"], blank=True)
@@ -64,14 +76,14 @@ class AssociationPage(WPImportedPageMixin, Page):
     content_panels = Page.content_panels + [
         FieldPanel(
             "excerpt",
-            heading="Utdrag",
+            heading=_("Excerpt"),
-            help_text="En veldig kort oppsummering av innholdet nedenfor. Brukes i listevisninger.",
+            help_text=_("A very short summary of the content below. Used in listing views."),
         ),
-        FieldPanel("lead", heading="Ingress"),
+        FieldPanel("lead", heading=_("Lead")),
-        FieldPanel("body", heading="Innhold"),
+        FieldPanel("body", heading=_("Content")),
         FieldPanel("logo"),
-        FieldPanel("association_type", heading="Type"),
+        FieldPanel("association_type", heading=_("Type")),
-        FieldPanel("website_url", heading="Nettside"),
+        FieldPanel("website_url", heading=_("Website")),
     ]
 
     graphql_fields = [
@@ -88,32 +100,6 @@ class AssociationPage(WPImportedPageMixin, Page):
         index.SearchField("body"),
     ]
 
-    def import_wordpress_data(self, data):
+    class Meta:
-        import html
+        verbose_name = _("association")
-
+        verbose_name_plural = _("associations")
-        # Wagtail page model fields
-        self.title = html.unescape(data["title"])
-        self.slug = data["slug"]
-        self.first_published_at = data["first_published_at"]
-        self.last_published_at = data["last_published_at"]
-        self.latest_revision_created_at = data["latest_revision_created_at"]
-        self.search_description = data["search_description"]
-
-        # debug fields
-        self.wp_post_id = data["wp_post_id"]
-        self.wp_post_type = data["wp_post_type"]
-        self.wp_link = data["wp_link"]
-        self.wp_raw_content = data["wp_raw_content"]
-        self.wp_block_json = data["wp_block_json"]
-        self.wp_processed_content = data["wp_processed_content"]
-        self.wp_normalized_styles = data["wp_normalized_styles"]
-        self.wp_post_meta = data["wp_post_meta"]
-
-        # own model fields
-        self.body = data["body"] or ""
-
-        meta = data["wp_post_meta"]
-        self.association_type = meta.get("neuf_associations_type").lower()
-        self.website_url = meta.get("neuf_associations_homepage") or ""
-
-        self.excerpt = meta.get("excerpt_encoded") or "TODO"

dnscms/associations/views.py

@@ -1,12 +1,13 @@
+from django.utils.translation import gettext_lazy as _
 from wagtail.admin.viewsets.chooser import ChooserViewSet
 
 
 class AssociationChooserViewSet(ChooserViewSet):
     model = "associations.AssociationPage"
     icon = "group"
-    choose_one_text = "Choose an association"
+    choose_one_text = _("Choose an association")
-    choose_another_text = "Choose another association"
+    choose_another_text = _("Choose another association")
-    edit_item_text = "Edit this association"
+    edit_item_text = _("Edit this association")
     # form_fields = ["name"]
 
 

dnscms/associations/wagtail_hooks.py

@@ -1,8 +1,19 @@
 from wagtail import hooks
 
+from .admin import association_sidebar_viewset, association_explorer_viewset
 from .views import association_chooser_viewset
 
 
 @hooks.register("register_admin_viewset")
 def register_viewset():
     return association_chooser_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_association_sidebar_viewset():
+    return association_sidebar_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_association_explorer_viewset():
+    return association_explorer_viewset

dnscms/contacts/models.py

@@ -11,6 +11,7 @@ from wagtail.fields import RichTextField, StreamField
 from wagtail.models import Page
 from wagtail.search import index
 from wagtail.snippets.models import register_snippet
+from wagtail_headless_preview.models import HeadlessMixin
 
 from contacts.blocks import ContactSectionBlock
 from dnscms.blocks import BASE_BLOCKS
@@ -22,7 +23,7 @@ PHONE_REGEX_VALIDATOR = RegexValidator(
 
 
 @register_singular_query_field("contactIndex")
-class ContactIndex(Page):
+class ContactIndex(HeadlessMixin, Page):
     max_count = 1
     subpage_types = []
 

dnscms/dnscms/admin.py

@@ -0,0 +1,27 @@
+from urllib.parse import urlencode
+
+from django.urls import reverse
+from wagtail.admin.views.pages.choose_parent import ChooseParentView
+
+
+class ListingRedirectChooseParentView(ChooseParentView):
+    """ChooseParentView that redirects new pages back to a listing viewset.
+
+    Subclasses set ``listing_url_name`` (e.g. ``"events:index"``).
+    """
+
+    listing_url_name: str
+
+    def _with_next(self, response):
+        if response.status_code != 302:
+            return response
+        url = response["Location"]
+        sep = "&" if "?" in url else "?"
+        response["Location"] = f"{url}{sep}{urlencode({'next': reverse(self.listing_url_name)})}"
+        return response
+
+    def get(self, request, *args, **kwargs):
+        return self._with_next(super().get(request, *args, **kwargs))
+
+    def form_valid(self, form):
+        return self._with_next(super().form_valid(form))

dnscms/dnscms/apps.py

@@ -0,0 +1,8 @@
+from django.apps import AppConfig
+
+
+class DnsCmsConfig(AppConfig):
+    name = "dnscms"
+
+    def ready(self):
+        from dnscms import signals  # noqa: F401

dnscms/dnscms/settings/base.py

@@ -12,7 +12,6 @@ https://docs.djangoproject.com/en/4.2/ref/settings/
 
 # Build paths inside the project like this: os.path.join(BASE_DIR, ...)
 import os
-import re
 
 PROJECT_DIR = os.path.dirname(os.path.dirname(os.path.abspath(__file__)))
 BASE_DIR = os.path.dirname(PROJECT_DIR)
@@ -41,6 +40,7 @@ INSTALLED_APPS = [
     # end cms apps
     "grapple",
     "graphene_django",
+    "wagtail_headless_preview",
     "wagtail.contrib.forms",
     "wagtail.contrib.redirects",
     "wagtail.contrib.settings",
@@ -143,6 +143,8 @@ USE_L10N = True
 
 USE_TZ = True
 
+LOCALE_PATHS = [os.path.join(BASE_DIR, "locale")]
+
 
 # Static files (CSS, JavaScript, Images)
 # https://docs.djangoproject.com/en/4.2/howto/static-files/
@@ -171,9 +173,13 @@ MEDIA_URL = "/media/"
 # Wagtail settings
 
 WAGTAIL_SITE_NAME = "dnscms"
-WAGTAIL_ALLOW_UNICODE_SLUGS = False
+WAGTAIL_ALLOW_UNICODE_SLUGS = True
+# Headless: the Next.js frontend uses trailing-slash-free URLs, so strip
+# trailing slashes from links generated by Wagtail (e.g. the GraphQL `url` field).
+WAGTAIL_APPEND_SLASH = False
 
 WAGTAILIMAGES_IMAGE_MODEL = "images.CustomImage"
+WAGTAILIMAGES_EXTENSIONS = ["avif", "gif", "jpg", "jpeg", "png", "webp", "svg"]
 
 # Search
 # https://docs.wagtail.org/en/stable/topics/search/backends.html
@@ -184,11 +190,22 @@ WAGTAILSEARCH_BACKENDS = {
 }
 
 # Base URL to use when referring to full URLs within the Wagtail admin backend -
-# e.g. in notification emails. Don't include '/admin' or a trailing slash
+# e.g. in notification emails. Don't include '/admin' or a trailing slash.
-WAGTAILADMIN_BASE_URL = "http://example.com"
+# Also used by wagtail-grapple to make image URLs absolute.
+WAGTAIL_BASE_URL = os.environ.get("WAGTAIL_BASE_URL", "http://127.0.0.1:8000").rstrip("/")
+WAGTAILADMIN_BASE_URL = WAGTAIL_BASE_URL
+BASE_URL = WAGTAIL_BASE_URL
 
-# Required by wagtail-grapple to make image URLs absolute
+# Public URL of the Next.js frontend. Used to direct preview iframes and to
-BASE_URL = "http://example.com"
+# redirect "View Live" clicks on the CMS host over to the headless frontend.
+FRONTEND_BASE_URL = os.environ.get("FRONTEND_BASE_URL", "http://localhost:3000").rstrip("/")
+
+WAGTAIL_HEADLESS_PREVIEW = {
+    "CLIENT_URLS": {"default": f"{FRONTEND_BASE_URL}/api/preview"},
+    "SERVE_BASE_URL": FRONTEND_BASE_URL,
+    "ENFORCE_TRAILING_SLASH": False,
+    "REDIRECT_ON_PREVIEW": False,
+}
 
 # https://docs.wagtail.org/en/latest/releases/6.4.html#data-upload-max-number-fields-update
 DATA_UPLOAD_MAX_NUMBER_FIELDS = 10_000
@@ -213,74 +230,3 @@ GRAPPLE = {
     "PAGE_SIZE": 100,
     "MAX_PAGE_SIZE": 5000,
 }
-
-# Wgtail WordPress import
-WAGTAIL_WORDPRESS_IMPORTER_SOURCE_DOMAIN = "https://studentersamfundet.no/"
-WAGTAIL_WORDPRESS_IMPORTER_CONVERT_HTML_TAGS_TO_BLOCKS = {
-    # "h1": "wagtail_wordpress_import.block_builder_defaults.build_heading_block",
-    "table": "wagtail_wordpress_import.block_builder_defaults.build_table_block",
-    # "iframe": "wagtail_wordpress_import.block_builder_defaults.build_iframe_block",
-    # "form": "wagtail_wordpress_import.block_builder_defaults.build_form_block",
-    # "img": "wagtail_wordpress_import.block_builder_defaults.build_image_block",
-    # "blockquote": "wagtail_wordpress_import.block_builder_defaults.build_block_quote_block",
-}
-WAGTAIL_WORDPRESS_IMPORTER_FALLBACK_BLOCK = (
-    "dnscms.wordpress.block_builder.build_richtext_block_content"
-)
-WORDPRESS_IMPORT_HOOKS_ITEMS_TO_CACHE = {
-    "attachment": {
-        "DATA_TAG": "thumbnail_id",
-        "FUNCTION": "dnscms.wordpress.import_hooks.header_image_processor",
-    }
-}
-# WORDPRESS_IMPORT_HOOKS_TAGS_TO_CACHE = {
-#     "wp:term": {
-#         "DATA_TAG": "category",
-#         "FUNCTION": "dnscms.wordpress.import_hooks.categories_processor",
-#     }
-# }
-WAGTAIL_WORDPRESS_IMPORTER_PROMOTE_CHILD_TAGS = {
-    "TAGS_TO_PROMOTE": [],
-    "PARENTS_TO_REMOVE": ["p", "div", "span"],
-}
-WAGTAIL_WORDPRESS_IMPORT_PREFILTERS = [
-    {
-        "FUNCTION": "wagtail_wordpress_import.prefilters.linebreaks_wp",
-    },
-    {
-        "FUNCTION": "wagtail_wordpress_import.prefilters.transform_shortcodes",
-    },
-    {
-        "FUNCTION": "wagtail_wordpress_import.prefilters.transform_inline_styles",
-        "OPTIONS": {
-            "TRANSFORM_STYLES_MAPPING": [
-                (
-                    re.compile(r"font-style:italic;font-weight:bold;", re.IGNORECASE),
-                    "wagtail_wordpress_import.prefilters.transform_styles_defaults.transform_style_bold_italic",
-                ),
-                (
-                    re.compile(r"font-weight:bold;", re.IGNORECASE),
-                    "wagtail_wordpress_import.prefilters.transform_styles_defaults.transform_style_bold",
-                ),
-                (
-                    re.compile(r"font-style:italic;", re.IGNORECASE),
-                    "wagtail_wordpress_import.prefilters.transform_styles_defaults.transform_style_italic",
-                ),
-                # (
-                #     re.compile(
-                #         r"text-align:center;",
-                #         re.IGNORECASE,
-                #     ),
-                #     transform_style_center,
-                # ),
-                # (re.compile(r"text-align:left;", re.IGNORECASE), transform_style_left),
-                # (re.compile(r"text-align:right;", re.IGNORECASE), transform_style_right),
-                # (re.compile(r"float:left;", re.IGNORECASE), transform_float_left),
-                # (re.compile(r"float:right;", re.IGNORECASE), transform_float_right),
-            ],
-        },
-    },
-    {
-        "FUNCTION": "wagtail_wordpress_import.prefilters.bleach_clean",
-    },
-]

dnscms/dnscms/settings/dev.py

@@ -11,13 +11,6 @@ ALLOWED_HOSTS = ["*"]
 
 EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
-# Base URL to use when referring to full URLs within the Wagtail admin backend -
-# e.g. in notification emails. Don't include '/admin' or a trailing slash
-WAGTAILADMIN_BASE_URL = "http://127.0.0.1:8000"
-
-# Required by wagtail-grapple to make image URLs absolute
-BASE_URL = "http://127.0.0.1:8000"
-
 try:
     from .local import *
 except ImportError:

dnscms/dnscms/signals.py

@@ -0,0 +1,15 @@
+from django.db.models.signals import pre_save
+from django.dispatch import receiver
+from wagtail.models import Page
+
+from dnscms.utils import slugify
+
+SLUGGED_SNIPPETS = {"events.EventOrganizer", "events.EventCategory"}
+
+
+@receiver(pre_save)
+def normalize_slug(sender, instance, **kwargs):
+    label = f"{sender._meta.app_label}.{sender.__name__}"
+    if isinstance(instance, Page) or label in SLUGGED_SNIPPETS:
+        if getattr(instance, "slug", None):
+            instance.slug = slugify(instance.slug)

dnscms/dnscms/utils.py

@@ -0,0 +1,7 @@
+from django.utils.text import slugify as django_slugify
+
+NORWEGIAN_TRANSLITERATIONS = str.maketrans({"æ": "ae", "ø": "o", "å": "a"})
+
+
+def slugify(value: str) -> str:
+    return django_slugify(value.lower().translate(NORWEGIAN_TRANSLITERATIONS))

dnscms/dnscms/wagtail_hooks.py

@@ -1,13 +1,9 @@
-from django.contrib.admin.utils import quote
 from django.templatetags.static import static
-from django.urls import reverse
 from django.utils.html import format_html
+from grapple.registry import registry as grapple_registry
 from wagtail import hooks
-from wagtail.admin.menu import MenuItem
+from wagtail.models import Page
-
+from wagtail.search.backends import get_search_backend
-from associations.models import AssociationIndex
-from events.models import EventIndex
-from news.models import NewsIndex
 
 
 @hooks.register("register_rich_text_features")
@@ -15,31 +11,38 @@ def enable_additional_rich_text_features(features):
     features.default_features.extend(["h5", "h6", "blockquote"])
 
 
-@hooks.register("register_admin_menu_item")
+@hooks.register("register_schema_query")
-def register_events_menu_item():
+def override_search_resolver(query_mixins):
-    page = EventIndex.objects.first()
+    """
-    events_url = "#"
+    Override Grapple's `search` resolver. Two fixes vs. the upstream version:
-    if page:
+    1. Restrict pages to live + public so drafts and access-restricted pages
-        events_url = reverse("wagtailadmin_explore", args=(quote(page.pk),))
+       don't leak via the public API.
-    return MenuItem("Arrangementer", events_url, icon_name="date", order=1)
+    2. Run a single search across all `Page` subclasses (instead of iterating
+       per-model) so results are ranked by relevance across types rather than
+       grouped by content type. Specific instances are fetched in a second
+       bulk query and reordered to match the search ranking.
 
+    Documents and images are intentionally not searched. The upstream resolver
+    includes them, but the frontend search page only renders Page types and
+    discards everything else, so iterating those indexes is wasted work.
+    """
+    if not grapple_registry.class_models:
+        return
 
-@hooks.register("register_admin_menu_item")
+    class SearchOverrideMixin:
-def register_associations_menu_item():
+        def resolve_search(self, info, **kwargs):
-    page = AssociationIndex.objects.first()
+            query = kwargs.get("query")
-    associations_url = "#"
+            if not query:
-    if page:
+                return None
-        associations_url = reverse("wagtailadmin_explore", args=(quote(page.pk),))
+            s = get_search_backend()
-    return MenuItem("Foreninger", associations_url, icon_name="group", order=2)
+            ranked = list(s.search(query, Page.objects.live().public()))
+            if not ranked:
+                return []
+            ids = [p.id for p in ranked]
+            specific_map = {p.id: p for p in Page.objects.filter(id__in=ids).specific()}
+            return [specific_map[i] for i in ids if i in specific_map]
 
-
+    query_mixins.insert(0, SearchOverrideMixin)
-@hooks.register("register_admin_menu_item")
-def register_associations_menu_item():
-    page = NewsIndex.objects.first()
-    news_url = "#"
-    if page:
-        news_url = reverse("wagtailadmin_explore", args=(quote(page.pk),))
-    return MenuItem("Nyheter", news_url, icon_name="info-circle", order=3)
 
 
 @hooks.register("construct_page_action_menu")

dnscms/dnscms/wordpress/block_builder.py

@@ -1,24 +0,0 @@
-from django.conf import settings
-from wagtail_wordpress_import.block_builder_defaults import (
-    document_linker,
-    image_linker,
-    import_string,
-)
-
-
-def build_richtext_block_content(html, blocks):
-    """
-    image_linker is called to link up and retrive the remote image
-    document_linker is called to link up and retrive the remote documents
-    filters are called to replace inline shortcodes
-    """
-    html = image_linker(html)
-    html = document_linker(html)
-    for inline_shortcode_handler in getattr(
-        settings, "WAGTAIL_WORDPRESS_IMPORTER_INLINE_SHORTCODE_HANDLERS", []
-    ):
-        function = import_string(inline_shortcode_handler).construct_html_tag
-        html = function(html)
-    blocks.append({"type": "paragraph", "value": html})
-    html = ""
-    return html

dnscms/dnscms/wordpress/import_hooks.py

@@ -1,51 +0,0 @@
-from wagtail_wordpress_import.block_builder_defaults import get_or_save_image
-
-
-def header_image_processor(imported_pages, data_tag, items_cache):
-    """
-    imported_pages:
-        Is a specific() page model queryset of all imported pages.
-    data_tag:
-        Is the value of the `DATA_TAG` key from the configuration above.
-    items_cache:
-        Is a list of dictionaries, one for each item in the XML file.
-    """
-
-    # See note above about leading _ and : characters in the XML value
-    lookup = f"wp_post_meta__{data_tag}"
-
-    for attachment in items_cache:
-        # The id of the cached item used in the filter
-        thumbnail_id = attachment.get("wp:post_id")
-
-        # Filter the imported_pages for only pages that include the
-        # matching thumbnail_id in the wp_post_meta field
-        pages = imported_pages.filter(**{lookup: thumbnail_id})
-
-        if pages.exists():
-            # guid is the url of the image to fetch, the get_or_save_image()
-            # function will fetch the image if it doesn't exist
-            image_url = attachment.get("guid")
-            # fix cases where the /wp prefix is missing from the image url
-            if image_url.startswith("https://studentersamfundet.no/wp-content/uploads/"):
-                image_url = image_url.replace(
-                    "https://studentersamfundet.no/wp-content/uploads/",
-                    "https://studentersamfundet.no/wp/wp-content/uploads/",
-                )
-            try:
-                image = get_or_save_image(image_url)
-            except Exception as e:
-                print("Error with image", image_url, "associated with pages:", pages)
-                print(e)
-                continue
-
-            print("Attaching header images to pages:", pages)
-            try:
-                pages.update(featured_image=image)
-            except Exception:
-                pass
-
-            try:
-                pages.update(logo=image)
-            except Exception:
-                pass

dnscms/dnscms/wordpress/models.py

@@ -1,17 +1,84 @@
+from django.core.exceptions import FieldDoesNotExist
 from django.db import models
 from wagtail.models import Page
 
+# Field names declared by WPImportedPageMixin. Concrete models that mix it in
+# get a manager that .defer()s these so they're never loaded by default — the
+# columns stay in the database (no migration), and any code path that
+# explicitly reads them still works via Django's lazy-load.
+WP_IMPORT_FIELDS = (
+    "wp_post_id",
+    "wp_post_type",
+    "wp_link",
+    "wp_raw_content",
+    "wp_processed_content",
+    "wp_block_json",
+    "wp_normalized_styles",
+    "wp_post_meta",
+)
+
 
 # https://github.com/wagtail/wagtail-wordpress-import/blob/main/wagtail_wordpress_import/models.py
+# DJ001 (null=True on string fields) is suppressed: the schema mirrors the
+# upstream mixin and changing nullability would force a migration we avoid.
 class WPImportedPageMixin(Page):
     wp_post_id = models.IntegerField(blank=True, null=True)
-    wp_post_type = models.CharField(max_length=255, blank=True, null=True)
+    wp_post_type = models.CharField(max_length=255, blank=True, null=True)  # noqa: DJ001
-    wp_link = models.TextField(blank=True, null=True)
+    wp_link = models.TextField(blank=True, null=True)  # noqa: DJ001
-    wp_raw_content = models.TextField(blank=True, null=True)
+    wp_raw_content = models.TextField(blank=True, null=True)  # noqa: DJ001
-    wp_processed_content = models.TextField(blank=True, null=True)
+    wp_processed_content = models.TextField(blank=True, null=True)  # noqa: DJ001
-    wp_block_json = models.TextField(blank=True, null=True)
+    wp_block_json = models.TextField(blank=True, null=True)  # noqa: DJ001
-    wp_normalized_styles = models.TextField(blank=True, null=True)
+    wp_normalized_styles = models.TextField(blank=True, null=True)  # noqa: DJ001
     wp_post_meta = models.JSONField(blank=True, null=True)
 
     class Meta:
         abstract = True
+
+
+class DeferWPFieldsManagerMixin:
+    """
+    Manager mixin that always .defer()s the wp_* import columns, so they are
+    never SELECTed by default queries. The columns remain in the database;
+    accessing one on an instance still works (Django lazy-loads it).
+    """
+
+    def get_queryset(self):
+        return super().get_queryset().defer(*WP_IMPORT_FIELDS)
+
+
+def _resolve_related_model(model, lookup_path):
+    """Walk a ``foo__bar`` lookup path and return the final related model, or None."""
+    current = model
+    for part in lookup_path.split("__"):
+        try:
+            field = current._meta.get_field(part)
+        except FieldDoesNotExist:
+            return None
+        current = getattr(field, "related_model", None)
+        if current is None:
+            return None
+    return current
+
+
+class WPAwareQuerySet(models.QuerySet):
+    """
+    QuerySet whose ``select_related()`` auto-defers wp_* columns when a join
+    targets a WPImportedPageMixin model. Without this, ``select_related``
+    builds a JOIN that ignores the related model's manager and SELECTs every
+    column including the wp_* blobs. Apply via ``objects = WPAwareManager()``
+    on any model that has a ForeignKey into a WPImported page.
+    """
+
+    def select_related(self, *fields):
+        qs = super().select_related(*fields)
+        defers = [
+            f"{path}__{name}"
+            for path in fields
+            if (related := _resolve_related_model(qs.model, path)) is not None
+            and issubclass(related, WPImportedPageMixin)
+            for name in WP_IMPORT_FIELDS
+        ]
+        return qs.defer(*defers) if defers else qs
+
+
+WPAwareManager = models.Manager.from_queryset(WPAwareQuerySet)

dnscms/events/admin.py

@@ -0,0 +1,95 @@
+from django.utils import timezone
+from django.utils.translation import gettext, gettext_lazy as _
+from django.utils.translation import ngettext
+from wagtail.admin.ui.tables import Column, DateColumn
+from wagtail.admin.ui.tables.pages import PageStatusColumn, PageTitleColumn
+from wagtail.admin.views.pages.listing import ExplorableIndexView, IndexView
+from wagtail.admin.viewsets.pages import PageListingViewSet, PageViewSet
+
+from dnscms.admin import ListingRedirectChooseParentView
+from events.models import EventPage
+
+
+class EventDateColumn(Column):
+    def get_value(self, instance):
+        occurrences = list(instance.occurrences.order_by("start"))
+        if not occurrences:
+            return "—"
+        if len(occurrences) == 1:
+            local = timezone.localtime(occurrences[0].start)
+            return local.strftime(gettext("%Y-%m-%d at %H:%M"))
+        count = len(occurrences)
+        return ngettext("%(count)d occurrence", "%(count)d occurrences", count) % {"count": count}
+
+
+class OrganizersColumn(Column):
+    def get_value(self, instance):
+        names = list(instance.organizers.values_list("name", flat=True))
+        if not names:
+            return "—"
+        if len(names) == 1:
+            return names[0]
+        return f"{names[0]} (+{len(names) - 1})"
+
+
+class EventPagePrefetchMixin:
+    """Prefetch the relations the event columns read, so the listing avoids N+1."""
+
+    def annotate_queryset(self, pages):
+        pages = super().annotate_queryset(pages)
+        return pages.prefetch_related(
+            "occurrences",
+            "organizer_links__organizer",
+        )
+
+
+class EventPageIndexView(EventPagePrefetchMixin, IndexView):
+    pass
+
+
+class EventPageExplorableIndexView(EventPagePrefetchMixin, ExplorableIndexView):
+    pass
+
+
+class EventChooseParentView(ListingRedirectChooseParentView):
+    listing_url_name = "events:index"
+
+
+class EventListingMixin:
+    """Shared model + columns for the standalone listing and the page explorer."""
+
+    model = EventPage
+    icon = "date"
+    columns = [
+        PageTitleColumn("title", label=_("Title"), sort_key="title", classname="title"),
+        EventDateColumn("event_date", label=_("Date"), width="13%"),
+        OrganizersColumn("organizers", label=_("Organizers"), width="12%"),
+        DateColumn(
+            "latest_revision_created_at",
+            label=_("Updated"),
+            sort_key="latest_revision_created_at",
+            width="10%",
+        ),
+        PageStatusColumn("status", label=_("Status"), sort_key="live", width="10%"),
+    ]
+
+
+class EventSidebarViewSet(EventListingMixin, PageListingViewSet):
+    """Standalone 'Events' sidebar entry, reached independently of the page tree."""
+
+    index_view_class = EventPageIndexView
+    choose_parent_view_class = EventChooseParentView
+    menu_label = _("Events")
+    menu_order = 1
+    add_to_admin_menu = True
+    ordering = "-latest_revision_created_at"
+
+
+class EventExplorerViewSet(EventListingMixin, PageViewSet):
+    """Applies the same columns when navigating into EventIndex via the page explorer."""
+
+    index_view_class = EventPageExplorableIndexView
+
+
+event_sidebar_viewset = EventSidebarViewSet("events")
+event_explorer_viewset = EventExplorerViewSet()

dnscms/events/migrations/0054_alter_eventpage_options.py

@@ -0,0 +1,17 @@
+# Generated by Django 6.0.5 on 2026-05-19 18:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('events', '0053_eventpage_lead'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='eventpage',
+            options={'verbose_name': 'event', 'verbose_name_plural': 'events'},
+        ),
+    ]

dnscms/events/migrations/0055_alter_eventcategory_options_and_more.py

@@ -0,0 +1,82 @@
+# Generated by Django 6.0.5 on 2026-05-22 23:27
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('associations', '0026_alter_association_options'),
+        ('events', '0054_alter_eventpage_options'),
+        ('images', '0005_customimage_description'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='eventcategory',
+            options={'ordering': ['name'], 'verbose_name': 'event category', 'verbose_name_plural': 'event categories'},
+        ),
+        migrations.AlterModelOptions(
+            name='eventoccurrence',
+            options={'verbose_name': 'occurrence', 'verbose_name_plural': 'occurrences'},
+        ),
+        migrations.AlterModelOptions(
+            name='eventorganizer',
+            options={'ordering': ['name'], 'verbose_name': 'event organizer', 'verbose_name_plural': 'event organizers'},
+        ),
+        migrations.AlterModelOptions(
+            name='eventorganizerlink',
+            options={'verbose_name': 'organizer', 'verbose_name_plural': 'organizers'},
+        ),
+        migrations.AlterField(
+            model_name='eventcategory',
+            name='pig',
+            field=models.CharField(blank=True, choices=[('', 'None'), ('logo', 'Logogrisen'), ('music', 'Musikergrisen'), ('drink', 'Drikkegrisen'), ('dance', 'Dansegrisen'), ('point', 'Pekegrisen'), ('student', 'Studentgrisen'), ('listen', 'Lyttegrisen'), ('guard', 'Vaktgrisen'), ('key', 'Nøkkelgrisen'), ('chill', 'Liggegrisen'), ('peek', 'Tittegrisen')], default='', help_text='Default pig for events of this kind.', max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='eventcategory',
+            name='show_in_filters',
+            field=models.BooleanField(default=False, help_text='Should this category be available as a filter in the event programme?'),
+        ),
+        migrations.AlterField(
+            model_name='eventoccurrence',
+            name='venue_custom',
+            field=models.CharField(blank=True, help_text='Use this <em>if none of the venues that can be selected on the left</em> fit. E.g. <em>Frederikkeplassen</em> or <em>Sirkusteltet</em>.', max_length=128),
+        ),
+        migrations.AlterField(
+            model_name='eventorganizer',
+            name='association',
+            field=models.ForeignKey(blank=True, help_text='If a DNS association or committee is behind it, choose it here.', null=True, on_delete=django.db.models.deletion.PROTECT, related_name='organizers', to='associations.associationpage'),
+        ),
+        migrations.AlterField(
+            model_name='eventorganizer',
+            name='external_url',
+            field=models.URLField(blank=True, help_text="Link to the external organizer's website", max_length=512),
+        ),
+        migrations.AlterField(
+            model_name='eventpage',
+            name='facebook_url',
+            field=models.URLField(blank=True, help_text='Direct link to the event on Facebook', max_length=1024),
+        ),
+        migrations.AlterField(
+            model_name='eventpage',
+            name='featured_image',
+            field=models.ForeignKey(blank=True, help_text="Choose an image for use in the programme and other surfaces. Should be a photo or an illustration without too much text – don't reuse a Facebook cover uncritically!", null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.customimage'),
+        ),
+        migrations.AlterField(
+            model_name='eventpage',
+            name='pig',
+            field=models.CharField(blank=True, choices=[('', 'None'), ('automatic', 'Automatic'), ('logo', 'Logogrisen'), ('music', 'Musikergrisen'), ('drink', 'Drikkegrisen'), ('dance', 'Dansegrisen'), ('point', 'Pekegrisen'), ('student', 'Studentgrisen'), ('listen', 'Lyttegrisen'), ('guard', 'Vaktgrisen'), ('key', 'Nøkkelgrisen'), ('chill', 'Liggegrisen'), ('peek', 'Tittegrisen')], default='automatic', help_text="The pig that hangs out on the event page. Automatic causes one to be chosen based on the event's category.", max_length=32),
+        ),
+        migrations.AlterField(
+            model_name='eventpage',
+            name='subtitle',
+            field=models.CharField(blank=True, help_text='A short text that appears right below the title. Feel free to leave it empty if you fit most of it in the main title.', max_length=128),
+        ),
+        migrations.AlterField(
+            model_name='eventpage',
+            name='ticket_url',
+            field=models.URLField(blank=True, help_text='Direct link to ticket purchase, e.g. TicketCo, Billetto or Ticketmaster', max_length=1024),
+        ),
+    ]

dnscms/events/models.py

@@ -1,7 +1,7 @@
 from django import forms
 from django.core.exceptions import ValidationError
 from django.db import models
-from django.db.models import Min, Q, UniqueConstraint
+from django.db.models import Min, Prefetch, Q, UniqueConstraint
 from django.utils import timezone
 from django.utils.html import mark_safe
 from django.utils.translation import gettext_lazy as _
@@ -30,21 +30,42 @@ from wagtail.fields import RichTextField
 from wagtail.models import Orderable, Page, PageManager, PageQuerySet
 from wagtail.search import index
 from wagtail.snippets.models import register_snippet
+from wagtail_headless_preview.models import HeadlessMixin
 
 from associations.widgets import AssociationChooserWidget
 from dnscms.fields import CommonStreamField
 from dnscms.options import ALL_PIGS
-from dnscms.wordpress.models import WPImportedPageMixin
+from dnscms.wordpress.models import (
+    DeferWPFieldsManagerMixin,
+    WPAwareManager,
+    WPImportedPageMixin,
+)
 from venues.models import VenuePage
 
 
 @register_singular_query_field("eventIndex")
-class EventIndex(Page):
+class EventIndex(HeadlessMixin, Page):
     max_count = 1
     subpage_types = ["events.EventPage"]
 
     def future_events(self, info, **kwargs):
-        return EventPage.objects.live().future().order_by("next_occurrence")
+        return (
+            EventPage.objects.live()
+            .future()
+            .order_by("next_occurrence")
+            .select_related("featured_image")
+            .prefetch_related(
+                Prefetch(
+                    "occurrences",
+                    queryset=EventOccurrence.objects.select_related("venue"),
+                ),
+                "categories",
+                Prefetch(
+                    "organizers",
+                    queryset=EventOrganizer.objects.select_related("association"),
+                ),
+            )
+        )
 
     graphql_fields = [
         GraphQLCollection(
@@ -74,11 +95,12 @@ class EventCategory(models.Model):
         help_text=_("The name of the category as it will appear in URLs."),
     )
     show_in_filters = models.BooleanField(
-        default=False, help_text="Skal denne kategorien være mulig å filtrere på i programmet?"
+        default=False,
+        help_text=_("Should this category be available as a filter in the event programme?"),
     )
 
     PIG_CHOICES = [
-        ("", "Ingen"),
+        ("", _("None")),
     ] + ALL_PIGS
 
     pig = models.CharField(
@@ -86,14 +108,14 @@ class EventCategory(models.Model):
         choices=PIG_CHOICES,
         default="",
         blank=True,
-        help_text="Standardgris for arrangementer av denne typen.",
+        help_text=_("Default pig for events of this kind."),
     )
 
     panels = [
         TitleFieldPanel("name"),
         FieldPanel("slug"),
         FieldPanel("show_in_filters"),
-        FieldPanel("pig", heading="Gris"),
+        FieldPanel("pig", heading=_("Pig")),
     ]
 
     graphql_fields = [
@@ -104,8 +126,8 @@ class EventCategory(models.Model):
     ]
 
     class Meta:
-        verbose_name = "Event category"
+        verbose_name = _("event category")
-        verbose_name_plural = "Event categories"
+        verbose_name_plural = _("event categories")
         ordering = ["name"]
 
     def __str__(self):
@@ -133,8 +155,8 @@ class EventOrganizerLink(Orderable):
         return f"{self.organizer.name}"
 
     class Meta:
-        verbose_name = "Arrangør"
+        verbose_name = _("organizer")
-        verbose_name_plural = "Arrangører"
+        verbose_name_plural = _("organizers")
         constraints = [
             UniqueConstraint(
                 "event", "organizer", name="event_organizer_link_event_organizer_unique"
@@ -144,7 +166,9 @@ class EventOrganizerLink(Orderable):
 
 @register_snippet
 @register_query_field("eventOrganizer", "eventOrganizers")
-class EventOrganizer(ClusterableModel):
+class EventOrganizer(index.Indexed, ClusterableModel):
+    objects = WPAwareManager()
+
     name = models.CharField(
         max_length=100,
         null=False,
@@ -162,13 +186,13 @@ class EventOrganizer(ClusterableModel):
         blank=True,
         on_delete=models.PROTECT,
         related_name="organizers",
-        help_text="Om en samfundsforening eller et utvalg står bak, velg det her.",
+        help_text=_("If a DNS association or committee is behind it, choose it here."),
     )
 
     external_url = models.URLField(
         blank=True,
         max_length=512,
-        help_text="Lenke til nettstedet til ekstern arrangør",
+        help_text=_("Link to the external organizer's website"),
     )
 
     panels = [
@@ -177,15 +201,15 @@ class EventOrganizer(ClusterableModel):
         FieldPanel(
             "association",
             widget=AssociationChooserWidget(linked_fields={"association": "#id_association"}),
-            heading="Intern arrangør",
+            heading=_("Internal organizer"),
         ),
         MultiFieldPanel(
-            heading="Ekstern arrangør",
+            heading=_("External organizer"),
             children=[
                 FieldPanel(
                     "external_url",
-                    heading="Nettsted",
+                    heading=_("Website"),
-                    help_text="La denne stå tom om arrangøren finnes i lista over.",
+                    help_text=_("Leave this empty if the organizer exists in the list above."),
                 ),
             ],
         ),
@@ -198,9 +222,14 @@ class EventOrganizer(ClusterableModel):
         GraphQLString("external_url"),
     ]
 
+    search_fields = [
+        index.SearchField("name"),
+        index.AutocompleteField("name"),
+    ]
+
     class Meta:
-        verbose_name = "Event organizer"
+        verbose_name = _("event organizer")
-        verbose_name_plural = "Event organizers"
+        verbose_name_plural = _("event organizers")
         ordering = ["name"]
 
     def __str__(self):
@@ -217,10 +246,14 @@ class EventPageQuerySet(PageQuerySet):
         )
 
 
-EventPageManager = PageManager.from_queryset(EventPageQuerySet)
+class EventPageManager(
+    DeferWPFieldsManagerMixin,
+    PageManager.from_queryset(EventPageQuerySet),
+):
+    pass
 
 
-class EventPage(WPImportedPageMixin, Page):
+class EventPage(HeadlessMixin, WPImportedPageMixin, Page):
     subpage_types = []
     parent_page_types = ["events.EventIndex"]
     show_in_menus = False
@@ -233,19 +266,19 @@ class EventPage(WPImportedPageMixin, Page):
         blank=True,
         on_delete=models.SET_NULL,
         related_name="+",
-        help_text=(
+        help_text=_(
-            "Velg et bilde til bruk i programmet og andre visningsflater. "
+            "Choose an image for use in the programme and other surfaces. "
-            "Bør være et bilde eller en illustrasjon uten tekst "
+            "Should be a photo or an illustration without too much text "
-            "– ikke gjenbruk et Facebook-cover ukritisk!"
+            "– don't reuse a Facebook cover uncritically!"
         ),
     )
 
     subtitle = models.CharField(
         blank=True,
         max_length=128,
-        help_text=(
+        help_text=_(
-            "En kort tekst som kommer rett under under tittelen. "
+            "A short text that appears right below the title. "
-            "La denne gjerne stå tom om du fikk plass til det meste i tittelen."
+            "Feel free to leave it empty if you fit most of it in the main title."
         ),
     )
     lead = RichTextField(features=["italic", "link"], blank=True)
@@ -261,8 +294,8 @@ class EventPage(WPImportedPageMixin, Page):
     )
 
     PIG_CHOICES = [
-        ("", "Ingen"),
+        ("", _("None")),
-        ("automatic", "Automatisk"),
+        ("automatic", _("Automatic")),
     ] + ALL_PIGS
 
     pig = models.CharField(
@@ -270,21 +303,21 @@ class EventPage(WPImportedPageMixin, Page):
         choices=PIG_CHOICES,
         default="automatic",
         blank=True,
-        help_text=(
+        help_text=_(
-            "Grisen som henger på arrangementssiden. "
+            "The pig that hangs out on the event page. "
-            "Automatisk fører til at en velges basert på arrangementets kategori."
+            "Automatic causes one to be chosen based on the event's category."
         ),
     )
 
     ticket_url = models.URLField(
         blank=True,
         max_length=1024,
-        help_text="Lenke direkte til billettkjøp, f.eks. TicketCo eller Ticketmaster",
+        help_text=_("Direct link to ticket purchase, e.g. TicketCo, Billetto or Ticketmaster"),
     )
     facebook_url = models.URLField(
         blank=True,
         max_length=1024,
-        help_text="Lenke direkte til arrangementet på Facebook",
+        help_text=_("Direct link to the event on Facebook"),
     )
 
     free = models.BooleanField(null=False, default=False)
@@ -293,62 +326,65 @@ class EventPage(WPImportedPageMixin, Page):
     price_member = models.CharField(max_length=32, blank=True)
 
     ticket_panels = [
-        FieldPanel("free", heading="Gratis", help_text="Er dette arrangementet gratis for alle?"),
+        FieldPanel("free", heading=_("Free"), help_text=_("Is this event free for everyone?")),
         MultiFieldPanel(
             children=[
                 FieldRowPanel(
                     children=[
-                        FieldPanel("price_regular", heading="Ordinær pris"),
+                        FieldPanel("price_regular", heading=_("Regular price")),
-                        FieldPanel("price_student", heading="Pris for studenter"),
+                        FieldPanel("price_student", heading=_("Price for students")),
-                        FieldPanel("price_member", heading="Pris for medlemmer av DNS"),
+                        FieldPanel("price_member", heading=_("Price for DNS members")),
                     ],
                     help_text="",
                 ),
                 HelpPanel(
                     content=mark_safe(
-                        "Skriv <strong>0</strong> om gratis. Tomt felt skjuler priskategorien. Om mulig, skriv kun tall."
+                        _(
+                            "Write <strong>0</strong> for free. "
+                            "An empty field hides the price category. "
+                            "If possible, write digits only."
+                        )
                     )
                 ),
             ],
             attrs={"id": "specific_pricing_panel"},
         ),
-        FieldPanel("ticket_url", heading="Billettkjøpslenke"),
+        FieldPanel("ticket_url", heading=_("Ticket purchase link")),
     ]
 
     content_panels = Page.content_panels + [
-        FieldPanel("subtitle", heading="Undertittel"),
+        FieldPanel("subtitle", heading=_("Subtitle")),
         FieldPanel("featured_image"),
-        FieldPanel("lead", heading="Ingress"),
+        FieldPanel("lead", heading=_("Lead")),
         FieldPanel("body"),
         FieldPanel("categories", widget=forms.CheckboxSelectMultiple),
         MultiFieldPanel(
-            heading="Arrangører",
+            heading=_("Organizers"),
             children=[
                 HelpPanel(
-                    content=("Hvem står bak arrangementet?"),
+                    content=_("Who is behind the event?"),
                 ),
                 MultipleChooserPanel(
-                    "organizer_links", chooser_field_name="organizer", label="Arrangør"
+                    "organizer_links", chooser_field_name="organizer", label=_("Organizer")
                 ),
             ],
         ),
-        FieldPanel("pig", heading="Gris"),
+        FieldPanel("pig", heading=_("Pig")),
         FieldPanel(
             "facebook_url",
-            heading="Facebook-lenke",
+            heading=_("Facebook link"),
-            help_text="Lenke direkte til arrangementet på Facebook.",
+            help_text=_("Direct link to the event on Facebook."),
         ),
-        MultiFieldPanel(heading="Priser og billettkjøp", children=ticket_panels),
+        MultiFieldPanel(heading=_("Pricing and tickets"), children=ticket_panels),
         MultiFieldPanel(
-            heading="Dato, tid og lokale",
+            heading=_("Date, time and venue"),
             children=[
                 HelpPanel(
-                    content=(
+                    content=_(
-                        "Om arrangementet går over flere dager, "
+                        "If the event spans several days, add each day as a separate occurrence."
-                        "legg inn hver dag som en egen forekomst."
                     ),
                 ),
-                InlinePanel("occurrences", min_num=1, label="Forekomst"),
+                InlinePanel("occurrences", min_num=1, label=_("Occurrence")),
             ],
         ),
     ]
@@ -358,7 +394,7 @@ class EventPage(WPImportedPageMixin, Page):
         GraphQLImage("featured_image"),
         GraphQLRichText("lead"),
         GraphQLStreamfield("body"),
-        GraphQLString("pig"),
+        GraphQLString("pig", required=True),
         GraphQLString("ticket_url"),
         GraphQLString("facebook_url"),
         GraphQLBoolean("free"),
@@ -390,6 +426,10 @@ class EventPage(WPImportedPageMixin, Page):
 
     search_fields = Page.search_fields + [index.SearchField("body")]
 
+    class Meta:
+        verbose_name = _("event")
+        verbose_name_plural = _("events")
+
     def clean(self):
         super().clean()
 
@@ -409,130 +449,10 @@ class EventPage(WPImportedPageMixin, Page):
             self.price_student = ""
             self.price_member = ""
 
-    def import_wordpress_data(self, data):
-        import datetime
-        import html
-        from zoneinfo import ZoneInfo
-
-        from django.core.validators import URLValidator
-
-        validate_url = URLValidator(schemes=["http", "https"])
-
-        def fix_url(url):
-            if not url:
-                return None
-            url = url.strip()
-            try:
-                validate_url(url)
-            except Exception:
-                print(f"Bogus URL for {self.wp_post_id}: {url}")
-                return None
-            return url
-
-        # Wagtail page model fields
-        self.title = html.unescape(data["title"])
-        self.slug = data["slug"]
-        self.first_published_at = data["first_published_at"]
-        self.last_published_at = data["last_published_at"]
-        self.latest_revision_created_at = data["latest_revision_created_at"]
-        self.search_description = data["search_description"]
-
-        # debug fields
-        self.wp_post_id = data["wp_post_id"]
-        self.wp_post_type = data["wp_post_type"]
-        self.wp_link = data["wp_link"]
-        self.wp_raw_content = data["wp_raw_content"]
-        self.wp_block_json = data["wp_block_json"]
-        self.wp_processed_content = data["wp_processed_content"]
-        self.wp_normalized_styles = data["wp_normalized_styles"]
-        self.wp_post_meta = data["wp_post_meta"]
-
-        # own model fields
-        self.body = data["body"] or ""
-
-        # categories (organizers and event types)
-        wp_categories = data["wp_categories"]
-
-        # organizers
-        organizer_cats = [x for x in wp_categories if x["domain"] == "event_organizer"]
-        organizers = []
-        for x in organizer_cats:
-            try:
-                organizer = EventOrganizer.objects.get(slug=x["nicename"])
-            except EventOrganizer.DoesNotExist:
-                organizer = EventOrganizer.objects.create(name=x["name"], slug=x["nicename"])
-            organizers.append(organizer)
-
-        self.organizer_links.set(
-            [EventOrganizerLink(event=self, organizer=organizer) for organizer in organizers]
-        )
-
-        ## event types
-        # type_cats = [x for x in wp_categories if x["domain"] == "event_type"]
-        # event_categories = []
-        # for x in type_cats:
-        #     try:
-        #         event_category = EventCategory.objects.get(slug=x["nicename"])
-        #     except EventCategory.DoesNotExist:
-        #         event_category = EventCategory.objects.create(
-        #             name=x["name"], slug=x["nicename"], show_in_filters=False
-        #         )
-        #     event_categories.append(event_category)
-        # self.categories.set(event_categories)
-
-        meta = data["wp_post_meta"]
-
-        start_ts = meta.get("neuf_events_starttime") or 1337
-        end_ts = meta.get("neuf_events_endtime")
-        tz = ZoneInfo("Europe/Oslo")
-        start = start_ts and datetime.datetime.fromtimestamp(start_ts, datetime.UTC).replace(
-            tzinfo=tz
-        )
-        end = end_ts and datetime.datetime.fromtimestamp(end_ts, datetime.UTC).replace(tzinfo=tz)
-        venue_id = meta.get("neuf_events_venue_id")
-        venue_custom = meta.get("neuf_events_venue")
-        venue = None
-        if venue_id:
-            venue = VenuePage.objects.get(wp_post_id=venue_id)
-            venue_custom = ""
-        else:
-            venue_custom = venue_custom or ""
-
-        occurrence = EventOccurrence(
-            event=self, start=start, end=end, venue=venue, venue_custom=venue_custom
-        )
-        self.occurrences.set([occurrence])
-
-        self.ticket_url = fix_url(meta.get("neuf_events_bs_url")) or ""
-        self.facebook_url = fix_url(meta.get("neuf_events_fb_url")) or ""
-
-        def parse_price(price):
-            if price is None:
-                return ""
-            if type(price) is int:
-                return price
-            p = price.strip()
-            if p == "":
-                return ""
-            try:
-                return int(p)
-            except ValueError:
-                pass
-            free = ["gratis", "free", "gratis/free", "free/gratis"]
-            if p.lower() in free:
-                return 0
-            return price
-
-        price_regular = parse_price(meta.get("neuf_events_price_regular"))
-        price_member = parse_price(meta.get("neuf_events_price_member"))
-        if not price_regular and not price_member:
-            self.free = True
-        else:
-            self.price_regular = parse_price(meta.get("neuf_events_price_regular"))
-            self.price_member = parse_price(meta.get("neuf_events_price_member"))
-
 
 class EventOccurrence(Orderable):
+    objects = WPAwareManager()
+
     event = ParentalKey(EventPage, on_delete=models.CASCADE, related_name="occurrences")
     start = models.DateTimeField()
     end = models.DateTimeField(null=True, blank=True)
@@ -547,22 +467,24 @@ class EventOccurrence(Orderable):
         blank=True,
         max_length=128,
         help_text=mark_safe(
-            "Bruk denne <em>om ingen av lokalene som kan velges til venstre</em> passer. "
+            _(
-            "F.eks. <em>Frederikkeplassen</em> eller <em>Sirkusteltet</em>."
+                "Use this <em>if none of the venues that can be selected on the left</em> fit. "
+                "E.g. <em>Frederikkeplassen</em> or <em>Sirkusteltet</em>."
+            )
         ),
     )
 
     panels = [
         FieldRowPanel(
             children=[
-                FieldPanel("start", heading="Start"),
+                FieldPanel("start", heading=_("Start")),
-                FieldPanel("end", heading="Slutt"),
+                FieldPanel("end", heading=_("End")),
             ],
         ),
         FieldRowPanel(
             children=[
-                FieldPanel("venue", heading="Lokale"),
+                FieldPanel("venue", heading=_("Venue"), widget=forms.Select),
-                FieldPanel("venue_custom", heading="Lokale som fritekst"),
+                FieldPanel("venue_custom", heading=_("Venue as free text")),
             ],
         ),
     ]
@@ -575,140 +497,29 @@ class EventOccurrence(Orderable):
     ]
 
     def clean(self):
+        if self.venue_custom:
+            trimmed = self.venue_custom.strip()
+            self.venue_custom = trimmed
+            if trimmed:
+                match = VenuePage.objects.filter(title=trimmed).first()
+                if match:
+                    self.venue = match
+                    self.venue_custom = ""
+
         if self.venue and self.venue_custom:
             raise ValidationError(
-                {"venue_custom": "Du kan ikke både velge et lokale og skrive noe i dette feltet."}
+                {
+                    "venue_custom": _(
+                        "You can't both pick a venue and write something in this field."
+                    )
+                }
             )
         if not self.venue and not self.venue_custom:
-            raise ValidationError({"venue": "Lokale er påkrevd."})
+            raise ValidationError({"venue": _("Venue is required.")})
 
     def __str__(self):
         return f"{self.start}--{self.end}"
 
     class Meta:
-        verbose_name = "Forekomst"
+        verbose_name = _("occurrence")
-        verbose_name_plural = "Forekomster"
+        verbose_name_plural = _("occurrences")
-
-
-sample_legacy_event_json = """
-{
-  "id": 64573,
-  "date": "2023-12-27T11:28:34",
-  "date_gmt": "2023-12-27T10:28:34",
-  "guid": {
-    "rendered": "https://studentersamfundet.no/?post_type=event&#038;p=64573"
-  },
-  "modified": "2023-12-27T11:44:11",
-  "modified_gmt": "2023-12-27T10:44:11",
-  "slug": "quiz-147-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-3-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-3-2-2-2-2-2-2-2-2-2-2-2-2-2",
-  "status": "publish",
-  "type": "event",
-  "link": "https://studentersamfundet.no/arrangement/quiz-147-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-3-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-3-2-2-2-2-2-2-2-2-2-2-2-2-2/",
-  "title": {
-    "rendered": "QUIZ",
-    "decoded": "QUIZ"
-  },
-  "content": {
-    "rendered": "\n<p>Det Norske Studentersamfund inviterer til quiz hver tirsdag kl. 19:00.</p>\n\n\n\n<p>Vi serverer 50 spørsmål som kan spenne seg fra one hit wonders fra 80-tallet, universets uendelighet, dyrelivets merkverdigheter og mye, mye mer!</p>\n\n\n\n<p>Quiz på Chateau Neuf er åpent for alle. Vinnere og &#8220;lucky losers&#8221; vil bli utnevnt hver kveld. Lag som er over seks personer er tillatt, men da trekkes dere for  ett poeng per deltaker per runde.</p>\n\n\n\n<p>For de som ønsker å være med på sammenlagtkonkurransen for høsten vil den regnes ut for de tolv beste prestasjonene laget leverer. Så det vil fremdeles være god sjanse for å vinne sammenlagt selv dere må droppe en quiz eller to for eksamener eller andre forpliktelser.</p>\n\n\n\n<p>Velkommen quizglade mennesker!</p>\n\n\n\n<p>Gratis inngang!</p>\n",
-    "protected": false
-  },
-  "excerpt": {
-    "rendered": "<p>Det Norske Studentersamfund inviterer til quiz hver tirsdag kl. 19:00. Vi serverer 50 spørsmål som kan spenne seg fra one hit wonders fra 80-tallet, universets uendelighet, dyrelivets merkverdigheter og mye, mye mer! Quiz på Chateau Neuf er åpent for alle. Vinnere og &#8220;lucky losers&#8221; vil bli utnevnt hver kveld. Lag som er over seks personer [&hellip;]</p>\n",
-    "protected": false
-  },
-  "author": 2150,
-  "featured_media": 64585,
-  "template": "",
-  "meta": [],
-  "event_types": [13],
-  "event_organizers": [390, 322],
-  "facebook_url": "https://fb.me/e/2RDR5pZdr",
-  "ticket_url": "",
-  "price_regular": "",
-  "price_member": "",
-  "start_time": "2024-05-07T17:00:00+00:00",
-  "end_time": "2024-05-07T20:00:00+00:00",
-  "venue": "Glassbaren",
-  "venue_id": "55063",
-  "thumbnail": {
-    "thumbnail": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-150x150.png",
-    "medium": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-300x169.png",
-    "medium_large": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-768x433.png",
-    "large": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-1280x720.png",
-    "1536x1536": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-1536x865.png",
-    "2048x2048": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1.png",
-    "four-column": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-393x342.png",
-    "six-column": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-608x342.png",
-    "extra-large": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-1600x901.png",
-    "newsletter-half": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-320x190.png",
-    "newsletter-third": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-213x126.png",
-    "featured": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-1200x480.png"
-  },
-  "_links": {
-    "self": [
-      {
-        "href": "https://studentersamfundet.no/wp-json/wp/v2/events/64573"
-      }
-    ],
-    "collection": [
-      {
-        "href": "https://studentersamfundet.no/wp-json/wp/v2/events"
-      }
-    ],
-    "about": [
-      {
-        "href": "https://studentersamfundet.no/wp-json/wp/v2/types/event"
-      }
-    ],
-    "author": [
-      {
-        "embeddable": true,
-        "href": "https://studentersamfundet.no/wp-json/wp/v2/users/2150"
-      }
-    ],
-    "version-history": [
-      {
-        "count": 1,
-        "href": "https://studentersamfundet.no/wp-json/wp/v2/events/64573/revisions"
-      }
-    ],
-    "predecessor-version": [
-      {
-        "id": 64574,
-        "href": "https://studentersamfundet.no/wp-json/wp/v2/events/64573/revisions/64574"
-      }
-    ],
-    "wp:featuredmedia": [
-      {
-        "embeddable": true,
-        "href": "https://studentersamfundet.no/wp-json/wp/v2/media/64585"
-      }
-    ],
-    "wp:attachment": [
-      {
-        "href": "https://studentersamfundet.no/wp-json/wp/v2/media?parent=64573"
-      }
-    ],
-    "wp:term": [
-      {
-        "taxonomy": "event_type",
-        "embeddable": true,
-        "href": "https://studentersamfundet.no/wp-json/wp/v2/event_types?post=64573"
-      },
-      {
-        "taxonomy": "event_organizer",
-        "embeddable": true,
-        "href": "https://studentersamfundet.no/wp-json/wp/v2/event_organizers?post=64573"
-      }
-    ],
-    "curies": [
-      {
-        "name": "wp",
-        "href": "https://api.w.org/{rel}",
-        "templated": true
-      }
-    ]
-  }
-}
-
-"""

dnscms/events/sample_legacy_event.json

@@ -0,0 +1,119 @@
+{
+  "id": 64573,
+  "date": "2023-12-27T11:28:34",
+  "date_gmt": "2023-12-27T10:28:34",
+  "guid": {
+    "rendered": "https://studentersamfundet.no/?post_type=event&p=64573"
+  },
+  "modified": "2023-12-27T11:44:11",
+  "modified_gmt": "2023-12-27T10:44:11",
+  "slug": "quiz-147-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-3-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-3-2-2-2-2-2-2-2-2-2-2-2-2-2",
+  "status": "publish",
+  "type": "event",
+  "link": "https://studentersamfundet.no/arrangement/quiz-147-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-3-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-2-3-2-2-2-2-2-2-2-2-2-2-2-2-2/",
+  "title": {
+    "rendered": "QUIZ",
+    "decoded": "QUIZ"
+  },
+  "content": {
+    "rendered": "\n<p>Det Norske Studentersamfund inviterer til quiz hver tirsdag kl. 19:00.</p>\n\n\n\n<p>Vi serverer 50 spørsmål som kan spenne seg fra one hit wonders fra 80-tallet, universets uendelighet, dyrelivets merkverdigheter og mye, mye mer!</p>\n\n\n\n<p>Quiz på Chateau Neuf er åpent for alle. Vinnere og &#8220;lucky losers&#8221; vil bli utnevnt hver kveld. Lag som er over seks personer er tillatt, men da trekkes dere for  ett poeng per deltaker per runde.</p>\n\n\n\n<p>For de som ønsker å være med på sammenlagtkonkurransen for høsten vil den regnes ut for de tolv beste prestasjonene laget leverer. Så det vil fremdeles være god sjanse for å vinne sammenlagt selv dere må droppe en quiz eller to for eksamener eller andre forpliktelser.</p>\n\n\n\n<p>Velkommen quizglade mennesker!</p>\n\n\n\n<p>Gratis inngang!</p>\n",
+    "protected": false
+  },
+  "excerpt": {
+    "rendered": "<p>Det Norske Studentersamfund inviterer til quiz hver tirsdag kl. 19:00. Vi serverer 50 spørsmål som kan spenne seg fra one hit wonders fra 80-tallet, universets uendelighet, dyrelivets merkverdigheter og mye, mye mer! Quiz på Chateau Neuf er åpent for alle. Vinnere og &#8220;lucky losers&#8221; vil bli utnevnt hver kveld. Lag som er over seks personer [&hellip;]</p>\n",
+    "protected": false
+  },
+  "author": 2150,
+  "featured_media": 64585,
+  "template": "",
+  "meta": [],
+  "event_types": [13],
+  "event_organizers": [390, 322],
+  "facebook_url": "https://fb.me/e/2RDR5pZdr",
+  "ticket_url": "",
+  "price_regular": "",
+  "price_member": "",
+  "start_time": "2024-05-07T17:00:00+00:00",
+  "end_time": "2024-05-07T20:00:00+00:00",
+  "venue": "Glassbaren",
+  "venue_id": "55063",
+  "thumbnail": {
+    "thumbnail": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-150x150.png",
+    "medium": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-300x169.png",
+    "medium_large": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-768x433.png",
+    "large": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-1280x720.png",
+    "1536x1536": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-1536x865.png",
+    "2048x2048": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1.png",
+    "four-column": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-393x342.png",
+    "six-column": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-608x342.png",
+    "extra-large": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-1600x901.png",
+    "newsletter-half": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-320x190.png",
+    "newsletter-third": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-213x126.png",
+    "featured": "https://studentersamfundet.no/wp/wp-content/uploads/2023/12/quiz-header-1-1200x480.png"
+  },
+  "_links": {
+    "self": [
+      {
+        "href": "https://studentersamfundet.no/wp-json/wp/v2/events/64573"
+      }
+    ],
+    "collection": [
+      {
+        "href": "https://studentersamfundet.no/wp-json/wp/v2/events"
+      }
+    ],
+    "about": [
+      {
+        "href": "https://studentersamfundet.no/wp-json/wp/v2/types/event"
+      }
+    ],
+    "author": [
+      {
+        "embeddable": true,
+        "href": "https://studentersamfundet.no/wp-json/wp/v2/users/2150"
+      }
+    ],
+    "version-history": [
+      {
+        "count": 1,
+        "href": "https://studentersamfundet.no/wp-json/wp/v2/events/64573/revisions"
+      }
+    ],
+    "predecessor-version": [
+      {
+        "id": 64574,
+        "href": "https://studentersamfundet.no/wp-json/wp/v2/events/64573/revisions/64574"
+      }
+    ],
+    "wp:featuredmedia": [
+      {
+        "embeddable": true,
+        "href": "https://studentersamfundet.no/wp-json/wp/v2/media/64585"
+      }
+    ],
+    "wp:attachment": [
+      {
+        "href": "https://studentersamfundet.no/wp-json/wp/v2/media?parent=64573"
+      }
+    ],
+    "wp:term": [
+      {
+        "taxonomy": "event_type",
+        "embeddable": true,
+        "href": "https://studentersamfundet.no/wp-json/wp/v2/event_types?post=64573"
+      },
+      {
+        "taxonomy": "event_organizer",
+        "embeddable": true,
+        "href": "https://studentersamfundet.no/wp-json/wp/v2/event_organizers?post=64573"
+      }
+    ],
+    "curies": [
+      {
+        "name": "wp",
+        "href": "https://api.w.org/{rel}",
+        "templated": true
+      }
+    ]
+  }
+}

dnscms/events/views.py

@@ -1,15 +1,34 @@
+from django.utils.translation import gettext_lazy as _
+from wagtail.admin.forms import WagtailAdminModelForm
 from wagtail.admin.viewsets.chooser import ChooserViewSet
 
+from dnscms.utils import slugify
+from events.models import EventOrganizer
+
+
+class EventOrganizerCreationForm(WagtailAdminModelForm):
+    class Meta:
+        model = EventOrganizer
+        fields = ["name", "association", "external_url"]
+
+    def save(self, commit=True):
+        instance = super().save(commit=False)
+        if not instance.slug:
+            instance.slug = slugify(instance.name)
+        if commit:
+            instance.save()
+        return instance
+
 
 class EventOrganizerChooserViewSet(ChooserViewSet):
     model = "events.EventOrganizer"
     icon = "group"
     per_page = 30
-    page_title = "Choose organizers"
+    page_title = _("Choose organizers")
-    choose_one_text = "Choose an organizer"
+    choose_one_text = _("Choose an organizer")
-    choose_another_text = "Choose another organizer"
+    choose_another_text = _("Choose another organizer")
-    edit_item_text = "Edit this organizer"
+    edit_item_text = _("Edit this organizer")
-    form_fields = ["name", "association", "external_url"]
+    creation_form_class = EventOrganizerCreationForm
 
 
 event_organizer_chooser_viewset = EventOrganizerChooserViewSet("event_organizer_chooser")

dnscms/events/wagtail_hooks.py

@@ -1,8 +1,19 @@
 from wagtail import hooks
 
+from .admin import event_sidebar_viewset, event_explorer_viewset
 from .views import event_organizer_chooser_viewset
 
 
 @hooks.register("register_admin_viewset")
 def register_viewset():
     return event_organizer_chooser_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_event_sidebar_viewset():
+    return event_sidebar_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_event_explorer_viewset():
+    return event_explorer_viewset

dnscms/generic/models.py

@@ -4,13 +4,14 @@ from wagtail.admin.panels import FieldPanel
 from wagtail.fields import RichTextField, StreamField
 from wagtail.models import Page
 from wagtail.search import index
+from wagtail_headless_preview.models import HeadlessMixin
 
 from dnscms.blocks import PageSectionBlock
 from dnscms.fields import BASE_BLOCKS
 from dnscms.options import ALL_PIGS
 
 
-class GenericPage(Page):
+class GenericPage(HeadlessMixin, Page):
     subpage_types = ["generic.GenericPage"]
     show_in_menus = True
 

dnscms/home/models.py

@@ -10,9 +10,10 @@ from wagtail.admin.panels import (
     PageChooserPanel,
 )
 from wagtail.models import Orderable, Page
+from wagtail_headless_preview.models import HeadlessMixin
 
 
-class HomePage(Page):
+class HomePage(HeadlessMixin, Page):
     max_count = 1
 
     content_panels = Page.content_panels + [

dnscms/home/templates/home/home_page.html

@@ -1,21 +0,0 @@
-{% extends "base.html" %}
-{% load static %}
-
-{% block body_class %}template-homepage{% endblock %}
-
-{% block extra_css %}
-
-{% comment %}
-Delete the line below if you're just getting started and want to remove the welcome screen!
-{% endcomment %}
-<link rel="stylesheet" href="{% static 'css/welcome_page.css' %}">
-{% endblock extra_css %}
-
-{% block content %}
-
-{% comment %}
-Delete the line below if you're just getting started and want to remove the welcome screen!
-{% endcomment %}
-{% include 'home/welcome_page.html' %}
-
-{% endblock content %}

dnscms/home/templates/home/welcome_page.html

@@ -1,52 +0,0 @@
-{% load i18n wagtailcore_tags %}
-
-<header class="header">
-    <div class="logo">
-        <a href="https://wagtail.org/">
-            <svg class="figure-logo" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 342.5 126.2"><title>{% trans "Visit the Wagtail website" %}</title><path fill="#FFF" d="M84 1.9v5.7s-10.2-3.8-16.8 3.1c-4.8 5-5.2 10.6-3 18.1 21.6 0 25 12.1 25 12.1L87 27l6.8-8.3c0-9.8-8.1-16.3-9.8-16.8z"/><circle cx="85.9" cy="15.9" r="2.6"/><path d="M89.2 40.9s-3.3-16.6-24.9-12.1c-2.2-7.5-1.8-13 3-18.1C73.8 3.8 84 7.6 84 7.6V1.9C80.4.3 77 0 73.2 0 59.3 0 51.6 10.4 48.3 17.4L9.2 89.3l11-2.1-20.2 39 14.1-2.5L24.9 93c30.6 0 69.8-11 64.3-52.1z"/><path d="M102.4 27l-8.6-8.3L87 27z"/><path fill="#FFF" d="M30 84.1s1-.2 2.8-.6c1.8-.4 4.3-1 7.3-1.8 1.5-.4 3.1-.9 4.8-1.5 1.7-.6 3.5-1.2 5.2-2 1.8-.7 3.6-1.6 5.4-2.6 1.8-1 3.5-2.1 5.1-3.4.4-.3.8-.6 1.2-1l1.2-1c.7-.7 1.5-1.4 2.2-2.2.7-.7 1.3-1.5 1.9-2.3l.9-1.2.4-.6.4-.6c.2-.4.5-.8.7-1.2.2-.4.4-.8.7-1.2l.3-.6.3-.6c.2-.4.4-.8.5-1.2l.9-2.4c.2-.8.5-1.6.7-2.3.2-.7.3-1.5.5-2.1.1-.7.2-1.3.3-2 .1-.6.2-1.2.2-1.7.1-.5.1-1 .2-1.5.1-1.8.1-2.8.1-2.8l1.6.1s-.1 1.1-.2 2.9c-.1.5-.1 1-.2 1.5-.1.6-.1 1.2-.3 1.8-.1.6-.3 1.3-.4 2-.2.7-.4 1.4-.6 2.2-.2.8-.5 1.5-.8 2.4-.3.8-.6 1.6-1 2.5l-.6 1.2-.3.6-.3.6c-.2.4-.5.8-.7 1.3-.3.4-.5.8-.8 1.2-.1.2-.3.4-.4.6l-.4.6-.9 1.2c-.7.8-1.3 1.6-2.1 2.3-.7.8-1.5 1.4-2.3 2.2l-1.2 1c-.4.3-.8.6-1.3.9-1.7 1.2-3.5 2.3-5.3 3.3-1.8.9-3.7 1.8-5.5 2.5-1.8.7-3.6 1.3-5.3 1.8-1.7.5-3.3 1-4.9 1.3-3 .7-5.6 1.3-7.4 1.6-1.6.6-2.6.8-2.6.8z"/><g fill="#231F20"><path d="M127 83.9h-8.8l-12.6-36.4h7.9l9 27.5 9-27.5h7.9l9 27.5 9-27.5h7.9L153 83.9h-8.8L135.6 59 127 83.9zM200.1 83.9h-7V79c-3 3.6-7 5.4-12.1 5.4-3.8 0-6.9-1.1-9.4-3.2s-3.7-5-3.7-8.6c0-3.6 1.3-6.3 4-8 2.6-1.8 6.2-2.7 10.7-2.7h9.9v-1.4c0-4.8-2.7-7.3-8.1-7.3-3.4 0-6.9 1.2-10.5 3.7l-3.4-4.8c4.4-3.5 9.4-5.3 15.1-5.3 4.3 0 7.8 1.1 10.5 3.2 2.7 2.2 4.1 5.6 4.1 10.2v23.7zm-7.7-13.6v-3.1h-8.6c-5.5 0-8.3 1.7-8.3 5.2 0 1.8.7 3.1 2.1 4.1 1.4.9 3.3 1.4 5.7 1.4 2.4 0 4.6-.7 6.4-2.1 1.8-1.3 2.7-3.1 2.7-5.5zM241.7 47.5v31.7c0 6.4-1.7 11.3-5.2 14.5-3.5 3.2-8 4.8-13.4 4.8-5.5 0-10.4-1.7-14.8-5.1l3.6-5.8c3.6 2.7 7.1 4 10.8 4 3.6 0 6.5-.9 8.6-2.8 2.1-1.9 3.2-4.9 3.2-9v-4.7c-1.1 2.1-2.8 3.9-4.9 5.1-2.1 1.3-4.5 1.9-7.1 1.9-4.8 0-8.8-1.7-11.9-5.1-3.1-3.4-4.7-7.6-4.7-12.6s1.6-9.2 4.7-12.6c3.1-3.4 7.1-5.1 11.9-5.1 4.8 0 8.7 2 11.7 6v-5.4h7.5zm-28.4 16.8c0 3 .9 5.6 2.8 7.7 1.8 2.2 4.3 3.2 7.5 3.2 3.1 0 5.7-1 7.6-3.1 1.9-2.1 2.9-4.7 2.9-7.8 0-3.1-1-5.8-2.9-7.9-2-2.2-4.5-3.2-7.6-3.2-3.1 0-5.6 1.1-7.4 3.4-2 2.1-2.9 4.7-2.9 7.7zM260.9 53.6v18.5c0 1.7.5 3.1 1.4 4.1.9 1 2.2 1.5 3.8 1.5 1.6 0 3.2-.8 4.7-2.4l3.1 5.4c-2.7 2.4-5.7 3.6-8.9 3.6-3.3 0-6-1.1-8.3-3.4-2.3-2.3-3.5-5.3-3.5-9.1V53.6h-4.6v-6.2h4.6V36.1h7.7v11.4h9.6v6.2h-9.6zM309.5 83.9h-7V79c-3 3.6-7 5.4-12.1 5.4-3.8 0-6.9-1.1-9.4-3.2s-3.7-5-3.7-8.6c0-3.6 1.3-6.3 4-8 2.6-1.8 6.2-2.7 10.7-2.7h9.9v-1.4c0-4.8-2.7-7.3-8.1-7.3-3.4 0-6.9 1.2-10.5 3.7l-3.4-4.8c4.4-3.5 9.4-5.3 15.1-5.3 4.3 0 7.8 1.1 10.5 3.2 2.7 2.2 4.1 5.6 4.1 10.2v23.7zm-7.7-13.6v-3.1h-8.6c-5.5 0-8.3 1.7-8.3 5.2 0 1.8.7 3.1 2.1 4.1 1.4.9 3.3 1.4 5.7 1.4 2.4 0 4.6-.7 6.4-2.1 1.8-1.3 2.7-3.1 2.7-5.5zM319.3 40.2c-1-1-1.4-2.1-1.4-3.4 0-1.3.5-2.5 1.4-3.4 1-1 2.1-1.4 3.4-1.4 1.3 0 2.5.5 3.4 1.4 1 1 1.4 2.1 1.4 3.4 0 1.3-.5 2.5-1.4 3.4s-2.1 1.4-3.4 1.4c-1.3.1-2.4-.4-3.4-1.4zm7.2 43.7h-7.7V47.5h7.7v36.4zM342.5 83.9h-7.7V33.1h7.7v50.8z"/></g></svg>
-        </a>
-    </div>
-    <div class="header-link">
-        {% comment %}
-        This works for all cases but prerelease versions:
-        {% endcomment %}
-        <a href="{% wagtail_documentation_path %}/releases/{% wagtail_release_notes_path %}">
-            {% trans "View the release notes" %}
-        </a>
-    </div>
-</header>
-<main class="main">
-    <div class="figure">
-        <svg class="figure-space" xmlns="http://www.w3.org/2000/svg" viewBox="0 0 300 300" aria-hidden="true">
-            <path class="egg" fill="currentColor" d="M150 250c-42.741 0-75-32.693-75-90s42.913-110 75-110c32.088 0 75 52.693 75 110s-32.258 90-75 90z"/>
-            <ellipse fill="#ddd" cx="150" cy="270" rx="40" ry="7"/>
-        </svg>
-    </div>
-    <div class="main-text">
-        <h1>{% trans "Welcome to your new Wagtail site!" %}</h1>
-        <p>{% trans 'Please feel free to <a href="https://github.com/wagtail/wagtail/wiki/Slack">join our community on Slack</a>, or get started with one of the links below.' %}</p>
-    </div>
-</main>
-<footer class="footer" role="contentinfo">
-    <a class="option option-one" href="{% wagtail_documentation_path %}/">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M9 21c0 .5.4 1 1 1h4c.6 0 1-.5 1-1v-1H9v1zm3-19C8.1 2 5 5.1 5 9c0 2.4 1.2 4.5 3 5.7V17c0 .5.4 1 1 1h6c.6 0 1-.5 1-1v-2.3c1.8-1.3 3-3.4 3-5.7 0-3.9-3.1-7-7-7zm2.9 11.1l-.9.6V16h-4v-2.3l-.9-.6C7.8 12.2 7 10.6 7 9c0-2.8 2.2-5 5-5s5 2.2 5 5c0 1.6-.8 3.2-2.1 4.1z"/></svg>
-        <div>
-            <h2>{% trans "Wagtail Documentation" %}</h2>
-            <p>{% trans "Topics, references, & how-tos" %}</p>
-        </div>
-    </a>
-    <a class="option option-two" href="{% wagtail_documentation_path %}/getting_started/tutorial.html">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M0 0h24v24H0V0z" fill="none"/><path d="M9.4 16.6L4.8 12l4.6-4.6L8 6l-6 6 6 6 1.4-1.4zm5.2 0l4.6-4.6-4.6-4.6L16 6l6 6-6 6-1.4-1.4z"/></svg>
-        <div>
-            <h2>{% trans "Tutorial" %}</h2>
-            <p>{% trans "Build your first Wagtail site" %}</p>
-        </div>
-    </a>
-    <a class="option option-three" href="{% url 'wagtailadmin_home' %}">
-        <svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 24 24" aria-hidden="true"><path d="M0 0h24v24H0z" fill="none"/><path d="M16.5 13c-1.2 0-3.07.34-4.5 1-1.43-.67-3.3-1-4.5-1C5.33 13 1 14.08 1 16.25V19h22v-2.75c0-2.17-4.33-3.25-6.5-3.25zm-4 4.5h-10v-1.25c0-.54 2.56-1.75 5-1.75s5 1.21 5 1.75v1.25zm9 0H14v-1.25c0-.46-.2-.86-.52-1.22.88-.3 1.96-.53 3.02-.53 2.44 0 5 1.21 5 1.75v1.25zM7.5 12c1.93 0 3.5-1.57 3.5-3.5S9.43 5 7.5 5 4 6.57 4 8.5 5.57 12 7.5 12zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2zm9 5.5c1.93 0 3.5-1.57 3.5-3.5S18.43 5 16.5 5 13 6.57 13 8.5s1.57 3.5 3.5 3.5zm0-5.5c1.1 0 2 .9 2 2s-.9 2-2 2-2-.9-2-2 .9-2 2-2z"/></svg>
-        <div>
-            <h2>{% trans "Admin Interface" %}</h2>
-            <p>{% trans "Create your superuser first!" %}</p>
-        </div>
-    </a>
-</footer>

dnscms/locale/nb/LC_MESSAGES/django.po

@@ -0,0 +1,359 @@
+# SOME DESCRIPTIVE TITLE.
+# Copyright (C) YEAR THE PACKAGE'S COPYRIGHT HOLDER
+# This file is distributed under the same license as the PACKAGE package.
+# FIRST AUTHOR <EMAIL@ADDRESS>, YEAR.
+#
+msgid ""
+msgstr ""
+"Project-Id-Version: dnscms\n"
+"Report-Msgid-Bugs-To: \n"
+"POT-Creation-Date: 2026-05-26 01:39+0200\n"
+"Language: nb\n"
+"MIME-Version: 1.0\n"
+"Content-Type: text/plain; charset=UTF-8\n"
+"Content-Transfer-Encoding: 8bit\n"
+"Plural-Forms: nplurals=2; plural=(n != 1);\n"
+
+msgid "Title"
+msgstr "Tittel"
+
+msgid "Type"
+msgstr "Type"
+
+msgid "Updated"
+msgstr "Oppdatert"
+
+msgid "Status"
+msgstr "Status"
+
+msgid "Associations"
+msgstr "Foreninger"
+
+msgid "Lead"
+msgstr "Ingress"
+
+msgid "Content"
+msgstr "Innhold"
+
+msgid "association index"
+msgstr "foreningsoversikt"
+
+msgid "association indexes"
+msgstr "foreningsoversikter"
+
+msgid "Association"
+msgstr "Forening"
+
+msgid "Committee"
+msgstr "Utvalg"
+
+msgid "Excerpt"
+msgstr "Utdrag"
+
+msgid "A very short summary of the content below. Used in listing views."
+msgstr ""
+"En veldig kort oppsummering av innholdet nedenfor. Brukes i listevisninger."
+
+msgid "Website"
+msgstr "Nettsted"
+
+msgid "association"
+msgstr "forening"
+
+msgid "associations"
+msgstr "foreninger"
+
+msgid "Choose an association"
+msgstr "Velg en forening"
+
+msgid "Choose another association"
+msgstr "Velg en annen forening"
+
+msgid "Edit this association"
+msgstr "Rediger denne foreningen"
+
+msgid "%Y-%m-%d at %H:%M"
+msgstr "%Y-%m-%d kl %H:%M"
+
+#, python-format
+msgid "%(count)d occurrence"
+msgid_plural "%(count)d occurrences"
+msgstr[0] "%(count)d forekomst"
+msgstr[1] "%(count)d forekomster"
+
+msgid "Date"
+msgstr "Dato"
+
+msgid "Organizers"
+msgstr "Arrangører"
+
+msgid "Events"
+msgstr "Arrangementer"
+
+msgid "slug"
+msgstr "permalenke"
+
+msgid "The name of the category as it will appear in URLs."
+msgstr "Navnet på kategorien slik det vil vises i URL-er."
+
+msgid "Should this category be available as a filter in the event programme?"
+msgstr "Skal denne kategorien være mulig å filtrere på i programmet?"
+
+msgid "None"
+msgstr "Ingen"
+
+msgid "Default pig for events of this kind."
+msgstr "Standardgris for arrangementer av denne typen."
+
+msgid "Pig"
+msgstr "Gris"
+
+msgid "event category"
+msgstr "arrangementskategori"
+
+msgid "event categories"
+msgstr "arrangementskategorier"
+
+msgid "organizer"
+msgstr "arrangør"
+
+msgid "organizers"
+msgstr "arrangører"
+
+msgid "The name of the organizer as it will appear in URLs."
+msgstr "Navnet på arrangøren slik det vil vises i URL-er."
+
+msgid "If a DNS association or committee is behind it, choose it here."
+msgstr "Om en samfundsforening eller -utvalg står bak, velg det her."
+
+msgid "Link to the external organizer's website"
+msgstr "Lenke til nettstedet til ekstern arrangør"
+
+msgid "Internal organizer"
+msgstr "Intern arrangør"
+
+msgid "External organizer"
+msgstr "Ekstern arrangør"
+
+msgid "Leave this empty if the organizer exists in the list above."
+msgstr "La denne stå tom om arrangøren finnes i lista over."
+
+msgid "event organizer"
+msgstr "arrangør"
+
+msgid "event organizers"
+msgstr "arrangører"
+
+msgid ""
+"Choose an image for use in the programme and other surfaces. Should be a "
+"photo or an illustration without too much text – don't reuse a Facebook "
+"cover uncritically!"
+msgstr ""
+"Velg et bilde til bruk i programmet og andre visningsflater. Bør være et "
+"bilde eller en illustrasjon uten for mye tekst – ikke gjenbruk et Facebook-"
+"cover ukritisk!"
+
+msgid ""
+"A short text that appears right below the title. Feel free to leave it empty "
+"if you fit most of it in the main title."
+msgstr ""
+"En kort tekst som kommer rett under tittelen. La denne gjerne stå tom om du "
+"fikk plass til det meste i hovedtittelen."
+
+msgid "Automatic"
+msgstr "Automatisk"
+
+msgid ""
+"The pig that hangs out on the event page. Automatic causes one to be chosen "
+"based on the event's category."
+msgstr ""
+"Grisen som henger på arrangementssiden. Automatisk fører til at en velges "
+"basert på arrangementets kategori."
+
+msgid "Direct link to ticket purchase, e.g. TicketCo, Billetto or Ticketmaster"
+msgstr ""
+"Lenke direkte til billettkjøp, f.eks. TicketCo, Billetto eller Ticketmaster"
+
+msgid "Direct link to the event on Facebook"
+msgstr "Lenke direkte til arrangementet på Facebook"
+
+msgid "Free"
+msgstr "Gratis"
+
+msgid "Is this event free for everyone?"
+msgstr "Er dette arrangementet gratis for alle?"
+
+msgid "Regular price"
+msgstr "Ordinær pris"
+
+msgid "Price for students"
+msgstr "Pris for studenter"
+
+msgid "Price for DNS members"
+msgstr "Pris for medlemmer av DNS"
+
+msgid ""
+"Write <strong>0</strong> for free. An empty field hides the price category. "
+"If possible, write digits only."
+msgstr ""
+"Skriv <strong>0</strong> om gratis. Tomt felt skjuler priskategorien. Om "
+"mulig, skriv kun tall."
+
+msgid "Ticket purchase link"
+msgstr "Billettkjøpslenke"
+
+msgid "Subtitle"
+msgstr "Undertittel"
+
+msgid "Who is behind the event?"
+msgstr "Hvem står bak arrangementet?"
+
+msgid "Organizer"
+msgstr "Arrangør"
+
+msgid "Facebook link"
+msgstr "Facebook-lenke"
+
+msgid "Direct link to the event on Facebook."
+msgstr "Lenke direkte til arrangementet på Facebook."
+
+msgid "Pricing and tickets"
+msgstr "Priser og billettkjøp"
+
+msgid "Date, time and venue"
+msgstr "Dato, tid og lokale"
+
+msgid "If the event spans several days, add each day as a separate occurrence."
+msgstr ""
+"Om arrangementet går over flere dager, legg inn hver dag som en egen "
+"forekomst."
+
+msgid "Occurrence"
+msgstr "Forekomst"
+
+msgid "event"
+msgstr "arrangement"
+
+msgid "events"
+msgstr "arrangementer"
+
+msgid ""
+"Use this <em>if none of the venues that can be selected on the left</em> "
+"fit. E.g. <em>Frederikkeplassen</em> or <em>Sirkusteltet</em>."
+msgstr ""
+"Bruk denne <em>om ingen av lokalene som kan velges til venstre</em> passer. "
+"F.eks. <em>Frederikkeplassen</em> eller <em>Sirkusteltet</em>."
+
+msgid "Start"
+msgstr "Start"
+
+msgid "End"
+msgstr "Slutt"
+
+msgid "Venue"
+msgstr "Lokale"
+
+msgid "Venue as free text"
+msgstr "Lokale som fritekst"
+
+msgid "You can't both pick a venue and write something in this field."
+msgstr "Du kan ikke både velge et lokale og skrive noe i dette feltet."
+
+msgid "Venue is required."
+msgstr "Lokale er påkrevd."
+
+msgid "occurrence"
+msgstr "forekomst"
+
+msgid "occurrences"
+msgstr "forekomster"
+
+msgid "Choose organizers"
+msgstr "Velg arrangører"
+
+msgid "Choose an organizer"
+msgstr "Velg en arrangør"
+
+msgid "Choose another organizer"
+msgstr "Velg en annen arrangør"
+
+msgid "Edit this organizer"
+msgstr "Rediger denne arrangøren"
+
+msgid "image"
+msgstr "bilde"
+
+msgid "images"
+msgstr "bilder"
+
+msgid "First published"
+msgstr "Først publisert"
+
+msgid "News"
+msgstr "Nyheter"
+
+msgid "news index"
+msgstr "nyhetsoversikt"
+
+msgid "news indexes"
+msgstr "nyhetsoversikter"
+
+msgid ""
+"Choose an image for use on the front page and other surfaces. Should be a "
+"photo or an illustration without too much text."
+msgstr ""
+"Velg et bilde til bruk på forsiden og andre visningsflater. Bør være et "
+"bilde eller en illustrasjon uten for mye tekst."
+
+msgid ""
+"A very short summary of the article's content. Used on the front page and in "
+"the article listing."
+msgstr ""
+"En veldig kort oppsummering av innholdet i artikkelen. Brukes på forsiden og "
+"i artikkeloversikten."
+
+msgid ""
+"A brief, introductory paragraph that summarizes the main content of the "
+"article."
+msgstr ""
+"Et kortfattet, innledende avsnitt som oppsummerer hovedinnholdet i "
+"artikkelen."
+
+msgid "news article"
+msgstr "nyhetsartikkel"
+
+msgid "news articles"
+msgstr "nyhetsartikler"
+
+msgid "Rentals page"
+msgstr "Utleieside"
+
+msgid "Venue overview"
+msgstr "Lokaleoversikt"
+
+msgid "Venues"
+msgstr "Lokaler"
+
+msgid "venue index"
+msgstr "lokaleoversikt"
+
+msgid "venue indexes"
+msgstr "lokaleoversikter"
+
+msgid "rentals page"
+msgstr "utleieside"
+
+msgid "rentals pages"
+msgstr "utleiesider"
+
+msgid "venue"
+msgstr "lokale"
+
+msgid "venues"
+msgstr "lokaler"
+
+#~ msgid "Bookable"
+#~ msgstr "Til utleie"
+
+#~ msgid "Listed"
+#~ msgstr "I oversikt"

dnscms/mise.toml

@@ -0,0 +1,8 @@
+# Translation tasks
+[tasks.compilemessages]
+description = "Compile translation files for Norwegian Bokmal"
+run = "uv run manage.py compilemessages -l nb"
+
+[tasks.makemessages]
+description = "Extract translation strings for Norwegian Bokmal"
+run = "uv run manage.py makemessages -l nb"

dnscms/news/admin.py

@@ -0,0 +1,52 @@
+from django.utils.translation import gettext_lazy as _
+from wagtail.admin.ui.tables import DateColumn
+from wagtail.admin.ui.tables.pages import PageStatusColumn, PageTitleColumn
+from wagtail.admin.viewsets.pages import PageListingViewSet, PageViewSet
+
+from dnscms.admin import ListingRedirectChooseParentView
+from news.models import NewsPage
+
+
+class NewsChooseParentView(ListingRedirectChooseParentView):
+    listing_url_name = "news:index"
+
+
+class NewsListingMixin:
+    """Shared model + columns for the standalone listing and the page explorer."""
+
+    model = NewsPage
+    icon = "info-circle"
+    columns = [
+        PageTitleColumn("title", label=_("Title"), sort_key="title", classname="title"),
+        DateColumn(
+            "first_published_at",
+            label=_("First published"),
+            sort_key="first_published_at",
+            width="10%",
+        ),
+        DateColumn(
+            "latest_revision_created_at",
+            label=_("Updated"),
+            sort_key="latest_revision_created_at",
+            width="10%",
+        ),
+        PageStatusColumn("status", label=_("Status"), sort_key="live", width="10%"),
+    ]
+
+
+class NewsSidebarViewSet(NewsListingMixin, PageListingViewSet):
+    """Standalone 'News' sidebar entry, reached independently of the page tree."""
+
+    choose_parent_view_class = NewsChooseParentView
+    menu_label = _("News")
+    menu_order = 3
+    add_to_admin_menu = True
+    ordering = "-latest_revision_created_at"
+
+
+class NewsExplorerViewSet(NewsListingMixin, PageViewSet):
+    """Applies the same columns when navigating into NewsIndex via the page explorer."""
+
+
+news_sidebar_viewset = NewsSidebarViewSet("news")
+news_explorer_viewset = NewsExplorerViewSet()

dnscms/news/migrations/0019_alter_news_options.py

@@ -0,0 +1,28 @@
+# Generated by Django 6.0.5 on 2026-05-19 19:55
+
+import django.db.models.deletion
+from django.db import migrations, models
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('images', '0005_customimage_description'),
+        ('news', '0018_newspage_wp_block_json_newspage_wp_link_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='newsindex',
+            options={'verbose_name': 'news index', 'verbose_name_plural': 'news indexes'},
+        ),
+        migrations.AlterModelOptions(
+            name='newspage',
+            options={'verbose_name': 'news article', 'verbose_name_plural': 'news articles'},
+        ),
+        migrations.AlterField(
+            model_name='newspage',
+            name='featured_image',
+            field=models.ForeignKey(blank=True, help_text='Choose an image for use on the front page and other surfaces. Should be a photo or an illustration without too much text.', null=True, on_delete=django.db.models.deletion.SET_NULL, related_name='+', to='images.customimage'),
+        ),
+    ]

dnscms/news/models.py

@@ -1,24 +1,30 @@
 from django.db import models
+from django.utils.translation import gettext_lazy as _
 from grapple.helpers import register_singular_query_field
 from grapple.models import GraphQLImage, GraphQLRichText, GraphQLStreamfield, GraphQLString
 from wagtail.admin.panels import FieldPanel
 from wagtail.fields import RichTextField
-from wagtail.models import Page
+from wagtail.models import Page, PageManager
 from wagtail.search import index
+from wagtail_headless_preview.models import HeadlessMixin
 
 from dnscms.fields import CommonStreamField
-from dnscms.wordpress.models import WPImportedPageMixin
+from dnscms.wordpress.models import DeferWPFieldsManagerMixin, WPImportedPageMixin
+
+
+class NewsPageManager(DeferWPFieldsManagerMixin, PageManager):
+    pass
 
 
 @register_singular_query_field("newsIndex")
-class NewsIndex(Page):
+class NewsIndex(HeadlessMixin, Page):
     max_count = 1
     subpage_types = ["news.NewsPage"]
 
     lead = RichTextField(features=["italic", "link"], blank=True)
 
     content_panels = Page.content_panels + [
-        FieldPanel("lead", heading="Ingress"),
+        FieldPanel("lead", heading=_("Lead")),
     ]
 
     graphql_fields = [
@@ -27,12 +33,18 @@ class NewsIndex(Page):
 
     search_fields = []
 
+    class Meta:
+        verbose_name = _("news index")
+        verbose_name_plural = _("news indexes")
 
-class NewsPage(WPImportedPageMixin, Page):
+
+class NewsPage(HeadlessMixin, WPImportedPageMixin, Page):
     subpage_types = []
     parent_page_types = ["news.NewsIndex"]
     show_in_menus = False
 
+    objects = NewsPageManager()
+
     excerpt = models.TextField(max_length=512, blank=False)
     lead = RichTextField(features=["italic", "link"], blank=True)
     body = CommonStreamField
@@ -42,23 +54,28 @@ class NewsPage(WPImportedPageMixin, Page):
         blank=True,
         on_delete=models.SET_NULL,
         related_name="+",
-        help_text=(
+        help_text=_(
-            "Velg et bilde til bruk i på forsiden og andre visningsflater. "
+            "Choose an image for use on the front page and other surfaces. "
-            "Bør være et bilde eller en illustrasjon uten tekst."
+            "Should be a photo or an illustration without too much text."
         ),
     )
 
     content_panels = Page.content_panels + [
         FieldPanel(
             "excerpt",
-            heading="Utdrag",
+            heading=_("Excerpt"),
-            help_text="En veldig kort oppsummering av innholdet i artikkelen. Brukes på forsiden og i artikkeloversikten.",
+            help_text=_(
+                "A very short summary of the article's content. "
+                "Used on the front page and in the article listing."
+            ),
         ),
         FieldPanel("featured_image"),
         FieldPanel(
             "lead",
-            heading="Ingress",
+            heading=_("Lead"),
-            help_text="Et kortfattet, innledende avsnitt som oppsummerer hovedinnholdet i artikkelen.",
+            help_text=_(
+                "A brief, introductory paragraph that summarizes the main content of the article."
+            ),
         ),
         FieldPanel("body"),
     ]
@@ -76,51 +93,6 @@ class NewsPage(WPImportedPageMixin, Page):
         index.SearchField("body"),
     ]
 
-    def import_wordpress_data(self, data):
+    class Meta:
-        import html
+        verbose_name = _("news article")
-
+        verbose_name_plural = _("news articles")
-        from bs4 import BeautifulSoup
-
-        def generate_excerpt(html_content):
-            soup = BeautifulSoup(html_content, features="lxml")
-            VALID_TAGS = ["div", "p"]
-
-            for tag in soup.findAll("p"):
-                if tag.name not in VALID_TAGS:
-                    tag.remove()
-
-            text = soup.get_text().strip()
-            words = text.split(" ")
-            if len(words) < 26:
-                return text
-            return " ".join(words[:25]) + " [...]"
-
-        # Wagtail page model fields
-        self.title = html.unescape(data["title"])
-        self.slug = data["slug"]
-        self.first_published_at = data["first_published_at"]
-        self.last_published_at = data["last_published_at"]
-        self.latest_revision_created_at = data["latest_revision_created_at"]
-        self.search_description = data["search_description"]
-
-        # debug fields
-        self.wp_post_id = data["wp_post_id"]
-        self.wp_post_type = data["wp_post_type"]
-        self.wp_link = data["wp_link"]
-        self.wp_raw_content = data["wp_raw_content"]
-        self.wp_block_json = data["wp_block_json"]
-        self.wp_processed_content = data["wp_processed_content"]
-        self.wp_normalized_styles = data["wp_normalized_styles"]
-        self.wp_post_meta = data["wp_post_meta"]
-
-        # own model fields
-        self.body = data["body"] or ""
-
-        meta = data["wp_post_meta"]
-
-        written_excerpt = meta.get("excerpt_encoded")
-        generated_excerpt = ""
-        if not written_excerpt:
-            generated_excerpt = generate_excerpt(self.wp_processed_content)
-
-        self.excerpt = written_excerpt or generated_excerpt or "[...]"

dnscms/news/wagtail_hooks.py

@@ -0,0 +1,13 @@
+from wagtail import hooks
+
+from .admin import news_sidebar_viewset, news_explorer_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_news_sidebar_viewset():
+    return news_sidebar_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_news_explorer_viewset():
+    return news_explorer_viewset

dnscms/pyproject.toml

@@ -5,8 +5,9 @@ description = ""
 authors = [{ name = "EDB", email = "edb@neuf.no" }]
 requires-python = ">=3.14, <3.15"
 dependencies = [
-    "wagtail>=7.4,<8",
+    "wagtail>=7.4.1,<8",
     "wagtail-grapple>=0.31.0,<0.32",
+    "wagtail-headless-preview>=0.8,<0.9",
     "django>=6.0.5,<7",
     "django-extensions>=4.1,<5",
     "psycopg2-binary>=2.9.12,<3",

dnscms/sponsors/models.py

@@ -8,6 +8,7 @@ from wagtail.fields import RichTextField, StreamField
 from wagtail.images.blocks import ImageChooserBlock
 from wagtail.models import Page
 from wagtail.search import index
+from wagtail_headless_preview.models import HeadlessMixin
 
 from dnscms.blocks import BASE_BLOCKS
 
@@ -34,7 +35,7 @@ class SponsorBlock(blocks.StructBlock):
 
 
 @register_singular_query_field("sponsorsPage")
-class SponsorsPage(Page):
+class SponsorsPage(HeadlessMixin, Page):
     max_count = 1
     subpage_types = []
 

dnscms/studio/models.py

@@ -10,13 +10,14 @@ from wagtail.admin.panels import FieldPanel
 from wagtail.fields import RichTextField, StreamField
 from wagtail.models import Page
 from wagtail.search import index
+from wagtail_headless_preview.models import HeadlessMixin
 
 from dnscms.blocks import BASE_BLOCKS, PageSectionBlock
 from dnscms.options import ALL_PIGS
 
 
 @register_singular_query_field("studioPage")
-class StudioPage(Page):
+class StudioPage(HeadlessMixin, Page):
     max_count = 1
     subpage_types = []
     show_in_menus = True

dnscms/tests/test_associations.py

@@ -0,0 +1,53 @@
+from associations.admin import AssociationTypeColumn
+from associations.models import AssociationPage
+from tests.conftest import AssociationPageFactory
+
+
+def test_associationpage_persists_via_factory(association_index):
+    page = AssociationPageFactory(
+        parent=association_index,
+        title="EDB-gjengen",
+        excerpt="WOW FLINKE",
+        association_type=AssociationPage.AssociationType.UTVALG,
+    )
+
+    reloaded = AssociationPage.objects.get(pk=page.pk)
+    assert reloaded.title == "EDB-gjengen"
+    assert reloaded.excerpt == "WOW FLINKE"
+    assert reloaded.association_type == "utvalg"
+
+
+def test_association_type_column_renders_forening_display(association_index):
+    page = AssociationPageFactory(
+        parent=association_index,
+        association_type=AssociationPage.AssociationType.FORENING,
+    )
+    column = AssociationTypeColumn("association_type")
+
+    assert column.get_value(page) == "Forening"
+
+
+def test_association_type_column_renders_utvalg_display(association_index):
+    page = AssociationPageFactory(
+        parent=association_index,
+        association_type=AssociationPage.AssociationType.UTVALG,
+    )
+    column = AssociationTypeColumn("association_type")
+
+    assert column.get_value(page) == "Utvalg"
+
+
+def test_graphql_association_index_query(association_index, graphql_post):
+    response, body = graphql_post(
+        """
+        query {
+          associationIndex {
+            title
+          }
+        }
+        """
+    )
+
+    assert response.status_code == 200
+    assert "errors" not in body, body
+    assert body["data"]["associationIndex"]["title"] == association_index.title

dnscms/tests/test_events.py

@@ -2,8 +2,11 @@ from datetime import datetime, timedelta
 
 import pytest
 from django.core.exceptions import ValidationError
+from django.db import connection
+from django.test.utils import CaptureQueriesContext
 from django.utils import timezone
 
+from events.admin import EventDateColumn, OrganizersColumn
 from events.models import (
     EventCategory,
     EventOccurrence,
@@ -11,6 +14,7 @@ from events.models import (
     EventOrganizerLink,
     EventPage,
 )
+from events.views import EventOrganizerCreationForm
 from tests.conftest import (
     AssociationPageFactory,
     CustomImageFactory,
@@ -101,6 +105,57 @@ def test_eventoccurrence_clean_rejects_both_venue_and_venue_custom(event_index,
     assert "venue_custom" in exc.value.message_dict
 
 
+def test_eventoccurrence_clean_promotes_matching_custom_text_to_venue(event_index, venue):
+    event = EventPageFactory(parent=event_index)
+    occurrence = EventOccurrence(
+        event=event,
+        start=timezone.now(),
+        venue_custom=f"  {venue.title}  ",
+    )
+
+    occurrence.clean()
+
+    assert occurrence.venue_id == venue.pk
+    assert occurrence.venue_custom == ""
+
+
+def test_event_organizer_creation_form_auto_slugifies_name(db):
+    form = EventOrganizerCreationForm(data={"name": "Forening for ÆØÅ", "external_url": ""})
+
+    assert form.is_valid(), form.errors
+    organizer = form.save()
+
+    assert organizer.pk is not None
+    assert organizer.name == "Forening for ÆØÅ"
+    assert organizer.slug == "forening-for-aeoa"
+
+
+def test_event_organizer_creation_form_keeps_explicit_slug(db):
+    organizer = EventOrganizer(name="Forening", slug="custom-slug")
+    form = EventOrganizerCreationForm(
+        data={"name": "Forening", "external_url": ""}, instance=organizer
+    )
+
+    assert form.is_valid(), form.errors
+    organizer = form.save()
+
+    assert organizer.slug == "custom-slug"
+
+
+def test_eventoccurrence_clean_keeps_custom_text_when_no_venue_matches(event_index):
+    event = EventPageFactory(parent=event_index)
+    occurrence = EventOccurrence(
+        event=event,
+        start=timezone.now(),
+        venue_custom="  Frederikkeplassen  ",
+    )
+
+    occurrence.clean()
+
+    assert occurrence.venue is None
+    assert occurrence.venue_custom == "Frederikkeplassen"
+
+
 def test_eventoccurrence_clean_requires_venue_or_venue_custom(event_index):
     event = EventPageFactory(parent=event_index)
     occurrence = EventOccurrence(event=event, start=timezone.now())
@@ -187,6 +242,80 @@ def test_graphql_event_index_future_events_query(event_index, graphql_post):
     assert "Upcoming gig" in titles
 
 
+def test_future_events_does_not_have_n_plus_one_queries(
+    event_index, venue, association_index, graphql_post
+):
+    """Regression test: query count for futureEvents stays bounded as events grow."""
+    konsert = EventCategory.objects.create(name="Konsert", slug="konsert")
+    association = AssociationPageFactory(parent=association_index, title="DNS")
+    org = EventOrganizer.objects.create(name="Forening", slug="forening", association=association)
+    image = CustomImageFactory(title="Cover")
+    now = timezone.now()
+
+    for i in range(5):
+        event = EventPageFactory(
+            parent=event_index,
+            title=f"Event {i}",
+            body=[("paragraph", "<p>x</p>")],
+            featured_image=image,
+        )
+        event.categories.add(konsert)
+        EventOrganizerLink.objects.create(event=event, organizer=org)
+        EventOccurrence.objects.create(
+            event=event,
+            start=now + timedelta(days=i + 1),
+            venue=venue,
+        )
+
+    home_query = """
+        query {
+          eventIndex {
+            futureEvents {
+              id
+              title
+              subtitle
+              body { blockType }
+              featuredImage { url }
+              occurrences { start end venueCustom venue { title } }
+              categories { name slug }
+              organizers { name slug association { title } }
+            }
+          }
+        }
+    """
+
+    with CaptureQueriesContext(connection) as ctx:
+        response, body = graphql_post(home_query)
+
+    assert response.status_code == 200
+    assert "errors" not in body, body
+    assert len(body["data"]["eventIndex"]["futureEvents"]) == 5
+
+    # Bump only alongside an intentional resolver change.
+    max_queries = 6
+    assert len(ctx) <= max_queries, (
+        f"futureEvents took {len(ctx)} queries for 5 events — likely N+1. "
+        f"Captured queries:\n"
+        + "\n".join(f"  {i + 1}. {q['sql'][:120]}" for i, q in enumerate(ctx.captured_queries))
+    )
+
+
+def test_future_events_does_not_load_wp_import_fields(event_index, graphql_post):
+    """wp_* columns must stay deferred and lazy-load on explicit access."""
+    event = EventPageFactory(parent=event_index, wp_raw_content="marker")
+    EventOccurrence.objects.create(
+        event=event, start=timezone.now() + timedelta(days=1), venue_custom="X"
+    )
+
+    with CaptureQueriesContext(connection) as ctx:
+        response, body = graphql_post("{ eventIndex { futureEvents { id } } }")
+
+    assert response.status_code == 200 and "errors" not in body, body
+    sql = "\n".join(q["sql"] for q in ctx.captured_queries)
+    assert "wp_raw_content" not in sql, f"wp_* must be deferred. SQL:\n{sql}"
+    assert EventPage.objects.get(pk=event.pk).wp_raw_content == "marker"
+
+
 def test_graphql_event_index_future_events_ordered_by_next_occurrence(event_index, graphql_post):
     now = timezone.now()
 
@@ -212,6 +341,62 @@ def test_graphql_event_index_future_events_ordered_by_next_occurrence(event_inde
     assert titles.index("Sooner gig") < titles.index("Later gig")
 
 
+def test_event_date_column_no_occurrences(event_index):
+    event = EventPageFactory(parent=event_index)
+    column = EventDateColumn("event_date")
+
+    assert column.get_value(event) == "—"
+
+
+def test_event_date_column_single_occurrence(event_index):
+    event = EventPageFactory(parent=event_index)
+    start = timezone.make_aware(datetime(2025, 7, 22, 19, 30))
+    EventOccurrence.objects.create(event=event, start=start, venue_custom="X")
+    column = EventDateColumn("event_date")
+
+    assert column.get_value(event) == "2025-07-22 kl 19:30"
+
+
+def test_event_date_column_multiple_occurrences_shows_count(event_index):
+    event = EventPageFactory(parent=event_index)
+    now = timezone.now()
+    EventOccurrence.objects.create(event=event, start=now, venue_custom="X")
+    EventOccurrence.objects.create(event=event, start=now + timedelta(days=1), venue_custom="X")
+    EventOccurrence.objects.create(event=event, start=now + timedelta(days=2), venue_custom="X")
+    column = EventDateColumn("event_date")
+
+    assert column.get_value(event) == "3 forekomster"
+
+
+def test_organizers_column_no_organizers(event_index):
+    event = EventPageFactory(parent=event_index)
+    column = OrganizersColumn("organizers")
+
+    assert column.get_value(event) == "—"
+
+
+def test_organizers_column_single_organizer_shows_name(event_index):
+    org = EventOrganizer.objects.create(name="Forening A", slug="forening-a")
+    event = EventPageFactory(parent=event_index)
+    EventOrganizerLink.objects.create(event=event, organizer=org)
+    column = OrganizersColumn("organizers")
+
+    assert column.get_value(event) == "Forening A"
+
+
+def test_organizers_column_multiple_organizers_truncates_with_count(event_index):
+    org_a = EventOrganizer.objects.create(name="Forening A", slug="forening-a")
+    org_b = EventOrganizer.objects.create(name="Forening B", slug="forening-b")
+    org_c = EventOrganizer.objects.create(name="Forening C", slug="forening-c")
+    event = EventPageFactory(parent=event_index)
+    EventOrganizerLink.objects.create(event=event, organizer=org_a, sort_order=0)
+    EventOrganizerLink.objects.create(event=event, organizer=org_b, sort_order=1)
+    EventOrganizerLink.objects.create(event=event, organizer=org_c, sort_order=2)
+    column = OrganizersColumn("organizers")
+
+    assert column.get_value(event) == "Forening A (+2)"
+
+
 @pytest.fixture
 def comprehensive_event(event_index, venue, association_index):
     """A fully-populated paid EventPage exercising every field exposed via GraphQL."""

dnscms/tests/test_news.py

@@ -1,3 +1,4 @@
+from news.admin import NewsSidebarViewSet
 from news.models import NewsPage
 from tests.conftest import NewsPageFactory
 
@@ -10,6 +11,11 @@ def test_news_page_persists_via_factory(news_index):
     assert reloaded.excerpt == "Short summary"
 
 
+def test_news_sidebar_viewset_wired_to_newspage():
+    assert NewsSidebarViewSet.model is NewsPage
+    assert NewsSidebarViewSet.add_to_admin_menu is True
+
+
 def test_graphql_news_index_query(news_index, graphql_post):
     response, body = graphql_post(
         """

dnscms/tests/test_preview.py

@@ -0,0 +1,37 @@
+"""Round-trip tests for wagtail-headless-preview token resolution via grapple."""
+
+from generic.models import GenericPage
+from tests.conftest import GenericPageFactory
+
+
+def test_generic_page_preview_token_resolves_draft(home_page, graphql_post):
+    """A minted preview token returns the unsaved draft via grapple's page(token: …)."""
+    # Publish a baseline so there's a live revision to diverge from.
+    page = GenericPageFactory(parent=home_page, title="Original title", slug="generic-preview")
+
+    # Mutate in-memory to simulate unsaved editor state, then mint a token.
+    # create_page_preview() snapshots the current to_json() into a PagePreview row.
+    page.title = "Edited title (draft)"
+    preview = page.create_page_preview()
+
+    response, body = graphql_post(
+        """
+        query previewPage($token: String!) {
+          page: page(token: $token) {
+            __typename
+            ... on GenericPage {
+              title
+            }
+          }
+        }
+        """,
+        variables={"token": preview.token},
+    )
+
+    assert response.status_code == 200
+    assert "errors" not in body, body
+    assert body["data"]["page"]["__typename"] == "GenericPage"
+    assert body["data"]["page"]["title"] == "Edited title (draft)"
+
+    # Live revision is unchanged — token short-circuits the published query.
+    assert GenericPage.objects.get(pk=page.pk).title == "Original title"

dnscms/tests/test_search.py

@@ -0,0 +1,131 @@
+from wagtail.search.backends import get_search_backend
+
+from tests.conftest import EventPageFactory, GenericPageFactory
+
+
+SEARCH_QUERY = """
+query Search($query: String) {
+  results: search(query: $query) {
+    __typename
+    ... on PageInterface {
+      title
+    }
+  }
+}
+"""
+
+
+def _index(page):
+    # Wagtail's post_save signal enqueues indexing via django-tasks, which isn't
+    # drained synchronously in tests. Call the backend directly so the page is
+    # findable through the live search code path.
+    get_search_backend().add(page)
+
+
+def _titles_for(body, typename):
+    return [r["title"] for r in body["data"]["results"] if r["__typename"] == typename]
+
+
+def test_search_returns_live_generic_page(home_page, graphql_post):
+    page = GenericPageFactory(
+        parent=home_page,
+        title="PublishedGenericSearchToken",
+        slug="published-generic-search",
+    )
+    _index(page)
+
+    response, body = graphql_post(SEARCH_QUERY, {"query": "PublishedGenericSearchToken"})
+
+    assert response.status_code == 200
+    assert "errors" not in body, body
+    assert "PublishedGenericSearchToken" in _titles_for(body, "GenericPage")
+
+
+def test_search_excludes_draft_generic_page(home_page, graphql_post):
+    page = GenericPageFactory(
+        parent=home_page,
+        title="DraftGenericSearchToken",
+        slug="draft-generic-search",
+        live=False,
+    )
+    _index(page)
+
+    response, body = graphql_post(SEARCH_QUERY, {"query": "DraftGenericSearchToken"})
+
+    assert response.status_code == 200
+    assert "errors" not in body, body
+    assert "DraftGenericSearchToken" not in _titles_for(body, "GenericPage")
+
+
+def test_search_returns_live_event_page(home_page, event_index, graphql_post):
+    page = EventPageFactory(
+        parent=event_index,
+        title="PublishedEventSearchToken",
+        slug="published-event-search",
+    )
+    _index(page)
+
+    response, body = graphql_post(SEARCH_QUERY, {"query": "PublishedEventSearchToken"})
+
+    assert response.status_code == 200
+    assert "errors" not in body, body
+    assert "PublishedEventSearchToken" in _titles_for(body, "EventPage")
+
+
+def test_search_excludes_draft_event_page(home_page, event_index, graphql_post):
+    page = EventPageFactory(
+        parent=event_index,
+        title="DraftEventSearchToken",
+        slug="draft-event-search",
+        live=False,
+    )
+    _index(page)
+
+    response, body = graphql_post(SEARCH_QUERY, {"query": "DraftEventSearchToken"})
+
+    assert response.status_code == 200
+    assert "errors" not in body, body
+    assert "DraftEventSearchToken" not in _titles_for(body, "EventPage")
+
+
+def test_search_results_not_grouped_by_type(home_page, event_index, graphql_post):
+    # Two pages of different types matching the query equally, plus a third
+    # page of one of those types that should rank highest. Under the
+    # per-model-iteration resolver, all Generic results come before all Event
+    # results (or vice versa) — type-grouped — so the highest-relevance Event
+    # ends up after a less-relevant Generic. Cross-type relevance ordering
+    # should put the strongest match first regardless of type.
+    weak_generic = GenericPageFactory(
+        parent=home_page,
+        title="Klatremus klatremus klatremus",
+        slug="weak-generic",
+    )
+    weak_event = EventPageFactory(
+        parent=event_index,
+        title="Klatremus klatremus klatremus",
+        slug="weak-event",
+    )
+    strong_event = EventPageFactory(
+        parent=event_index,
+        title="Klatremus klatremus klatremus klatremus klatremus klatremus",
+        slug="strong-event",
+    )
+    _index(weak_generic)
+    _index(weak_event)
+    _index(strong_event)
+
+    response, body = graphql_post(SEARCH_QUERY, {"query": "klatremus"})
+
+    assert response.status_code == 200
+    assert "errors" not in body, body
+    order = [
+        (r["__typename"], r["title"])
+        for r in body["data"]["results"]
+        if r["__typename"] in ("GenericPage", "EventPage")
+    ]
+    assert len(order) == 3, order
+    # Per-type grouping would put all results of one type consecutively
+    # before the other type. Cross-type relevance ordering should interleave.
+    types_seen = [t for t, _ in order]
+    assert types_seen != ["GenericPage", "EventPage", "EventPage"], order
+    assert types_seen != ["EventPage", "EventPage", "GenericPage"], order

dnscms/tests/test_slugs.py

@@ -0,0 +1,41 @@
+import pytest
+
+from dnscms.utils import slugify
+from events.models import EventCategory, EventOrganizer
+from tests.conftest import GenericPageFactory
+
+
+def test_slugify_transliterates_norwegian_letters():
+    assert slugify("Bjørn") == "bjorn"
+    assert slugify("Møterom") == "moterom"
+    assert slugify("Forening for ÆØÅ") == "forening-for-aeoa"
+
+
+def test_slugify_is_idempotent_on_ascii():
+    assert slugify("already-clean-slug") == "already-clean-slug"
+
+
+def test_page_save_transliterates_unicode_in_slug(home_page):
+    page = GenericPageFactory(parent=home_page, title="Møterom", slug="møterom")
+
+    assert page.slug == "moterom"
+
+
+def test_page_save_leaves_clean_slug_untouched(home_page):
+    page = GenericPageFactory(parent=home_page, title="Om oss", slug="om-oss")
+
+    assert page.slug == "om-oss"
+
+
+@pytest.mark.django_db
+def test_event_organizer_save_transliterates_unicode_in_slug():
+    organizer = EventOrganizer.objects.create(name="Bjørn", slug="bjørn")
+
+    assert organizer.slug == "bjorn"
+
+
+@pytest.mark.django_db
+def test_event_category_save_transliterates_unicode_in_slug():
+    category = EventCategory.objects.create(name="Mørkerom", slug="mørkerom")
+
+    assert category.slug == "morkerom"

dnscms/uv.lock

@@ -255,6 +255,7 @@ dependencies = [
     { name = "psycopg2-binary" },
     { name = "wagtail" },
     { name = "wagtail-grapple" },
+    { name = "wagtail-headless-preview" },
     { name = "whitenoise" },
 ]
 
@@ -273,8 +274,9 @@ requires-dist = [
     { name = "django-extensions", specifier = ">=4.1,<5" },
     { name = "gunicorn", specifier = ">=26.0.0,<27" },
     { name = "psycopg2-binary", specifier = ">=2.9.12,<3" },
-    { name = "wagtail", specifier = ">=7.4,<8" },
+    { name = "wagtail", specifier = ">=7.4.1,<8" },
     { name = "wagtail-grapple", specifier = ">=0.31.0,<0.32" },
+    { name = "wagtail-headless-preview", specifier = ">=0.8,<0.9" },
     { name = "whitenoise", specifier = ">=6.12.0,<7" },
 ]
 
@@ -729,7 +731,7 @@ wheels = [
 
 [[package]]
 name = "wagtail"
-version = "7.4"
+version = "7.4.1"
 source = { registry = "https://pypi.org/simple" }
 dependencies = [
     { name = "anyascii" },
@@ -751,9 +753,9 @@ dependencies = [
     { name = "telepath" },
     { name = "willow", extra = ["heif"] },
 ]
-sdist = { url = "https://files.pythonhosted.org/packages/a6/10/ad6e496beed01a58656ddc70c16f8a8c269698a568d9054d3d5a57b56655/wagtail-7.4.tar.gz", hash = "sha256:9570c51d61ee524cc5558a84df40e2ccc03f7c50c6dad343644a45d037096d13", size = 6939468, upload-time = "2026-05-05T16:51:18.534Z" }
+sdist = { url = "https://files.pythonhosted.org/packages/81/da/c060bd9ec00335336e04a610cd1d6762e459ade9c4983f7ecddae15af36d/wagtail-7.4.1.tar.gz", hash = "sha256:c7232cbe16afa5842c236e069b2baead3b3e87e9dc90a7493330b54b69e18b83", size = 6944979, upload-time = "2026-05-19T17:26:18.762Z" }
 wheels = [
-    { url = "https://files.pythonhosted.org/packages/15/c1/d8effc43aaf3ba84754f247c2fb97e119534b579486b278d991068629af1/wagtail-7.4-py3-none-any.whl", hash = "sha256:24a4d55e6bed22ccce4aae1b3f7e22a46605c4bc4dc9894d5a415cde418840c6", size = 9587583, upload-time = "2026-05-05T16:51:12.575Z" },
+    { url = "https://files.pythonhosted.org/packages/53/c8/162fff3c5ef9e158127c9f4aa1f0d38edd8d1fa242629ae1d8af3b6306c7/wagtail-7.4.1-py3-none-any.whl", hash = "sha256:a42dc18b0fb818649c0d704ea50a2dea06d1b75614abdf837e90766263645c76", size = 9597601, upload-time = "2026-05-19T17:26:12.53Z" },
 ]
 
 [[package]]

dnscms/venues/admin.py

@@ -0,0 +1,58 @@
+from django.utils.translation import gettext_lazy as _
+from wagtail.admin.ui.tables import BooleanColumn, DateColumn
+from wagtail.admin.ui.tables.pages import PageStatusColumn, PageTitleColumn
+from wagtail.admin.viewsets.pages import PageListingViewSet, PageViewSet
+
+from dnscms.admin import ListingRedirectChooseParentView
+from venues.models import VenuePage
+
+
+class VenueChooseParentView(ListingRedirectChooseParentView):
+    listing_url_name = "venues:index"
+
+
+class VenueListingMixin:
+    """Shared model + columns for the standalone listing and the page explorer."""
+
+    model = VenuePage
+    icon = "home"
+    columns = [
+        PageTitleColumn("title", label=_("Title"), sort_key="title", classname="title"),
+        BooleanColumn(
+            "show_as_bookable",
+            label=_("Rentals page"),
+            sort_key="show_as_bookable",
+            width="10%",
+        ),
+        BooleanColumn(
+            "show_in_overview",
+            label=_("Venue overview"),
+            sort_key="show_in_overview",
+            width="10%",
+        ),
+        DateColumn(
+            "latest_revision_created_at",
+            label=_("Updated"),
+            sort_key="latest_revision_created_at",
+            width="10%",
+        ),
+        PageStatusColumn("status", label=_("Status"), sort_key="live", width="10%"),
+    ]
+
+
+class VenueSidebarViewSet(VenueListingMixin, PageListingViewSet):
+    """Standalone 'Venues' sidebar entry, reached independently of the page tree."""
+
+    choose_parent_view_class = VenueChooseParentView
+    menu_label = _("Venues")
+    menu_order = 4
+    add_to_admin_menu = True
+    ordering = "title"
+
+
+class VenueExplorerViewSet(VenueListingMixin, PageViewSet):
+    """Applies the same columns when navigating into VenueIndex via the page explorer."""
+
+
+venue_sidebar_viewset = VenueSidebarViewSet("venues")
+venue_explorer_viewset = VenueExplorerViewSet()

dnscms/venues/migrations/0025_verbose_names.py

@@ -0,0 +1,25 @@
+# Generated by Django 6.0.5 on 2026-05-25 23:40
+
+from django.db import migrations
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('venues', '0024_venuepage_show_in_overview_and_more'),
+    ]
+
+    operations = [
+        migrations.AlterModelOptions(
+            name='venueindex',
+            options={'verbose_name': 'venue index', 'verbose_name_plural': 'venue indexes'},
+        ),
+        migrations.AlterModelOptions(
+            name='venuepage',
+            options={'verbose_name': 'venue', 'verbose_name_plural': 'venues'},
+        ),
+        migrations.AlterModelOptions(
+            name='venuerentalindex',
+            options={'verbose_name': 'rentals page', 'verbose_name_plural': 'rentals pages'},
+        ),
+    ]

dnscms/venues/models.py

@@ -1,4 +1,5 @@
 from django.db import models
+from django.utils.translation import gettext_lazy as _
 from grapple.helpers import register_singular_query_field
 from grapple.models import (
     GraphQLBoolean,
@@ -9,16 +10,21 @@ from grapple.models import (
 )
 from wagtail.admin.panels import FieldPanel, FieldRowPanel, MultiFieldPanel
 from wagtail.fields import RichTextField, StreamField
-from wagtail.models import Page
+from wagtail.models import Page, PageManager
 from wagtail.search import index
+from wagtail_headless_preview.models import HeadlessMixin
 
 from dnscms.blocks import ImageSliderBlock
 from dnscms.fields import CommonStreamField
-from dnscms.wordpress.models import WPImportedPageMixin
+from dnscms.wordpress.models import DeferWPFieldsManagerMixin, WPImportedPageMixin
+
+
+class VenuePageManager(DeferWPFieldsManagerMixin, PageManager):
+    pass
 
 
 @register_singular_query_field("venueIndex")
-class VenueIndex(Page):
+class VenueIndex(HeadlessMixin, Page):
     # there can only be one venue index page
     max_count = 1
     subpage_types = ["venues.VenuePage"]
@@ -33,9 +39,13 @@ class VenueIndex(Page):
 
     graphql_fields = [GraphQLRichText("lead"), GraphQLStreamfield("body")]
 
+    class Meta:
+        verbose_name = _("venue index")
+        verbose_name_plural = _("venue indexes")
+
 
 @register_singular_query_field("venueRentalIndex")
-class VenueRentalIndex(Page):
+class VenueRentalIndex(HeadlessMixin, Page):
     # there can only be one venue index page
     max_count = 1
     subpage_types = []
@@ -50,14 +60,20 @@ class VenueRentalIndex(Page):
 
     graphql_fields = [GraphQLRichText("lead"), GraphQLStreamfield("body")]
 
+    class Meta:
+        verbose_name = _("rentals page")
+        verbose_name_plural = _("rentals pages")
 
-class VenuePage(WPImportedPageMixin, Page):
+
+class VenuePage(HeadlessMixin, WPImportedPageMixin, Page):
     # no children
     subpage_types = []
     parent_page_types = ["venues.VenueIndex"]
     # should not be able to be shown in menus
     show_in_menus = False
 
+    objects = VenuePageManager()
+
     featured_image = models.ForeignKey(
         "images.CustomImage",
         null=True,
@@ -178,41 +194,6 @@ class VenuePage(WPImportedPageMixin, Page):
         index.SearchField("body"),
     ]
 
-    def import_wordpress_data(self, data):
+    class Meta:
-        import html
+        verbose_name = _("venue")
-
+        verbose_name_plural = _("venues")
-        # Wagtail page model fields
-        self.title = html.unescape(data["title"])
-        self.slug = data["slug"]
-        self.first_published_at = data["first_published_at"]
-        self.last_published_at = data["last_published_at"]
-        self.latest_revision_created_at = data["latest_revision_created_at"]
-        self.search_description = data["search_description"]
-
-        # debug fields
-        self.wp_post_id = data["wp_post_id"]
-        self.wp_post_type = data["wp_post_type"]
-        self.wp_link = data["wp_link"]
-        self.wp_raw_content = data["wp_raw_content"]
-        self.wp_block_json = data["wp_block_json"]
-        self.wp_processed_content = data["wp_processed_content"]
-        self.wp_normalized_styles = data["wp_normalized_styles"]
-        self.wp_post_meta = data["wp_post_meta"]
-
-        # own model fields
-        self.body = data["body"] or ""
-
-        meta = data["wp_post_meta"]
-        self.show_as_bookable = meta.get("neuf_venues_show_on_booking_page", False)
-        self.preposition = meta.get("neuf_venues_preposition") or ""
-        self.floor = meta.get("neuf_venues_floor") or ""
-        self.used_for = meta.get("neuf_venues_used_for") or ""
-
-        self.capability_bar = meta.get("neuf_venues_bar") or ""
-        self.capability_audio = meta.get("neuf_venues_audio") or ""
-        self.capability_lighting = meta.get("neuf_venues_lighting") or ""
-        self.capability_audio_video = meta.get("neuf_venues_audio_video") or ""
-
-        self.capacity_legal = meta.get("neuf_venues_capacity_legal") or ""
-        self.capacity_standing = meta.get("neuf_venues_capacity_standing") or ""
-        self.capacity_sitting = meta.get("neuf_venues_capacity_sitting") or ""

dnscms/venues/wagtail_hooks.py

@@ -0,0 +1,13 @@
+from wagtail import hooks
+
+from .admin import venue_explorer_viewset, venue_sidebar_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_venue_sidebar_viewset():
+    return venue_sidebar_viewset
+
+
+@hooks.register("register_admin_viewset")
+def register_venue_explorer_viewset():
+    return venue_explorer_viewset

prek.toml

@@ -1,3 +1,5 @@
+exclude = '^web/src/gql/'
+
 [[repos]]
 repo = "https://github.com/pre-commit/pre-commit-hooks"
 rev = "v6.0.0"

web/.env

@@ -1,2 +1,2 @@
-GRAPHQL_ENDPOINT=https://cms.neuf.no/api/graphql/
+WAGTAIL_BASE_URL=https://cms.neuf.no
 URL=http://localhost:3000

web/codegen.ts

@@ -3,8 +3,14 @@ import { CodegenConfig } from "@graphql-codegen/cli";
 import { loadEnvConfig } from "@next/env";
 loadEnvConfig(process.cwd());
 
+const wagtailBaseUrl = process.env.WAGTAIL_BASE_URL;
+if (!wagtailBaseUrl) {
+  throw new Error("WAGTAIL_BASE_URL is not set");
+}
+const graphqlEndpoint = `${wagtailBaseUrl.replace(/\/$/, "")}/api/graphql/`;
+
 const config: CodegenConfig = {
-  schema: process.env.GRAPHQL_ENDPOINT,
+  schema: graphqlEndpoint,
   documents: ["src/**/*.tsx", "src/**/*.ts"],
   ignoreNoDocuments: true, // for better experience with the watcher
   generates: {

web/next.config.mjs

@@ -16,6 +16,8 @@ const nextConfig = {
         hostname: "**",
       },
     ],
+    formats: ["image/avif", "image/webp"],
+    dangerouslyAllowLocalIP: process.env.NODE_ENV === "development",
   },
   turbopack: {
     root: __dirname,

web/package.json

@@ -7,7 +7,12 @@
     "build": "next build",
     "start": "next start",
     "lint": "next lint",
-    "codegen": "graphql-codegen"
+    "codegen": "graphql-codegen",
+    "perf:build": "next build",
+    "perf:serve": "next start -p 3100",
+    "perf:lh:desktop": "lighthouse http://localhost:3100/ --preset=desktop --output=html --output=json --output-path=../scratch/lighthouse/home-desktop --only-categories=performance --chrome-flags=\"--headless=new\" --quiet",
+    "perf:lh:mobile": "lighthouse http://localhost:3100/ --output=html --output=json --output-path=../scratch/lighthouse/home-mobile --only-categories=performance --chrome-flags=\"--headless=new\" --quiet",
+    "perf:lh": "wait-on http://localhost:3100/ && npm run perf:lh:desktop && npm run perf:lh:mobile"
   },
   "dependencies": {
     "@graphql-codegen/cli": "^7.0.0",
@@ -36,10 +41,16 @@
     "baseline-browser-mapping": "^2.10.29",
     "eslint": "^9",
     "eslint-config-next": "16.2.6",
-    "typescript": "^6"
+    "lighthouse": "^13.3.0",
+    "typescript": "^6",
+    "wait-on": "^9.0.10"
   },
   "overrides": {
     "@types/react": "19.2.14",
     "@types/react-dom": "19.2.3"
-  }
+  },
+  "browserslist": [
+    "> 0.5% in NO",
+    "not dead"
+  ]
 }

web/public/assets/graphics/grisemonster-note.txt

@@ -0,0 +1,51 @@
+grisemonster image variants
+===========================
+
+Source: grisemonster-lossless-original.png (2048x1024 RGBA PNG, 2.0M)
+
+Files in use
+------------
+grisemonster-2048.png  443K  desktop (>1280px viewport)
+grisemonster-1280.png  227K  tablet  (601-1280px)
+grisemonster-800.png    97K  mobile  (<=600px)
+
+The previous single grisemonster.png was 624K served to every device.
+Mobile now downloads 97K (-84%); desktop downloads 443K (-29%).
+
+How they were generated
+-----------------------
+For each width W in {2048, 1280, 800}:
+
+    magick grisemonster-lossless-original.png -resize ${W}x base.png
+    pngquant 64 --quality=50-80 --speed 1 --output grisemonster-${W}.png base.png
+    oxipng -o max --strip safe grisemonster-${W}.png
+
+pngquant reduces to a 64-colour palette (the image is a flat
+illustration with very few distinct colours, so this is visually
+lossless at the displayed scale). oxipng then does a lossless
+re-encode pass to squeeze the PNG further.
+
+Wired up in src/components/layout/footer.module.scss via two
+min-width media queries on `.pigPattern`'s background-image.
+
+Why PNG, not WebP/AVIF
+----------------------
+Tested at 2048 width:
+
+    PNG  (pngquant 64 + oxipng)   443K   <-- chosen
+    PNG  (pngquant 256 + oxipng)  522K
+    AVIF q50                      493K
+    AVIF q60                      598K
+    AVIF q75                      718K
+    WebP q75                      829K   larger than current PNG
+    WebP q85                      903K   larger than current PNG
+    WebP lossless                 1.0M   larger than current PNG
+
+For this kind of content -- a flat, limited-palette illustration with
+large transparent regions -- palette PNG is the smallest format.
+WebP and AVIF are tuned for photographic content and lose to a
+well-quantised PNG here. Visual quality of the three PNG/AVIF options
+above was indistinguishable at the rendered scale.
+
+Conclusion: the win came from responsive sizing, not from changing
+format. Stayed on PNG to keep the CSS simple (no image-set() needed).

web/src/app/[...url]/page.tsx

@@ -1,41 +1,15 @@
 import { graphql } from "@/gql";
-import { GenericFragment } from "@/gql/graphql";
 import { getClient } from "@/app/client";
 import { Metadata, ResolvingMetadata } from "next";
 import { notFound } from "next/navigation";
-import { PageHeader } from "@/components/general/PageHeader";
+import {
-import { PageContent } from "@/components/general/PageContent";
+  GenericPageView,
-import { BgPig } from "@/components/general/BgPig";
+  loadGenericPageProps,
+} from "@/components/general/GenericPageView";
 import { getSeoMetadata } from "@/lib/seo";
 
 export const dynamicParams = false;
 
-const GenericFragmentDefinition = graphql(`
-  fragment Generic on GenericPage {
-    __typename
-    id
-    urlPath
-    seoTitle
-    searchDescription
-    title
-    lead
-    pig
-    body {
-      ...Blocks
-    }
-  }
-`);
-
-const genericPageByUrlPathQuery = graphql(`
-  query genericPageByUrl($urlPath: String!) {
-    page: page(contentType: "generic.GenericPage", urlPath: $urlPath) {
-      ... on GenericPage {
-        ...Generic
-      }
-    }
-  }
-`);
-
 function getWagtailUrlPath(url: string[]): string {
   // for the page /foo/bar we need to look for `/home/foo/bar/`
   return `/home/${url.join("/")}/`;
@@ -78,46 +52,14 @@ export async function generateMetadata(
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
   const { url } = await params;
-  const urlPath = getWagtailUrlPath(url);
+  const props = await loadGenericPageProps({ urlPath: getWagtailUrlPath(url) });
-  const { data, error } = await getClient().query(genericPageByUrlPathQuery, {
+  if (!props) return null;
-    urlPath: urlPath,
+  return getSeoMetadata(props.page, parent);
-  });
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.page) {
-    return null;
-  }
-
-  const page = data.page as GenericFragment;
-  const metadata = await getSeoMetadata(page, parent);
-  return metadata;
 }
 
 export default async function Page({ params }: { params: Params }) {
   const { url } = await params;
-  const urlPath = getWagtailUrlPath(url);
+  const props = await loadGenericPageProps({ urlPath: getWagtailUrlPath(url) });
-  const { data, error } = await getClient().query(genericPageByUrlPathQuery, {
+  if (!props) return notFound();
-    urlPath: urlPath,
+  return <GenericPageView {...props} />;
-  });
-  if (error) {
-    throw new Error(error.message);
-  }
-
-  if (!data?.page) {
-    return notFound();
-  }
-
-  const page = data?.page as GenericFragment;
-
-  return (
-    <>
-      <main className="site-main" id="main">
-        <PageHeader heading={page.title} lead={page.lead} />
-        <PageContent blocks={page.body} />
-      </main>
-      {page.pig && <BgPig type={page.pig} color="white" />}
-    </>
-  );
 }

web/src/app/aktuelt/[slug]/page.tsx

@@ -1,24 +1,13 @@
 import { Metadata, ResolvingMetadata } from "next";
 import { notFound } from "next/navigation";
 import { getClient } from "@/app/client";
-import { Breadcrumb } from "@/components/general/Breadcrumb";
+import {
-import { ImageFigure } from "@/components/general/Image";
+  NewsPageView,
-import { PageContent } from "@/components/general/PageContent";
+  loadNewsPageProps,
+} from "@/components/news/NewsPageView";
 import { graphql } from "@/gql";
-import { NewsFragment } from "@/gql/graphql";
-import { formatDate } from "@/lib/date";
 import { getSeoMetadata } from "@/lib/seo";
 
-const newsBySlugQuery = graphql(`
-  query newsBySlug($slug: String!) {
-    news: page(contentType: "news.NewsPage", slug: $slug) {
-      ... on NewsPage {
-        ...News
-      }
-    }
-  }
-`);
-
 export async function generateStaticParams() {
   const allNewsSlugsQuery = graphql(`
     query allNewsSlugs {
@@ -51,62 +40,14 @@ export async function generateMetadata(
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
   const { slug } = await params;
-  const { data, error } = await getClient().query(newsBySlugQuery, {
+  const props = await loadNewsPageProps({ slug });
-    slug,
+  if (!props) return null;
-  });
+  return getSeoMetadata(props.news, parent);
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.news) {
-    return null;
-  }
-  const news = data.news as NewsFragment;
-  const metadata = await getSeoMetadata(news, parent);
-  return metadata;
 }
 
 export default async function Page({ params }: { params: Params }) {
   const { slug } = await params;
-  const { data, error } = await getClient().query(newsBySlugQuery, {
+  const props = await loadNewsPageProps({ slug });
-    slug,
+  if (!props) return notFound();
-  });
+  return <NewsPageView {...props} />;
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.news) {
-    return notFound();
-  }
-
-  const news = data?.news as NewsFragment;
-  const featuredImage: any = news.featuredImage;
-  return (
-    <main className="site-main" id="main">
-      <section className="news-header">
-        <Breadcrumb
-          link="/aktuelt"
-          text="Nyhet"
-          date={news.firstPublishedAt ? formatDate(news.firstPublishedAt, "d. MMMM yyyy") : ""}
-        />
-        <h1 className="news-title">{news.title}</h1>
-        {news.lead && (
-          <div
-            className="lead"
-            dangerouslySetInnerHTML={{ __html: news.lead }}
-          />
-        )}
-        {featuredImage && (
-          <ImageFigure
-            src={featuredImage.url}
-            alt={featuredImage.alt ?? ""}
-            width={featuredImage.width}
-            height={featuredImage.height}
-            attribution={featuredImage.attribution}
-            sizes="100vw"
-          />
-        )}
-      </section>
-      <PageContent blocks={news.body} />
-    </main>
-  );
 }

web/src/app/aktuelt/page.tsx

@@ -1,39 +1,24 @@
-import { getClient } from "@/app/client";
-import { NewsList } from "@/components/news/NewsList";
 import { Metadata, ResolvingMetadata } from "next";
-import { PageHeader } from "@/components/general/PageHeader";
+import { getClient } from "@/app/client";
-import { newsQuery, NewsFragment, NewsIndexFragment } from "@/lib/news";
+import {
+  NewsIndexView,
+  loadNewsIndexProps,
+} from "@/components/news/NewsIndexView";
+import { NewsIndexFragment } from "@/gql/graphql";
+import { newsIndexMetadataQuery } from "@/lib/news";
 import { getSeoMetadata } from "@/lib/seo";
 
 export async function generateMetadata(
-  { params }: { params: Promise<{}> },
+  _: unknown,
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
-  const { data, error } = await getClient().query(newsQuery, {});
+  const { data, error } = await getClient().query(newsIndexMetadataQuery, {});
-  if (error) {
+  if (error) throw new Error(error.message);
-    throw new Error(error.message);
+  if (!data?.index) return null;
-  }
+  return getSeoMetadata(data.index as NewsIndexFragment, parent);
-  if (!data?.index) {
-    return null;
-  }
-
-  const index = data.index as NewsIndexFragment;
-  const metadata = await getSeoMetadata(index, parent);
-  return metadata;
 }
 
 export default async function Page() {
-  const { data, error } = await getClient().query(newsQuery, {});
+  const props = await loadNewsIndexProps();
-  if (error) {
+  return <NewsIndexView {...props} />;
-    throw new Error(error.message);
-  }
-  const news = (data?.news ?? []) as NewsFragment[];
-  const index = data?.index as NewsIndexFragment;
-
-  return (
-    <main className="site-main" id="main">
-      <PageHeader heading={index.title} lead={index.lead} align="left" />
-      <NewsList news={news} />
-    </main>
-  );
 }

web/src/app/api/preview/disable/route.ts

@@ -0,0 +1,7 @@
+import { cookies, draftMode } from "next/headers";
+
+export async function POST() {
+  (await draftMode()).disable();
+  (await cookies()).delete("preview-token");
+  return new Response(null, { status: 204 });
+}

web/src/app/api/preview/route.ts

@@ -0,0 +1,25 @@
+import { cookies, draftMode } from "next/headers";
+import { redirect } from "next/navigation";
+import { NextRequest } from "next/server";
+
+// Wagtail-headless-preview directs the editor's preview iframe here with
+// ?content_type=app.Model&token=<signed>. We stash the token in a cookie,
+// enable Next.js draft mode, and redirect to the type-dispatching renderer.
+export async function GET(req: NextRequest) {
+  const token = req.nextUrl.searchParams.get("token");
+  const contentType = req.nextUrl.searchParams.get("content_type");
+  if (!token || !contentType) {
+    return new Response("missing token/content_type", { status: 400 });
+  }
+
+  (await draftMode()).enable();
+  (await cookies()).set("preview-token", token, {
+    httpOnly: true,
+    sameSite: "lax",
+    secure: process.env.NODE_ENV === "production",
+    maxAge: 60 * 60 * 24,
+    path: "/",
+  });
+
+  redirect("/preview/render");
+}

web/src/app/api/v1/events/route.ts

@@ -4,7 +4,7 @@ import {
   eventsOverviewQuery,
   getSingularEvents,
   getFutureOccurrences,
-  EventFragment,
+  EventOverviewItemFragment,
   EventCategory,
   EventOrganizer,
 } from "@/lib/event";
@@ -59,7 +59,7 @@ export async function GET(req: NextRequest) {
     throw new Error("Failed to fetch events");
   }
 
-  const futureEvents = (data?.events?.futureEvents ?? []) as EventFragment[];
+  const futureEvents = (data?.events?.futureEvents ?? []) as EventOverviewItemFragment[];
   const eventCategories = (data?.eventCategories ?? []) as EventCategory[];
   const eventOrganizers = (data?.eventOrganizers ?? []) as EventOrganizer[];
   const venues = (data?.venues ?? []) as VenueFragment[];

web/src/app/arrangementer/[slug]/page.tsx

@@ -1,25 +1,13 @@
 import { Metadata, ResolvingMetadata } from "next";
 import { notFound } from "next/navigation";
 import { getClient } from "@/app/client";
-import { EventDetails } from "@/components/events/EventDetails";
+import {
-import { EventHeader } from "@/components/events/EventHeader";
+  EventPageView,
-import { BgPig } from "@/components/general/BgPig";
+  loadEventPageProps,
-import { PageContent } from "@/components/general/PageContent";
+} from "@/components/events/EventPageView";
 import { graphql } from "@/gql";
-import { EventFragment } from "@/gql/graphql";
-import { getEventPig } from "@/lib/event";
 import { getSeoMetadata } from "@/lib/seo";
 
-const eventBySlugQuery = graphql(`
-  query eventBySlug($slug: String!) {
-    event: page(contentType: "events.EventPage", slug: $slug) {
-      ... on EventPage {
-        ...Event
-      }
-    }
-  }
-`);
-
 export async function generateStaticParams() {
   const allEventSlugsQuery = graphql(`
     query allEventSlugs {
@@ -52,52 +40,14 @@ export async function generateMetadata(
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
   const { slug } = await params;
-  const { data, error } = await getClient().query(eventBySlugQuery, {
+  const props = await loadEventPageProps({ slug });
-    slug,
+  if (!props) return null;
-  });
+  return getSeoMetadata(props.event, parent);
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.event) {
-    return null;
-  }
-
-  const event = data.event as EventFragment;
-  const metadata = await getSeoMetadata(event, parent);
-  return metadata;
 }
 
 export default async function Page({ params }: { params: Params }) {
   const { slug } = await params;
-  const { data, error } = await getClient().query(eventBySlugQuery, {
+  const props = await loadEventPageProps({ slug });
-    slug,
+  if (!props) return notFound();
-  });
+  return <EventPageView {...props} />;
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.event) {
-    return notFound();
-  }
-
-  const event = data.event as EventFragment;
-  const eventPig = getEventPig(event);
-
-  return (
-    <>
-      <main className="site-main" id="main">
-        <EventHeader event={event} />
-        <EventDetails event={event} />
-        {event.lead && (
-          <div
-            className="lead event-lead"
-            dangerouslySetInnerHTML={{ __html: event.lead }}
-          />
-        )}
-        <PageContent blocks={event.body} />
-      </main>
-      {eventPig && <BgPig type={eventPig} color="white" />}
-    </>
-  );
 }

web/src/app/arrangementer/page.tsx

@@ -1,68 +1,24 @@
-import { Suspense } from "react";
 import { Metadata, ResolvingMetadata } from "next";
 import { getClient } from "@/app/client";
-import { EventContainer } from "@/components/events/EventContainer";
 import {
-  eventsOverviewQuery,
+  EventIndexView,
-  eventIndexMetadataQuery,
+  loadEventIndexProps,
-  EventFragment,
+} from "@/components/events/EventIndexView";
-  EventCategory,
+import { EventIndexFragment } from "@/gql/graphql";
-  EventOrganizer,
+import { eventIndexMetadataQuery } from "@/lib/event";
-} from "@/lib/event";
-import { PageHeader } from "@/components/general/PageHeader";
-import { EventIndexFragment, VenueFragment } from "@/gql/graphql";
 import { getSeoMetadata } from "@/lib/seo";
 
 export async function generateMetadata(
-  { params }: { params: Promise<{}> },
+  _: unknown,
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
   const { data, error } = await getClient().query(eventIndexMetadataQuery, {});
-
+  if (error) throw new Error(error.message);
-  if (error) {
+  if (!data?.index) return null;
-    throw new Error(error.message);
+  return getSeoMetadata(data.index as EventIndexFragment, parent);
-  }
-  if (!data?.index) {
-    return null;
-  }
-
-  const index = data.index as EventIndexFragment;
-  const metadata = await getSeoMetadata(index, parent);
-  return metadata;
 }
 
 export default async function Page() {
-  const { data, error } = await getClient().query(eventsOverviewQuery, {});
+  const props = await loadEventIndexProps();
-  if (error) {
+  return <EventIndexView {...props} />;
-    throw new Error(error.message);
-  }
-  if (
-    !data?.index ||
-    !data?.events?.futureEvents ||
-    !data?.eventCategories ||
-    !data?.eventOrganizers ||
-    !data?.venues
-  ) {
-    throw new Error("Failed to render /arrangementer");
-  }
-
-  const index = data?.index as EventIndexFragment;
-  const events = (data?.events?.futureEvents ?? []) as EventFragment[];
-  const eventCategories = (data?.eventCategories ?? []) as EventCategory[];
-  const eventOrganizers = (data?.eventOrganizers ?? []) as EventOrganizer[];
-  const venues = (data?.venues ?? []) as VenueFragment[];
-
-  return (
-    <main className="site-main" id="main">
-      <PageHeader heading="Dette skjer på Chateau Neuf" align="left" />
-      <Suspense>
-        <EventContainer
-          events={events}
-          eventCategories={eventCategories}
-          eventOrganizers={eventOrganizers}
-          venues={venues}
-        />
-      </Suspense>
-    </main>
-  );
 }

web/src/app/client.ts

@@ -3,9 +3,15 @@ import "server-only";
 import { cacheExchange, createClient, fetchExchange } from "@urql/core";
 import { registerUrql } from "@urql/next/rsc";
 
+const wagtailBaseUrl = process.env.WAGTAIL_BASE_URL;
+if (!wagtailBaseUrl) {
+  throw new Error("WAGTAIL_BASE_URL is not set");
+}
+const graphqlEndpoint = `${wagtailBaseUrl.replace(/\/$/, "")}/api/graphql/`;
+
 const makeClient = () => {
   return createClient({
-    url: process.env.GRAPHQL_ENDPOINT ?? "",
+    url: graphqlEndpoint,
     exchanges: [cacheExchange, fetchExchange],
     // requestPolicy: "network-only",
     fetchOptions: { next: { revalidate: 0 } },

web/src/app/foreninger/[slug]/page.tsx

@@ -1,25 +1,13 @@
 import { Metadata, ResolvingMetadata } from "next";
 import { notFound } from "next/navigation";
 import { getClient } from "@/app/client";
-import { AssociationHeader } from "@/components/associations/AssociationHeader";
+import {
-import { PageContent } from "@/components/general/PageContent";
+  AssociationPageView,
+  loadAssociationPageProps,
+} from "@/components/associations/AssociationPageView";
 import { graphql } from "@/gql";
-import { AssociationFragment } from "@/gql/graphql";
 import { getSeoMetadata } from "@/lib/seo";
 
-const associationBySlugQuery = graphql(`
-  query associationBySlug($slug: String!) {
-    association: page(
-      contentType: "associations.AssociationPage"
-      slug: $slug
-    ) {
-      ... on AssociationPage {
-        ...Association
-      }
-    }
-  }
-`);
-
 type Params = Promise<{ slug: string }>;
 
 export async function generateMetadata(
@@ -27,20 +15,9 @@ export async function generateMetadata(
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
   const { slug } = await params;
-  const { data, error } = await getClient().query(associationBySlugQuery, {
+  const props = await loadAssociationPageProps({ slug });
-    slug,
+  if (!props) return null;
-  });
+  return getSeoMetadata(props.association, parent);
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.association) {
-    return null;
-  }
-
-  const association = data.association as AssociationFragment;
-  const metadata = await getSeoMetadata(association, parent);
-  return metadata;
 }
 
 export async function generateStaticParams() {
@@ -70,23 +47,7 @@ export async function generateStaticParams() {
 
 export default async function Page({ params }: { params: Params }) {
   const { slug } = await params;
-  const { data, error } = await getClient().query(associationBySlugQuery, {
+  const props = await loadAssociationPageProps({ slug });
-    slug,
+  if (!props) return notFound();
-  });
+  return <AssociationPageView {...props} />;
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.association) {
-    return notFound();
-  }
-
-  const association = data.association as AssociationFragment;
-
-  return (
-    <main className="site-main" id="main">
-      <AssociationHeader association={association} />
-      <PageContent blocks={association.body} />
-    </main>
-  );
 }

web/src/app/foreninger/page.tsx

@@ -1,106 +1,19 @@
 import { Metadata, ResolvingMetadata } from "next";
-import { graphql } from "@/gql";
+import {
-import { AssociationFragment, AssociationIndexFragment } from "@/gql/graphql";
+  AssociationIndexView,
-import { getClient } from "@/app/client";
+  loadAssociationIndexProps,
-import { AssociationList } from "@/components/associations/AssociationList";
+} from "@/components/associations/AssociationIndexView";
-import { PageHeader } from "@/components/general/PageHeader";
-import { PageContent } from "@/components/general/PageContent";
 import { getSeoMetadata } from "@/lib/seo";
 
-const allAssociationsQuery = graphql(`
-  query allAssociations {
-    index: associationIndex {
-      ... on AssociationIndex {
-        ...AssociationIndex
-      }
-    }
-    associations: pages(
-      contentType: "associations.AssociationPage"
-      limit: 1000
-    ) {
-      ... on AssociationPage {
-        ...Association
-      }
-    }
-  }
-`);
-
 export async function generateMetadata(
-  { params }: { params: Promise<{}> },
+  _: unknown,
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
-  const { data, error } = await getClient().query(allAssociationsQuery, {});
+  const { index } = await loadAssociationIndexProps();
-
+  return getSeoMetadata(index, parent);
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.index) {
-    return null;
-  }
-
-  const index = data.index as AssociationIndexFragment;
-  const metadata = await getSeoMetadata(index, parent);
-  return metadata;
 }
 
-const AssociationIndexDefinition = graphql(`
-  fragment AssociationIndex on AssociationIndex {
-    ... on AssociationIndex {
-      title
-      seoTitle
-      searchDescription
-      lead
-      body {
-        ...Blocks
-      }
-    }
-  }
-`);
-
-const AssociationFragmentDefinition = graphql(`
-  fragment Association on AssociationPage {
-    __typename
-    id
-    slug
-    title
-    seoTitle
-    searchDescription
-    excerpt
-    lead
-    body {
-      ...Blocks
-    }
-    logo {
-      url
-      width
-      height
-    }
-    associationType
-    websiteUrl
-  }
-`);
-
 export default async function Page() {
-  const { data, error } = await getClient().query(allAssociationsQuery, {});
+  const props = await loadAssociationIndexProps();
-
+  return <AssociationIndexView {...props} />;
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.associations || !data.index) {
-    throw new Error("Failed to render /foreninger");
-  }
-
-  const associations = data.associations as AssociationFragment[];
-  const index = data.index as AssociationIndexFragment;
-
-  return (
-    <main className="site-main" id="main">
-      <PageHeader heading={index.title} lead={index.lead} />
-      {index.body && <PageContent blocks={index.body} />}
-      <AssociationList
-        associations={associations}
-        heading="Foreninger og utvalg"
-      />
-    </main>
-  );
 }

web/src/app/kontakt/page.tsx

@@ -1,72 +1,19 @@
 import { Metadata, ResolvingMetadata } from "next";
-import { notFound } from "next/navigation";
+import {
-import { graphql } from "@/gql";
+  ContactIndexView,
-import { ContactIndexFragment } from "@/gql/graphql";
+  loadContactIndexProps,
-import { getClient } from "@/app/client";
+} from "@/components/contact/ContactIndexView";
-import { PageHeader } from "@/components/general/PageHeader";
-import { PageContent } from "@/components/general/PageContent";
-import { GeneralContactBlock } from "@/components/blocks/GeneralContactBlock";
 import { getSeoMetadata } from "@/lib/seo";
 
-const contactQuery = graphql(`
-  query contacts {
-    index: contactIndex {
-      ... on ContactIndex {
-        ...ContactIndex
-      }
-    }
-  }
-`);
-
-const ContactIndexDefinition = graphql(`
-  fragment ContactIndex on ContactIndex {
-    ... on ContactIndex {
-      title
-      seoTitle
-      searchDescription
-      lead
-      body {
-        ...Blocks
-      }
-    }
-  }
-`);
-
 export async function generateMetadata(
-  { params }: { params: Promise<{}> },
+  _: unknown,
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
-  const { data, error } = await getClient().query(contactQuery, {});
+  const { index } = await loadContactIndexProps();
-
+  return getSeoMetadata(index, parent);
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.index) {
-    return null;
-  }
-
-  const index = data.index as ContactIndexFragment;
-  const metadata = await getSeoMetadata(index, parent);
-  return metadata;
 }
 
 export default async function Page() {
-  const { data, error } = await getClient().query(contactQuery, {});
+  const props = await loadContactIndexProps();
-
+  return <ContactIndexView {...props} />;
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.index) {
-    return notFound();
-  }
-
-  const index = data.index as ContactIndexFragment;
-
-  return (
-    <main className="site-main" id="main">
-      <PageHeader heading={index.title} lead={index.lead} />
-      <GeneralContactBlock />
-      {index.body && <PageContent blocks={index.body} />}
-    </main>
-  );
 }

web/src/app/layout.tsx

@@ -34,7 +34,23 @@ export default function RootLayout({
   return (
     <html lang="no">
       <head>
-        <link rel="stylesheet" href="https://use.typekit.net/spa5smt.css" />
+        <link rel="preconnect" href="https://use.typekit.net" crossOrigin="anonymous" />
+        <link rel="preconnect" href="https://p.typekit.net" crossOrigin="anonymous" />
+        {/*
+          Load Adobe Fonts without blocking render: the stylesheet is requested
+          with media="print" (fetched but not applied), then the inline script
+          below swaps it to media="all" once it has loaded.
+        */}
+        <link
+          id="typekit-css"
+          rel="stylesheet"
+          href="https://use.typekit.net/spa5smt.css"
+          media="print"
+          suppressHydrationWarning
+        />
+        <script>
+          {`(function(){var l=document.getElementById('typekit-css');if(!l)return;function s(){l.media='all'}if(l.sheet){s()}else{l.addEventListener('load',s)}})();`}
+        </script>
         {process.env.UMAMI_SCRIPT_URL && process.env.UMAMI_WEBSITE_ID && (
           <script
             defer

web/src/app/lokaler/[slug]/page.tsx

@@ -2,48 +2,24 @@ import { Metadata, ResolvingMetadata } from "next";
 import { notFound } from "next/navigation";
 import { getClient } from "@/app/client";
 import {
-  ImageSliderBlock,
+  VenuePageView,
-  ImageSliderBlockFragmentDefinition,
+  loadVenuePageProps,
-} from "@/components/blocks/ImageSliderBlock";
+} from "@/components/venues/VenuePageView";
-import { Breadcrumb } from "@/components/general/Breadcrumb";
+import { graphql } from "@/gql";
-import { PageContent } from "@/components/general/PageContent";
-import { NeufMap } from "@/components/venues/NeufMap";
-import { VenueInfo } from "@/components/venues/VenueInfo";
-import { graphql, unmaskFragment } from "@/gql";
-import { VenueFragment } from "@/gql/graphql";
 import { getSeoMetadata } from "@/lib/seo";
 
-const venueBySlugQuery = graphql(`
-  query venueBySlug($slug: String!) {
-    venue: page(contentType: "venues.VenuePage", slug: $slug) {
-      ... on VenuePage {
-        ...Venue
-      }
-    }
-  }
-`);
-
 type Params = Promise<{ slug: string }>;
 
+const EXCLUDED_SLUGS = ["hele-huset"];
+
 export async function generateMetadata(
   { params }: { params: Params },
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
   const { slug } = await params;
-  const { data, error } = await getClient().query(venueBySlugQuery, {
+  const props = await loadVenuePageProps({ slug });
-    slug,
+  if (!props) return null;
-  });
+  return getSeoMetadata(props.venue, parent);
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.venue) {
-    return null;
-  }
-
-  const venue = data.venue as VenueFragment;
-  const metadata = await getSeoMetadata(venue, parent);
-  return metadata;
 }
 
 export async function generateStaticParams() {
@@ -66,45 +42,19 @@ export async function generateStaticParams() {
     );
   }
 
-  return data.pages.map((page: any) => ({
+  return data.pages
+    .filter((page) => !EXCLUDED_SLUGS.includes(page.slug))
+    .map((page) => ({
       slug: page.slug,
     }));
 }
 
 export default async function Page({ params }: { params: Params }) {
   const { slug } = await params;
-  const { data, error } = await getClient().query(venueBySlugQuery, {
+  if (EXCLUDED_SLUGS.includes(slug)) {
-    slug,
-  });
-
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.venue) {
     return notFound();
   }
-
+  const props = await loadVenuePageProps({ slug });
-  const venue = data.venue as VenueFragment;
+  if (!props) return notFound();
-  const featuredImage: any = venue.featuredImage;
+  return <VenuePageView {...props} />;
-
-  return (
-    <main className="site-main" id="main">
-      {venue.images?.[0]?.__typename === "ImageSliderBlock" && (
-        <ImageSliderBlock
-          block={unmaskFragment(
-            ImageSliderBlockFragmentDefinition,
-            venue.images[0]
-          )}
-          hero
-        />
-      )}
-      <div className="page-header-small">
-        <Breadcrumb link="/utleie" text="Lokale" />
-        <h1 className="page-title">{venue.title}</h1>
-      </div>
-      <PageContent blocks={venue.body} />
-      <VenueInfo venue={venue} />
-      <NeufMap venueSlug={venue.slug} />
-    </main>
-  );
 }

web/src/app/lokaler/page.tsx

@@ -1,114 +1,19 @@
 import { Metadata, ResolvingMetadata } from "next";
-import { graphql } from "@/gql";
+import {
-import { VenueFragment, VenueIndexFragment } from "@/gql/graphql";
+  VenueIndexView,
-import { getClient } from "@/app/client";
+  loadVenueIndexProps,
-import { VenueList } from "@/components/venues/VenueList";
+} from "@/components/venues/VenueIndexView";
-import { PageHeader } from "@/components/general/PageHeader";
-import { PageContent } from "@/components/general/PageContent";
 import { getSeoMetadata } from "@/lib/seo";
 
-const venueIndexQuery = graphql(`
-  query venueIndex {
-    index: venueIndex {
-      ... on VenueIndex {
-        ...VenueIndex
-      }
-    }
-    venues: pages(contentType: "venues.VenuePage", limit: 100) {
-      ... on VenuePage {
-        ...Venue
-      }
-    }
-  }
-`);
-
-const VenueIndexDefinition = graphql(`
-  fragment VenueIndex on VenueIndex {
-    ... on VenueIndex {
-      title
-      seoTitle
-      searchDescription
-      lead
-      body {
-        ...Blocks
-      }
-    }
-  }
-`);
-
-const VenueFragmentDefinition = graphql(`
-  fragment Venue on VenuePage {
-    __typename
-    id
-    slug
-    title
-    seoTitle
-    searchDescription
-    images {
-      __typename
-      ... on ImageSliderBlock {
-        ...ImageSliderBlock
-      }
-    }
-    body {
-      ...Blocks
-    }
-    featuredImage {
-      ...Image
-    }
-    showAsBookable
-    showInOverview
-    floor
-    preposition
-    usedFor
-    techSpecsUrl
-    capabilityAudio
-    capabilityAudioVideo
-    capabilityBar
-    capabilityLighting
-    capacityLegal
-    capacityStanding
-    capacitySitting
-  }
-`);
-
 export async function generateMetadata(
-  { params }: { params: Promise<{}> },
+  _: unknown,
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
-  const { data, error } = await getClient().query(venueIndexQuery, {});
+  const { index } = await loadVenueIndexProps();
-
+  return getSeoMetadata(index, parent);
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.index) {
-    return null;
-  }
-
-  const index = (data?.index ?? []) as VenueIndexFragment;
-  const metadata = await getSeoMetadata(index, parent);
-  return metadata;
 }
 
 export default async function Page() {
-  const { data, error } = await getClient().query(venueIndexQuery, {});
+  const props = await loadVenueIndexProps();
-
+  return <VenueIndexView {...props} />;
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.index || !data?.venues) {
-    throw new Error("Failed to render /lokaler");
-  }
-
-  const index = data.index as VenueIndexFragment;
-  const venues = (data?.venues ?? []) as VenueFragment[];
-  const visibleVenues = venues.filter((x) => x.showInOverview);
-
-  return (
-    <main className="site-main" id="main">
-      <PageHeader heading={index.title} lead={index.lead} />
-      <PageContent blocks={index.body} />
-      <VenueList venues={visibleVenues} />
-    </main>
-  );
 }

web/src/app/page.tsx

@@ -1,97 +1,9 @@
-import { graphql } from "@/gql";
+import {
-import { EventFragment } from "@/lib/event";
+  HomePageView,
-import { NewsFragment } from "@/lib/news";
+  loadHomePageProps,
-import { HomeFragment } from "@/gql/graphql";
+} from "@/components/home/HomePageView";
-import { getClient } from "@/app/client";
-import { FeaturedEvents } from "@/components/events/FeaturedEvents";
-import { NewsList } from "@/components/news/NewsList";
-import { Newsletter } from "@/components/general/Newsletter";
-import { UpcomingEvents } from "@/components/events/UpcomingEvents";
-import { Pig } from "@/components/general/Pig";
-import Link from "next/link";
-import { Icon } from "@/components/general/Icon";
-import { SectionHeader } from "@/components/general/SectionHeader";
-import { SectionFooter } from "@/components/general/SectionFooter";
-
-const HomeFragmentDefinition = graphql(`
-  fragment Home on HomePage {
-    ... on HomePage {
-      featuredEvents {
-        id
-      }
-    }
-  }
-`);
 
 export default async function Home() {
-  const homeQuery = graphql(`
+  const props = await loadHomePageProps();
-    query home {
+  return <HomePageView {...props} />;
-      events: eventIndex {
-        ... on EventIndex {
-          futureEvents {
-            ... on EventPage {
-              ...Event
-            }
-          }
-        }
-      }
-      home: page(contentType: "home.HomePage", urlPath: "/home/") {
-        ... on HomePage {
-          ...Home
-        }
-      }
-      news: pages(contentType: "news.newsPage", order: "-first_published_at", limit: 4) {
-        ... on NewsPage {
-          ...News
-        }
-      }
-    }
-  `);
-  const { data, error } = await getClient().query(homeQuery, {});
-  const home = (data?.home ?? []) as HomeFragment;
-  const events = (data?.events?.futureEvents ?? []) as EventFragment[];
-  const news = (data?.news ?? []) as NewsFragment[];
-
-  const featuredEventIds = home.featuredEvents.map((x) => x.id);
-  const featuredEvents = [
-    ...events.filter((x) => featuredEventIds.includes(x.id)),
-    ...events.filter((x) => !featuredEventIds.includes(x.id)),
-  ];
-
-  return (
-    <>
-      <main className="site-main index" id="main">
-        <FeaturedEvents events={featuredEvents} />
-        <UpcomingEvents events={events} />
-        <div className="infoBlock">
-          <SectionHeader heading="Besøk oss" link="/praktisk" linkText="Praktisk info" />
-          <div>
-            <h2 className="title">Skal du besøke Chateau Neuf?</h2>
-            <p>
-              Vi hjelper deg med å finne frem, og sørger for at du har en fin
-              opplevelse.
-            </p>
-            <Link href="/praktisk#adkomst" className="button">
-              <span>Adresse og adkomst</span>
-              <Icon type="arrowRight" />
-            </Link>
-            <Link href="/praktisk#billetter" className="button">
-              <span>Billetter</span>
-              <Icon type="arrowRight" />
-            </Link>
-            <Link href="/praktisk#apningstider" className="button">
-              <span>Åpningstider</span>
-              <Icon type="arrowRight" />
-            </Link>
-          </div>
-          <div className="pig">
-            <Pig type="point" />
-          </div>
-          <SectionFooter link="/praktisk" linkText="Praktisk info" />
-        </div>
-        <NewsList heading="Siste nytt" featured news={news} />
-      </main>
-      <Newsletter />
-    </>
-  );
 }

web/src/app/preview/render/page.tsx

@@ -0,0 +1,256 @@
+import { getClient } from "@/app/client";
+import { PreviewBanner } from "@/components/general/PreviewBanner";
+import {
+  AssociationIndexView,
+  loadAssociationIndexProps,
+} from "@/components/associations/AssociationIndexView";
+import {
+  AssociationPageView,
+  loadAssociationPageProps,
+} from "@/components/associations/AssociationPageView";
+import {
+  ContactIndexView,
+  loadContactIndexProps,
+} from "@/components/contact/ContactIndexView";
+import {
+  EventIndexView,
+  loadEventIndexProps,
+} from "@/components/events/EventIndexView";
+import {
+  EventPageView,
+  loadEventPageProps,
+} from "@/components/events/EventPageView";
+import {
+  GenericPageView,
+  loadGenericPageProps,
+} from "@/components/general/GenericPageView";
+import {
+  HomePageView,
+  loadHomePageProps,
+} from "@/components/home/HomePageView";
+import {
+  NewsIndexView,
+  loadNewsIndexProps,
+} from "@/components/news/NewsIndexView";
+import {
+  NewsPageView,
+  loadNewsPageProps,
+} from "@/components/news/NewsPageView";
+import {
+  SponsorsPageView,
+  loadSponsorsPageProps,
+} from "@/components/sponsor/SponsorsPageView";
+import {
+  StudioPageView,
+  loadStudioPageProps,
+} from "@/components/studio/StudioPageView";
+import {
+  VenueIndexView,
+  loadVenueIndexProps,
+} from "@/components/venues/VenueIndexView";
+import {
+  VenuePageView,
+  loadVenuePageProps,
+} from "@/components/venues/VenuePageView";
+import {
+  VenueRentalIndexView,
+  loadVenueRentalIndexProps,
+} from "@/components/venues/VenueRentalIndexView";
+import { graphql } from "@/gql";
+import {
+  AssociationFragment,
+  AssociationIndexFragment,
+  ContactIndexFragment,
+  EventFragment,
+  GenericFragment,
+  HomeFragment,
+  NewsFragment,
+  NewsIndexFragment,
+  SponsorsPageFragment,
+  StudioFragment,
+  VenueFragment,
+  VenueIndexFragment,
+  VenueRentalIndexFragment,
+} from "@/gql/graphql";
+import { cookies } from "next/headers";
+export const dynamic = "force-dynamic";
+export const revalidate = 0;
+
+const previewPageQuery = graphql(`
+  query previewPage($token: String!) {
+    page: page(token: $token) {
+      __typename
+      ... on GenericPage {
+        ...Generic
+      }
+      ... on StudioPage {
+        ...Studio
+      }
+      ... on SponsorsPage {
+        ...SponsorsPage
+      }
+      ... on HomePage {
+        ...Home
+      }
+      ... on EventPage {
+        ...Event
+      }
+      ... on NewsPage {
+        ...News
+      }
+      ... on AssociationPage {
+        ...Association
+      }
+      ... on VenuePage {
+        ...Venue
+      }
+      ... on NewsIndex {
+        ...NewsIndex
+      }
+      ... on AssociationIndex {
+        ...AssociationIndex
+      }
+      ... on VenueIndex {
+        ...VenueIndex
+      }
+      ... on VenueRentalIndex {
+        ...VenueRentalIndex
+      }
+      ... on ContactIndex {
+        ...ContactIndex
+      }
+    }
+  }
+`);
+
+function ExpiredPreview() {
+  return (
+    <main className="site-main" id="main">
+      <h1>Preview session expired</h1>
+      <p>Click Preview again in the Wagtail admin to start a new session.</p>
+    </main>
+  );
+}
+
+function UnsupportedType({ typename }: { typename: string }) {
+  return (
+    <main className="site-main" id="main">
+      <h1>Preview not available</h1>
+      <p>
+        Type <code>{typename}</code> cannot be previewed.
+      </p>
+    </main>
+  );
+}
+
+export default async function PreviewRender() {
+  const token = (await cookies()).get("preview-token")?.value;
+  if (!token) {
+    return <ExpiredPreview />;
+  }
+
+  const { data, error } = await getClient().query(previewPageQuery, { token });
+  if (error) {
+    throw new Error(error.message);
+  }
+  if (!data?.page) {
+    return <ExpiredPreview />;
+  }
+
+  const page = data.page;
+  const view = await (async () => {
+    switch (page.__typename) {
+      case "GenericPage": {
+        const props = await loadGenericPageProps({
+          pageOverride: page as GenericFragment,
+        });
+        return <GenericPageView {...props!} />;
+      }
+      case "StudioPage": {
+        const props = await loadStudioPageProps({
+          pageOverride: page as StudioFragment,
+        });
+        return <StudioPageView {...props} />;
+      }
+      case "SponsorsPage": {
+        const props = await loadSponsorsPageProps({
+          pageOverride: page as SponsorsPageFragment,
+        });
+        return <SponsorsPageView {...props} />;
+      }
+      case "EventPage": {
+        const props = await loadEventPageProps({
+          eventOverride: page as EventFragment,
+        });
+        return <EventPageView {...props!} />;
+      }
+      case "NewsPage": {
+        const props = await loadNewsPageProps({
+          newsOverride: page as NewsFragment,
+        });
+        return <NewsPageView {...props!} />;
+      }
+      case "AssociationPage": {
+        const props = await loadAssociationPageProps({
+          associationOverride: page as AssociationFragment,
+        });
+        return <AssociationPageView {...props!} />;
+      }
+      case "VenuePage": {
+        const props = await loadVenuePageProps({
+          venueOverride: page as VenueFragment,
+        });
+        return <VenuePageView {...props!} />;
+      }
+      case "HomePage": {
+        const props = await loadHomePageProps({
+          homeOverride: page as HomeFragment,
+        });
+        return <HomePageView {...props} />;
+      }
+      case "EventIndex": {
+        const props = await loadEventIndexProps();
+        return <EventIndexView {...props} />;
+      }
+      case "NewsIndex": {
+        const props = await loadNewsIndexProps({
+          indexOverride: page as NewsIndexFragment,
+        });
+        return <NewsIndexView {...props} />;
+      }
+      case "AssociationIndex": {
+        const props = await loadAssociationIndexProps({
+          indexOverride: page as AssociationIndexFragment,
+        });
+        return <AssociationIndexView {...props} />;
+      }
+      case "VenueIndex": {
+        const props = await loadVenueIndexProps({
+          indexOverride: page as VenueIndexFragment,
+        });
+        return <VenueIndexView {...props} />;
+      }
+      case "VenueRentalIndex": {
+        const props = await loadVenueRentalIndexProps({
+          indexOverride: page as VenueRentalIndexFragment,
+        });
+        return <VenueRentalIndexView {...props} />;
+      }
+      case "ContactIndex": {
+        const props = await loadContactIndexProps({
+          indexOverride: page as ContactIndexFragment,
+        });
+        return <ContactIndexView {...props} />;
+      }
+      default:
+        return <UnsupportedType typename={page.__typename ?? "unknown"} />;
+    }
+  })();
+
+  return (
+    <>
+      <PreviewBanner />
+      {view}
+    </>
+  );
+}

web/src/app/sok/page.tsx

@@ -1,7 +1,10 @@
-import { graphql } from "@/gql";
 import { getClient } from "@/app/client";
-import { SearchContainer } from "@/components/search/SearchContainer";
+import {
-import { Suspense } from "react";
+  type SearchResult,
+  SearchResults,
+} from "@/components/search/SearchResults";
+import { SearchShell } from "@/components/search/SearchShell";
+import { graphql } from "@/gql";
 
 // TODO: seo metadata?
 
@@ -13,7 +16,9 @@ export default async function Page({
   }>;
 }) {
   const { q: query } = (await searchParams) ?? {};
-  let results = [];
+  let results: SearchResult[] = [];
+  let totalCount = 0;
+  const RESULT_LIMIT = 500;
 
   if (query) {
     const searchQuery = graphql(`
@@ -21,45 +26,62 @@ export default async function Page({
         results: search(query: $query) {
           __typename
           ... on PageInterface {
-            slug
+            id
+            title
+            url
           }
           ... on NewsPage {
-            id
+            excerpt
-            title
+            featuredImage {
+              ...Image
+            }
+            firstPublishedAt
           }
           ... on EventPage {
-            id
+            subtitle
-            title
+            featuredImage {
+              ...Image
+            }
+            occurrences {
+              start
+            }
           }
           ... on GenericPage {
-            id
+            lead
-            title
           }
           ... on VenuePage {
-            id
+            featuredImage {
-            title
+              ...Image
+            }
           }
           ... on AssociationPage {
-            id
+            excerpt
-            title
             associationType
+            logo {
+              ...Image
+            }
           }
         }
       }
     `);
 
-    const { data, error } = await getClient().query(searchQuery, {
+    const { data } = await getClient().query(searchQuery, { query });
-      query: query,
+    const all = (data?.results ?? []) as SearchResult[];
-    });
+    totalCount = all.length;
-
+    results = all.slice(0, RESULT_LIMIT);
-    results = (data?.results ?? []) as any;
   }
 
   return (
     <main className="site-main" id="main">
-      <Suspense key={query}>
+      <SearchShell initialQuery={query ?? ""}>
-        <SearchContainer query={query ?? ""} results={results} />
+        {query ? (
-      </Suspense>
+          <SearchResults
+            results={results}
+            totalCount={totalCount}
+            query={query}
+          />
+        ) : null}
+      </SearchShell>
     </main>
   );
 }

web/src/app/sponsorer/page.tsx

@@ -1,78 +1,19 @@
 import { Metadata, ResolvingMetadata } from "next";
-import { graphql } from "@/gql";
+import {
-import { type SponsorFragment, type SponsorsPageFragment } from "@/gql/graphql";
+  SponsorsPageView,
-import { getClient } from "@/app/client";
+  loadSponsorsPageProps,
-import { PageHeader } from "@/components/general/PageHeader";
+} from "@/components/sponsor/SponsorsPageView";
-import { PageContent } from "@/components/general/PageContent";
 import { getSeoMetadata } from "@/lib/seo";
-import { SponsorList } from "@/components/sponsor/SponsorList";
-
-const sponsorsPageQuery = graphql(`
-  query sponsors {
-    page: sponsorsPage {
-      ... on SponsorsPage {
-        ...SponsorsPage
-      }
-    }
-  }
-`);
 
 export async function generateMetadata(
-  { params }: { params: Promise<{}> },
+  _: unknown,
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
-  const { data, error } = await getClient().query(sponsorsPageQuery, {});
+  const { page } = await loadSponsorsPageProps();
-
+  return getSeoMetadata(page, parent);
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.page) {
-    return null;
-  }
-
-  const index = data.page as SponsorsPageFragment;
-  const metadata = await getSeoMetadata(index, parent);
-  return metadata;
 }
 
-const SponsorsPageFragmentDefinition = graphql(`
-  fragment SponsorsPage on SponsorsPage {
-    ... on SponsorsPage {
-      title
-      seoTitle
-      searchDescription
-      lead
-      body {
-        ...Blocks
-      }
-      sponsors {
-        ... on SponsorBlock {
-          ...Sponsor
-        }
-      }
-    }
-  }
-`);
-
 export default async function Page() {
-  const { data, error } = await getClient().query(sponsorsPageQuery, {});
+  const props = await loadSponsorsPageProps();
-
+  return <SponsorsPageView {...props} />;
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.page) {
-    throw new Error("Failed to render /sponsorer");
-  }
-
-  const page = data.page as SponsorsPageFragment;
-
-  return (
-    <main className="site-main" id="main">
-      <PageHeader heading={page.title} lead={page.lead} />
-      {page.body && <PageContent blocks={page.body} />}
-      {page.sponsors && (
-        <SponsorList sponsors={page.sponsors as SponsorFragment[]} />
-      )}
-    </main>
-  );
 }

web/src/app/studio/page.tsx

@@ -0,0 +1,19 @@
+import { Metadata, ResolvingMetadata } from "next";
+import {
+  StudioPageView,
+  loadStudioPageProps,
+} from "@/components/studio/StudioPageView";
+import { getSeoMetadata } from "@/lib/seo";
+
+export async function generateMetadata(
+  _: unknown,
+  parent: ResolvingMetadata
+): Promise<Metadata | null> {
+  const { page } = await loadStudioPageProps();
+  return getSeoMetadata(page, parent);
+}
+
+export default async function Page() {
+  const props = await loadStudioPageProps();
+  return <StudioPageView {...props} />;
+}

web/src/app/utleie/page.tsx

@@ -1,82 +1,19 @@
 import { Metadata, ResolvingMetadata } from "next";
-import { graphql } from "@/gql";
+import {
-import { VenueFragment, VenueRentalIndexFragment } from "@/gql/graphql";
+  VenueRentalIndexView,
-import { getClient } from "@/app/client";
+  loadVenueRentalIndexProps,
-import { VenueList } from "@/components/venues/VenueList";
+} from "@/components/venues/VenueRentalIndexView";
-import { PageHeader } from "@/components/general/PageHeader";
-import { BgPig } from "@/components/general/BgPig";
-import { PageContent } from "@/components/general/PageContent";
 import { getSeoMetadata } from "@/lib/seo";
 
-const venueRentalIndexQuery = graphql(`
-  query venueRentalIndex {
-    index: venueRentalIndex {
-      ... on VenueRentalIndex {
-        ...VenueRentalIndex
-      }
-    }
-    venues: pages(contentType: "venues.VenuePage", limit: 100) {
-      ... on VenuePage {
-        ...Venue
-      }
-    }
-  }
-`);
-
-const VenueRentalIndexDefinition = graphql(`
-  fragment VenueRentalIndex on VenueRentalIndex {
-    ... on VenueRentalIndex {
-      title
-      seoTitle
-      searchDescription
-      lead
-      body {
-        ...Blocks
-      }
-    }
-  }
-`);
-
 export async function generateMetadata(
-  { params }: { params: Promise<{}> },
+  _: unknown,
   parent: ResolvingMetadata
 ): Promise<Metadata | null> {
-  const { data, error } = await getClient().query(venueRentalIndexQuery, {});
+  const { index } = await loadVenueRentalIndexProps();
-
+  return getSeoMetadata(index, parent);
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.index) {
-    return null;
-  }
-
-  const index = data.index as VenueRentalIndexFragment;
-  const metadata = await getSeoMetadata(index, parent);
-  return metadata;
 }
 
 export default async function Page() {
-  const { data, error } = await getClient().query(venueRentalIndexQuery, {});
+  const props = await loadVenueRentalIndexProps();
-
+  return <VenueRentalIndexView {...props} />;
-  if (error) {
-    throw new Error(error.message);
-  }
-  if (!data?.index || !data?.venues) {
-    throw new Error("Failed to render /utleie");
-  }
-
-  const index = data.index as VenueRentalIndexFragment;
-  const venues = (data?.venues ?? []) as VenueFragment[];
-  const bookableVenues = venues.filter((venue) => venue.showAsBookable);
-
-  return (
-    <>
-      <main className="site-main" id="main">
-        <PageHeader heading={index.title} lead={index.lead} />
-        {index.body && <PageContent blocks={index.body} />}
-        <VenueList venues={bookableVenues} heading="Våre lokaler" />
-      </main>
-      <BgPig type="key" />
-    </>
-  );
 }

web/src/components/associations/AssociationIndexView.tsx

@@ -0,0 +1,93 @@
+import { graphql } from "@/gql";
+import { AssociationFragment, AssociationIndexFragment } from "@/gql/graphql";
+import { getClient } from "@/app/client";
+import { AssociationList } from "@/components/associations/AssociationList";
+import { PageHeader } from "@/components/general/PageHeader";
+import { PageContent } from "@/components/general/PageContent";
+
+const AssociationIndexDefinition = graphql(`
+  fragment AssociationIndex on AssociationIndex {
+    __typename
+    title
+    seoTitle
+    searchDescription
+    lead
+    body {
+      ...Blocks
+    }
+  }
+`);
+
+const AssociationFragmentDefinition = graphql(`
+  fragment Association on AssociationPage {
+    __typename
+    id
+    slug
+    title
+    seoTitle
+    searchDescription
+    excerpt
+    lead
+    body {
+      ...Blocks
+    }
+    logo {
+      url
+      width
+      height
+    }
+    associationType
+    websiteUrl
+  }
+`);
+
+const allAssociationsQuery = graphql(`
+  query allAssociations {
+    index: associationIndex {
+      ... on AssociationIndex {
+        ...AssociationIndex
+      }
+    }
+    associations: pages(
+      contentType: "associations.AssociationPage"
+      limit: 1000
+    ) {
+      ... on AssociationPage {
+        ...Association
+      }
+    }
+  }
+`);
+
+export type AssociationIndexViewProps = {
+  index: AssociationIndexFragment;
+  associations: AssociationFragment[];
+};
+
+export async function loadAssociationIndexProps(overrides?: {
+  indexOverride?: AssociationIndexFragment;
+}): Promise<AssociationIndexViewProps> {
+  const { data, error } = await getClient().query(allAssociationsQuery, {});
+  if (error) throw new Error(error.message);
+  const index =
+    overrides?.indexOverride ?? (data?.index as AssociationIndexFragment | undefined);
+  if (!index) throw new Error("Failed to load /foreninger");
+  const associations = (data?.associations ?? []) as AssociationFragment[];
+  return { index, associations };
+}
+
+export function AssociationIndexView({
+  index,
+  associations,
+}: AssociationIndexViewProps) {
+  return (
+    <main className="site-main" id="main">
+      <PageHeader heading={index.title} lead={index.lead} />
+      {index.body && <PageContent blocks={index.body} />}
+      <AssociationList
+        associations={associations}
+        heading="Foreninger og utvalg"
+      />
+    </main>
+  );
+}

web/src/components/associations/AssociationPageView.tsx

@@ -0,0 +1,46 @@
+import { graphql } from "@/gql";
+import { AssociationFragment } from "@/gql/graphql";
+import { getClient } from "@/app/client";
+import { AssociationHeader } from "@/components/associations/AssociationHeader";
+import { PageContent } from "@/components/general/PageContent";
+
+const associationBySlugQuery = graphql(`
+  query associationBySlug($slug: String!) {
+    association: page(
+      contentType: "associations.AssociationPage"
+      slug: $slug
+    ) {
+      ... on AssociationPage {
+        ...Association
+      }
+    }
+  }
+`);
+
+export type AssociationPageViewProps = { association: AssociationFragment };
+
+export async function loadAssociationPageProps(args: {
+  slug?: string;
+  associationOverride?: AssociationFragment;
+}): Promise<AssociationPageViewProps | null> {
+  if (args.associationOverride) {
+    return { association: args.associationOverride };
+  }
+  if (!args.slug) throw new Error("loadAssociationPageProps needs slug or associationOverride");
+  const { data, error } = await getClient().query(associationBySlugQuery, {
+    slug: args.slug,
+  });
+  if (error) throw new Error(error.message);
+  const association = data?.association as AssociationFragment | undefined;
+  if (!association) return null;
+  return { association };
+}
+
+export function AssociationPageView({ association }: AssociationPageViewProps) {
+  return (
+    <main className="site-main" id="main">
+      <AssociationHeader association={association} />
+      <PageContent blocks={association.body} />
+    </main>
+  );
+}

web/src/components/blocks/Blocks.tsx

@@ -1,7 +1,11 @@
+import dynamic from "next/dynamic";
 import { RichTextBlock } from "./RichTextBlock";
 import { ImageWithTextBlock } from "./ImageWithTextBlock";
-import { ImageSliderBlock } from "./ImageSliderBlock";
 import { HorizontalRuleBlock } from "./HorizontalRuleBlock";
+
+const ImageSliderBlock = dynamic(() =>
+  import("./ImageSliderBlock").then((m) => m.ImageSliderBlock)
+);
 import { FeaturedBlock } from "./FeaturedBlock";
 import { AccordionBlock } from "./AccordionBlock";
 import { EmbedBlock } from "./EmbedBlock";

web/src/components/contact/ContactIndexView.tsx

@@ -0,0 +1,54 @@
+import { graphql } from "@/gql";
+import { ContactIndexFragment } from "@/gql/graphql";
+import { getClient } from "@/app/client";
+import { GeneralContactBlock } from "@/components/blocks/GeneralContactBlock";
+import { PageContent } from "@/components/general/PageContent";
+import { PageHeader } from "@/components/general/PageHeader";
+
+const ContactIndexDefinition = graphql(`
+  fragment ContactIndex on ContactIndex {
+    __typename
+    title
+    seoTitle
+    searchDescription
+    lead
+    body {
+      ...Blocks
+    }
+  }
+`);
+
+const contactQuery = graphql(`
+  query contacts {
+    index: contactIndex {
+      ... on ContactIndex {
+        ...ContactIndex
+      }
+    }
+  }
+`);
+
+export type ContactIndexViewProps = { index: ContactIndexFragment };
+
+export async function loadContactIndexProps(overrides?: {
+  indexOverride?: ContactIndexFragment;
+}): Promise<ContactIndexViewProps> {
+  if (overrides?.indexOverride) {
+    return { index: overrides.indexOverride };
+  }
+  const { data, error } = await getClient().query(contactQuery, {});
+  if (error) throw new Error(error.message);
+  const index = data?.index as ContactIndexFragment | undefined;
+  if (!index) throw new Error("Failed to load /kontakt");
+  return { index };
+}
+
+export function ContactIndexView({ index }: ContactIndexViewProps) {
+  return (
+    <main className="site-main" id="main">
+      <PageHeader heading={index.title} lead={index.lead} />
+      <GeneralContactBlock />
+      {index.body && <PageContent blocks={index.body} />}
+    </main>
+  );
+}

web/src/components/events/EventContainer.tsx

@@ -13,7 +13,7 @@ import { unmaskFragment } from "@/gql";
 import {
   EventCategoryFragmentDefinition,
   EventOrganizerFragmentDefinition,
-  EventFragment,
+  EventOverviewItemFragment,
   EventCategory,
   SingularEvent,
   getSingularEvents,
@@ -44,7 +44,7 @@ export const EventContainer = ({
   eventOrganizers,
   venues,
 }: {
-  events: EventFragment[];
+  events: EventOverviewItemFragment[];
   eventCategories: EventCategory[];
   eventOrganizers: EventOrganizer[];
   venues: VenueFragment[];
@@ -233,7 +233,7 @@ export const EventContainer = ({
   );
 };
 
-const EventList = ({ events }: { events: EventFragment[] }) => {
+const EventList = ({ events }: { events: EventOverviewItemFragment[] }) => {
   if (events.length === 0) {
     return <div className={styles.noEvents}>Ingen kommende arrangementer.</div>;
   }
@@ -255,7 +255,7 @@ const CalendarDay = ({
   events,
 }: {
   day: string;
-  events: SingularEvent[];
+  events: SingularEvent<EventOverviewItemFragment>[];
 }) => (
   <div
     className={`${styles.calendarDay} ${events.length === 0 && styles.empty}`}
@@ -274,7 +274,11 @@ const CalendarDay = ({
   </div>
 );
 
-const CalendarWeek = ({ days }: { days: Record<string, SingularEvent[]> }) => {
+const CalendarWeek = ({
+  days,
+}: {
+  days: Record<string, SingularEvent<EventOverviewItemFragment>[]>;
+}) => {
   const daysInWeek = Object.keys(days);
   const firstDay = daysInWeek[0];
   const lastDay = daysInWeek[daysInWeek.length - 1];
@@ -310,7 +314,7 @@ function maybeYear(yearMonthString: string) {
   return ` ${yearMonth.getFullYear()}`;
 }
 
-const EventCalendar = ({ events }: { events: EventFragment[] }) => {
+const EventCalendar = ({ events }: { events: EventOverviewItemFragment[] }) => {
   const futureSingularEvents = getSingularEvents(events).filter(
     (x) => x.occurrence?.start && isTodayOrFuture(x.occurrence.start),
   );

web/src/components/events/EventIndexView.tsx

@@ -0,0 +1,59 @@
+import { Suspense } from "react";
+import { VenueFragment } from "@/gql/graphql";
+import { getClient } from "@/app/client";
+import { EventContainer } from "@/components/events/EventContainer";
+import { PageHeader } from "@/components/general/PageHeader";
+import {
+  EventCategory,
+  EventOverviewItemFragment,
+  EventOrganizer,
+  eventsOverviewQuery,
+} from "@/lib/event";
+
+export type EventIndexViewProps = {
+  events: EventOverviewItemFragment[];
+  eventCategories: EventCategory[];
+  eventOrganizers: EventOrganizer[];
+  venues: VenueFragment[];
+};
+
+export async function loadEventIndexProps(): Promise<EventIndexViewProps> {
+  const { data, error } = await getClient().query(eventsOverviewQuery, {});
+  if (error) throw new Error(error.message);
+  if (
+    !data?.index ||
+    !data?.events?.futureEvents ||
+    !data?.eventCategories ||
+    !data?.eventOrganizers ||
+    !data?.venues
+  ) {
+    throw new Error("Failed to load /arrangementer");
+  }
+  return {
+    events: data.events.futureEvents as EventOverviewItemFragment[],
+    eventCategories: data.eventCategories as EventCategory[],
+    eventOrganizers: data.eventOrganizers as EventOrganizer[],
+    venues: data.venues as VenueFragment[],
+  };
+}
+
+export function EventIndexView({
+  events,
+  eventCategories,
+  eventOrganizers,
+  venues,
+}: EventIndexViewProps) {
+  return (
+    <main className="site-main" id="main">
+      <PageHeader heading="Dette skjer på Chateau Neuf" align="left" />
+      <Suspense>
+        <EventContainer
+          events={events}
+          eventCategories={eventCategories}
+          eventOrganizers={eventOrganizers}
+          venues={venues}
+        />
+      </Suspense>
+    </main>
+  );
+}

web/src/components/events/EventItem.tsx

@@ -6,6 +6,8 @@ import { Image } from "@/components/general/Image";
 import {
   SingularEvent,
   EventFragment,
+  EventListItemFragment,
+  EventOverviewItemFragment,
   getFutureOccurrences,
 } from "@/lib/event";
 import {
@@ -20,10 +22,20 @@ export const EventItem = ({
   event,
   mode,
   size,
+  imageLoading,
+  imageFetchPriority,
 }: {
-  event: SingularEvent | EventFragment;
+  event:
+    | SingularEvent
+    | SingularEvent<EventListItemFragment>
+    | SingularEvent<EventOverviewItemFragment>
+    | EventFragment
+    | EventListItemFragment
+    | EventOverviewItemFragment;
   mode: "list" | "calendar" | "singular-time-only";
   size?: "small" | "medium" | "large";
+  imageLoading?: "eager" | "lazy";
+  imageFetchPriority?: "high" | "low" | "auto";
 }) => {
   const futureOccurrences = getFutureOccurrences(event);
   const groupedOccurrences = groupConsecutiveDates(
@@ -46,7 +58,9 @@ export const EventItem = ({
             alt={featuredImage.alt}
             width={0}
             height={0}
-            sizes="(max-width: 900px) 100vw, 25vw"
+            sizes="(max-width: 900px) calc(100vw - 2rem), 30vw"
+            loading={imageLoading}
+            fetchPriority={imageFetchPriority}
           />
         )}
       </div>

web/src/components/events/EventPageView.tsx

@@ -0,0 +1,58 @@
+import { graphql } from "@/gql";
+import { EventFragment } from "@/gql/graphql";
+import { getClient } from "@/app/client";
+import { EventDetails } from "@/components/events/EventDetails";
+import { EventHeader } from "@/components/events/EventHeader";
+import { BgPig } from "@/components/general/BgPig";
+import { PageContent } from "@/components/general/PageContent";
+import { getEventPig } from "@/lib/event";
+
+const eventBySlugQuery = graphql(`
+  query eventBySlug($slug: String!) {
+    event: page(contentType: "events.EventPage", slug: $slug) {
+      ... on EventPage {
+        ...Event
+      }
+    }
+  }
+`);
+
+export type EventPageViewProps = { event: EventFragment };
+
+export async function loadEventPageProps(args: {
+  slug?: string;
+  eventOverride?: EventFragment;
+}): Promise<EventPageViewProps | null> {
+  if (args.eventOverride) {
+    return { event: args.eventOverride };
+  }
+  if (!args.slug) throw new Error("loadEventPageProps needs slug or eventOverride");
+  const { data, error } = await getClient().query(eventBySlugQuery, {
+    slug: args.slug,
+  });
+  if (error) throw new Error(error.message);
+  const event = data?.event as EventFragment | undefined;
+  if (!event) return null;
+  return { event };
+}
+
+export function EventPageView({ event }: EventPageViewProps) {
+  const eventPig = getEventPig(event);
+
+  return (
+    <>
+      <main className="site-main" id="main">
+        <EventHeader event={event} />
+        <EventDetails event={event} />
+        {event.lead && (
+          <div
+            className="lead event-lead"
+            dangerouslySetInnerHTML={{ __html: event.lead }}
+          />
+        )}
+        <PageContent blocks={event.body} />
+      </main>
+      {eventPig && <BgPig type={eventPig} color="white" />}
+    </>
+  );
+}

web/src/components/events/FeaturedEvents.tsx

@@ -1,16 +1,22 @@
-import { EventFragment } from "@/gql/graphql";
+import { EventListItemFragment } from "@/gql/graphql";
 import { EventItem } from "./EventItem";
 import styles from "./featuredEvents.module.scss";
 import { SectionHeader } from "../general/SectionHeader";
 import { SectionFooter } from "../general/SectionFooter";
 
-export const FeaturedEvents = ({ events }: { events: EventFragment[] }) => {
+export const FeaturedEvents = ({ events }: { events: EventListItemFragment[] }) => {
   return (
     <section className={styles.featuredEvents}>
       <SectionHeader heading="Arrangementer" link="/arrangementer" linkText="Se alle arrangementer" />
       <ul className={styles.eventList}>
         {events.slice(0, 3).map((event) => (
-          <EventItem key={event.id} event={event} mode="list" />
+          <EventItem
+            key={event.id}
+            event={event}
+            mode="list"
+            imageLoading="eager"
+            imageFetchPriority="high"
+          />
         ))}
       </ul>
       <SectionFooter link="/arrangementer" linkText="Se alle arrangementer" />

web/src/components/events/UpcomingEvents.tsx

@@ -1,18 +1,16 @@
-import { EventFragment } from "@/gql/graphql";
+import { EventListItemFragment } from "@/gql/graphql";
-import { isTodayOrFuture, formatDate } from "@/lib/date";
+import { isTodayOrFuture } from "@/lib/date";
-import { parse } from "date-fns";
 import {
   getSingularEvents,
   organizeEventsByDate,
   sortSingularEvents,
 } from "@/lib/event";
-import Link from "next/link";
 import { EventItem } from "./EventItem";
 import styles from "./upcomingEvents.module.scss";
 import { SectionHeader } from "../general/SectionHeader";
 import { SectionFooter } from "../general/SectionFooter";
 
-export const UpcomingEvents = ({ events }: { events: EventFragment[] }) => {
+export const UpcomingEvents = ({ events }: { events: EventListItemFragment[] }) => {
   const upcomingSingularEvents = sortSingularEvents(
     getSingularEvents(events).filter((event) =>
       isTodayOrFuture(event.occurrence.start)

web/src/components/general/GenericPageView.tsx

@@ -0,0 +1,63 @@
+import { graphql } from "@/gql";
+import { GenericFragment } from "@/gql/graphql";
+import { getClient } from "@/app/client";
+import { PageHeader } from "@/components/general/PageHeader";
+import { PageContent } from "@/components/general/PageContent";
+import { BgPig } from "@/components/general/BgPig";
+
+const GenericFragmentDefinition = graphql(`
+  fragment Generic on GenericPage {
+    __typename
+    id
+    urlPath
+    seoTitle
+    searchDescription
+    title
+    lead
+    pig
+    body {
+      ...Blocks
+    }
+  }
+`);
+
+const genericPageByUrlPathQuery = graphql(`
+  query genericPageByUrl($urlPath: String!) {
+    page: page(contentType: "generic.GenericPage", urlPath: $urlPath) {
+      ... on GenericPage {
+        ...Generic
+      }
+    }
+  }
+`);
+
+export type GenericPageViewProps = { page: GenericFragment };
+
+export async function loadGenericPageProps(args: {
+  urlPath?: string;
+  pageOverride?: GenericFragment;
+}): Promise<GenericPageViewProps | null> {
+  if (args.pageOverride) {
+    return { page: args.pageOverride };
+  }
+  if (!args.urlPath) throw new Error("loadGenericPageProps needs urlPath or pageOverride");
+  const { data, error } = await getClient().query(genericPageByUrlPathQuery, {
+    urlPath: args.urlPath,
+  });
+  if (error) throw new Error(error.message);
+  const page = data?.page as GenericFragment | undefined;
+  if (!page) return null;
+  return { page };
+}
+
+export function GenericPageView({ page }: GenericPageViewProps) {
+  return (
+    <>
+      <main className="site-main" id="main">
+        <PageHeader heading={page.title} lead={page.lead} />
+        <PageContent blocks={page.body} />
+      </main>
+      {page.pig && <BgPig type={page.pig} color="white" />}
+    </>
+  );
+}

web/src/components/general/Image.tsx

@@ -1,4 +1,4 @@
-import NextImage, { ImageProps as NextImageProps } from "next/image";
+import NextImage, { type ImageProps as NextImageProps } from "next/image";
 import styles from "./image.module.scss";
 
 type ImageProps = NextImageProps & {
@@ -7,14 +7,35 @@ type ImageProps = NextImageProps & {
   imageFormat?: string | null; // "original" | "bleed" | "fullWidth"
 };
 
+function isSvgSrc(src: NextImageProps["src"]): src is string {
+  return typeof src === "string" && /\.svg(\?|#|$)/i.test(src);
+}
+
+function MaybeNextImage(props: NextImageProps) {
+  if (isSvgSrc(props.src)) {
+    const { src, alt, width, height, className, style } = props;
+    return (
+      <img // eslint-disable-line @next/next/no-img-element
+        src={src}
+        alt={alt}
+        width={width}
+        height={height}
+        className={className}
+        style={style}
+      />
+    );
+  }
+  return <NextImage {...props} />;
+}
+
 export function ImageFigure(props: ImageProps) {
-  const { attribution, caption, imageFormat, ...nextImageProps } = props;
+  const { attribution, caption, imageFormat, ...imageProps } = props;
   return (
     <figure
       className={`${styles.image} ${imageFormat ? styles[imageFormat] : ""}`}
     >
       <div className={styles.imageWrapper}>
-        <NextImage {...nextImageProps} />
+        <MaybeNextImage {...imageProps} />
         {attribution && <div className={styles.attribution}>{attribution}</div>}
       </div>
       {caption && <figcaption>{caption}</figcaption>}
@@ -23,5 +44,5 @@ export function ImageFigure(props: ImageProps) {
 }
 
 export function Image(props: NextImageProps) {
-  return <NextImage {...props} />;
+  return <MaybeNextImage {...props} />;
 }

web/src/components/general/PreviewBanner.tsx

@@ -0,0 +1,21 @@
+"use client";
+
+import styles from "./previewBanner.module.scss";
+
+export function PreviewBanner() {
+  return (
+    <div className={styles.previewBanner} role="status">
+      <span className={styles.label}>Forhåndsvisning</span>
+      <button
+        type="button"
+        className="tertiary"
+        onClick={async () => {
+          await fetch("/api/preview/disable", { method: "POST" });
+          window.location.reload();
+        }}
+      >
+        Avslutt forhåndsvisning
+      </button>
+    </div>
+  );
+}

web/src/components/general/previewBanner.module.scss

@@ -0,0 +1,22 @@
+.previewBanner {
+  position: fixed;
+  top: 0;
+  left: 0;
+  right: 0;
+  z-index: 9999;
+  display: flex;
+  align-items: center;
+  justify-content: space-between;
+  gap: var(--spacing-s);
+  padding: var(--spacing-xs) var(--spacing-s);
+  background: color-mix(in srgb, var(--color-deepBrick) 60%, transparent);
+  backdrop-filter: blur(4px);
+  color: var(--color-betongGray);
+  font-family: var(--font-main-demi);
+  font-size: var(--font-size-caption);
+}
+
+.label {
+  text-transform: uppercase;
+  letter-spacing: 0.05em;
+}