Revert "Add content streamfield and blocks (#8)"

This reverts commit b2c5b5c.
Never use squash merge, what a mess.

Author: alflanagan

app/alloydflanagan/home/blocks/__init__.py

@@ -1,26 +1,15 @@
 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, StreamField
-
-from alloydflanagan.home.blocks.header import HeaderBlock
-
+from wagtail.fields import RichTextField
 
 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/blocks/header.py

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

app/alloydflanagan/home/blocks/menu_link.py

@@ -49,14 +49,13 @@
 ]
 
 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",
 ]
 
@@ -133,19 +132,12 @@
 # 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/home/migrations/0005_homepage_content.py

@@ -40,13 +40,17 @@
 
     <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 %}