Add content streamfield and blocks (#8)

* Add whitenoise to dependencies.

* Add settings to enable whitenoise.

* Add stream block for a link in a menu.

* Add stream block for a page header.

* Add content StreamField to home page model.

Author: alflanagan

app/alloydflanagan/home/blocks/__init__.py

@@ -0,0 +1,10 @@
+from wagtail.blocks import StreamBlock, ListBlock
+from wagtail.images.blocks import ImageChooserBlock
+from alloydflanagan.home.blocks.menu_link import MenuLinkBlock
+
+
+class HeaderBlock(StreamBlock):
+    tabs = ListBlock(MenuLinkBlock())
+    banner = ImageChooserBlock(required=False)
+    class Meta:
+        template = 'home/blocks/header.html'

app/alloydflanagan/home/blocks/header.py

@@ -0,0 +1,9 @@
+from wagtail.blocks import StructBlock, CharBlock, PageChooserBlock
+
+
+class MenuLinkBlock(StructBlock):
+    title = CharBlock(required=False)
+    target = PageChooserBlock(required=False)
+
+    class Meta:
+        template = 'home/templates/home/blocks/menu_link.html'

app/alloydflanagan/home/blocks/menu_link.py

@@ -0,0 +1,21 @@
+# Generated by Django 4.2.21 on 2025-06-29 16:17
+
+from django.db import migrations
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+
+
+class Migration(migrations.Migration):
+
+    dependencies = [
+        ('home', '0004_homepage_resume'),
+    ]
+
+    operations = [
+        migrations.AddField(
+            model_name='homepage',
+            name='content',
+            field=wagtail.fields.StreamField([('text', wagtail.blocks.RichTextBlock()), ('image', wagtail.images.blocks.ImageChooserBlock()), ('header', wagtail.blocks.StreamBlock([('tabs', wagtail.blocks.ListBlock(wagtail.blocks.StructBlock([('title', wagtail.blocks.CharBlock(required=False)), ('target', wagtail.blocks.PageChooserBlock(required=False))]))), ('banner', wagtail.images.blocks.ImageChooserBlock(required=False))]))], blank=True, use_json_field=True),
+        ),
+    ]

app/alloydflanagan/home/migrations/0005_homepage_content.py

@@ -1,15 +1,26 @@
 from django.db.models import FileField
 
 from wagtail.admin.panels import FieldPanel
+from wagtail.blocks import RichTextBlock
+from wagtail.images.blocks import ImageChooserBlock
 from wagtail.models import Page
-from wagtail.fields import RichTextField
+from wagtail.fields import RichTextField, StreamField
+
+from alloydflanagan.home.blocks.header import HeaderBlock
+
 
 class HomePage(Page):
     intro = RichTextField()
     # may move resume to AboutPage model if/when we have one
     resume = FileField(blank=True)
+    content = StreamField([
+        ('text', RichTextBlock()),  #probably will use custom type later
+        ('image', ImageChooserBlock()),
+        ('header', HeaderBlock()),
+    ], use_json_field=True, blank=True)
 
     content_panels = Page.content_panels + [
         FieldPanel("intro", classname="full"),
         FieldPanel("resume", classname="full"),
+        FieldPanel("content", classname="full"),
     ]

app/alloydflanagan/home/models.py

@@ -0,0 +1,17 @@
+{% load wagtailcore_tags wagtailimages_tags %}
+
+<header class="masthead mb-auto">
+  <div class="inner">
+    <div>
+      <h3 class="masthead-brand">A Lloyd Flanagan</h3>
+    </div>
+  <div class="header-banner">
+    {% image block.banner width-800 %}
+  </div>
+    <nav class="nav nav-masthead justify-content-center app-nav">
+      {% for tab in block.tabs %}
+        {% include_block tab %}
+      {% endfor %}
+    </nav>
+  </div>
+</header>

app/alloydflanagan/home/templates/home/blocks/header.html

@@ -0,0 +1,2 @@
+<!-- home/blocks/menu_link.html -->
+<span class="nav-link"><a href="{{ block.target }}">{{ block.title }}</a></span>

app/alloydflanagan/home/templates/home/blocks/menu_link.html

@@ -3,19 +3,19 @@
 
 {% block body_class %}template-homepage{% endblock %}
 
-{% block extra_css %}
-{% endblock extra_css %}
-
-{% block header %}
-  {% include 'components/header.html' %}
-{% endblock header %}
-
 {% block content %}
-  <div class="home-intro">
+  <!--  home_page.html -->
+
+  {# include_block page.content #}
+  <article>
+  <header>
+    {{ page.header }}
+  </header>
+  <section id="intro">
     {{ page.intro|richtext }}
-  </div>
+  </section>
+  <main id="content">
+    {{ page.content }}
+  </main>
+  </article>
 {% endblock content %}
-
-{% block footer %}
-  {% include 'components/footer.html' %}
-{% endblock footer %}

app/alloydflanagan/home/templates/home/home_page.html

@@ -49,13 +49,14 @@
 ]
 
 MIDDLEWARE = [
+    "django.middleware.security.SecurityMiddleware",
+    "whitenoise.middleware.WhiteNoiseMiddleware",
     "django.contrib.sessions.middleware.SessionMiddleware",
     "django.middleware.common.CommonMiddleware",
     "django.middleware.csrf.CsrfViewMiddleware",
     "django.contrib.auth.middleware.AuthenticationMiddleware",
     "django.contrib.messages.middleware.MessageMiddleware",
     "django.middleware.clickjacking.XFrameOptionsMiddleware",
-    "django.middleware.security.SecurityMiddleware",
     "wagtail.contrib.redirects.middleware.RedirectMiddleware",
 ]
 
@@ -132,12 +133,19 @@
 # ManifestStaticFilesStorage is recommended in production, to prevent outdated
 # JavaScript / CSS assets being served from cache (e.g. after a Wagtail upgrade).
 # See https://docs.djangoproject.com/en/3.1/ref/contrib/staticfiles/#manifeststaticfilesstorage
-STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
+# STATICFILES_STORAGE = "django.contrib.staticfiles.storage.ManifestStaticFilesStorage"
 # this should contain any static files that aren't specific to an app
 STATICFILES_DIRS = [os.path.join(PROJECT_DIR, "static")]
 STATIC_ROOT = os.path.join(BASE_DIR, "static")
 STATIC_URL = "/static/"
-
+STORAGES = {
+    "staticfiles": {
+        "BACKEND": "whitenoise.storage.CompressedManifestStaticFilesStorage",
+    },
+    "default": {
+        "BACKEND": "django.core.files.storage.FileSystemStorage",
+    },
+}
 MEDIA_ROOT = os.path.join(BASE_DIR, "media")
 MEDIA_URL = "/media/"
 

app/alloydflanagan/settings/base.py

@@ -40,17 +40,13 @@
 
     <div id="app">
       <div class="cover-container d-flex w-100 h-100 p-3 mx-auto flex-column">
-        {% block header %}
-        {% endblock header %}
         {% block content %}
         {% endblock content %}
-        {% block footer %}
-        {% endblock footer %}
       </div>
     </div>
 
     {# Global javascript #}
-    <script type="text/javascript" src="{% static 'main.js' %}"></script>
+    {# <script type="text/javascript" src="{% static 'main.js' %}"></script> #}
 
     {% block extra_js %}