From aeae55a05b23db681b9da5c55c1c103fc0cba6d0 Mon Sep 17 00:00:00 2001
From: Moe <mohammadalsakhawy@gmail.com>
Date: Mon, 1 Apr 2024 00:39:47 +0300
Subject: [PATCH 01/13] feat: Add django-post_office for mail queueing (#359)

* feat: Use django-post_office for mail queueing

* Override the base setting in dev setting.

---------

Co-authored-by: Tim Schilling <schillingt@better-simple.com>
---
 indymeet/settings/base.py          |   9 +
 indymeet/settings/dev.py           |   2 +-
 indymeet/settings/production.py    |   1 -
 requirements/requirements-dev.txt  | 293 +++++++++++++++--------------
 requirements/requirements-test.txt | 143 +++++++-------
 requirements/requirements.in       |   1 +
 requirements/requirements.txt      |  46 +++--
 supervisord.conf                   |   8 +
 8 files changed, 269 insertions(+), 234 deletions(-)

diff --git a/indymeet/settings/base.py b/indymeet/settings/base.py
index b17d5e4a..0f7b1029 100644
--- a/indymeet/settings/base.py
+++ b/indymeet/settings/base.py
@@ -66,6 +66,7 @@
     "tailwind",
     "theme",
     "widget_tweaks",
+    "post_office",
 ]
 
 MIDDLEWARE = [
@@ -222,6 +223,14 @@
 SERVER_EMAIL = "contact@djangonaut.space"
 SILENCED_SYSTEM_CHECKS = ["django_recaptcha.recaptcha_test_key_error"]
 
+EMAIL_BACKEND = "post_office.EmailBackend"
+
+POST_OFFICE = {
+    "BACKENDS": {
+        "default": "anymail.backends.mailjet.EmailBackend",
+    }
+}
+
 PUPUT_AS_PLUGIN = True
 PUPUT_ENTRY_MODEL = "home.models.BlogAbstract"
 
diff --git a/indymeet/settings/dev.py b/indymeet/settings/dev.py
index 778b9e53..ca9cc52b 100644
--- a/indymeet/settings/dev.py
+++ b/indymeet/settings/dev.py
@@ -21,7 +21,7 @@
 # SECURITY WARNING: define the correct hosts in production!
 ALLOWED_HOSTS = ["*"]
 
-EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
+POST_OFFICE["BACKENDS"] = {"default": "django.core.mail.backends.console.EmailBackend"}
 
 INSTALLED_APPS += ["django_extensions"]  # noqa F405
 
diff --git a/indymeet/settings/production.py b/indymeet/settings/production.py
index a2bd5da9..fefbac4d 100644
--- a/indymeet/settings/production.py
+++ b/indymeet/settings/production.py
@@ -36,7 +36,6 @@
     # unless there was a setting that needs it.
     DATABASES["default"].setdefault("OPTIONS", {})["sslmode"] = "require"
 
-    EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
     MAILJET_API_KEY = os.getenv("MAILJET_API_KEY")
     MAILJET_SECRET_KEY = os.getenv("MAILJET_SECRET_KEY")
     ANYMAIL = {
diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt
index 68f021df..b30f63b5 100644
--- a/requirements/requirements-dev.txt
+++ b/requirements/requirements-dev.txt
@@ -6,81 +6,82 @@
 #
 anyascii==0.3.2
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 anyio==4.2.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   azure-core
 asgiref==3.7.2
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   django
     #   django-browser-reload
 azure-core==1.29.6
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   azure-storage-blob
 azure-storage-blob==12.19.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 beautifulsoup4==4.11.2
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 bleach==4.1.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
+    #   django-post-office
     #   wagtail-markdown
 build==1.0.3
     # via pip-tools
 certifi==2023.11.17
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   requests
     #   sentry-sdk
 cffi==1.16.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   cryptography
 cfgv==3.4.0
     # via pre-commit
 charset-normalizer==3.3.2
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   requests
 click==8.1.7
     # via pip-tools
 cryptography==41.0.7
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   azure-storage-blob
 defusedxml==0.7.1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   willow
 distlib==0.3.8
     # via virtualenv
 dj-database-url==2.1.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 django==4.1.13
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   dj-database-url
     #   django-anymail
     #   django-browser-reload
@@ -91,6 +92,7 @@ django==4.1.13
     #   django-filter
     #   django-modelcluster
     #   django-permissionedforms
+    #   django-post-office
     #   django-recaptcha
     #   django-storages
     #   django-taggit
@@ -101,192 +103,196 @@ django==4.1.13
     #   wagtail
 django-anymail==10.3
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 django-browser-reload==1.12.1
     # via django-tailwind
 django-colorful==1.3
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   puput
 django-debug-toolbar==4.3.0
     # via
-    #   -r requirements-dev.in
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-dev.in
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 django-el-pagination==4.0.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   puput
 django-extensions==3.2.3
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 django-filter==22.1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 django-modelcluster==6.2.1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 django-permissionedforms==0.1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
+django-post-office==3.8.0
+    # via -r requirements/requirements.txt
 django-recaptcha==4.0.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 django-social-share==2.3.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   puput
 django-storages==1.13.2
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 django-taggit==3.1.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   puput
     #   wagtail
 django-tailwind==3.8.0
     # via
-    #   -r requirements-dev.in
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-dev.in
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 django-treebeard==4.7
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 django-widget-tweaks==1.5.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 djangorestframework==3.14.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 draftjs-exporter==2.1.7
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 et-xmlfile==1.1.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   openpyxl
+exceptiongroup==1.2.0
+    # via -r requirements/requirements-test.txt
 factory-boy==3.3.0
-    # via -r requirements-test.txt
+    # via -r requirements/requirements-test.txt
 faker==23.2.1
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   factory-boy
 filelock==3.13.1
     # via virtualenv
 filetype==1.2.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   willow
 freezegun==1.4.0
-    # via -r requirements-test.txt
+    # via -r requirements/requirements-test.txt
 greenlet==3.0.3
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   playwright
 html5lib==1.1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 identify==2.5.33
     # via pre-commit
 idna==3.6
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   anyio
     #   requests
 iniconfig==2.0.0
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   pytest
 isodate==0.6.1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   azure-storage-blob
 l18n==2021.3
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 markdown==3.5.2
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail-markdown
 nodeenv==1.8.0
     # via pre-commit
 openpyxl==3.1.2
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 packaging==23.2
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   bleach
     #   build
     #   pytest
 pillow==10.2.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 pip-tools==7.4.1
-    # via -r requirements-dev.in
+    # via -r requirements/requirements-dev.in
 platformdirs==4.1.0
     # via virtualenv
 playwright==1.42.0
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   pytest-playwright
 pluggy==1.3.0
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   pytest
 pre-commit==3.7.0
-    # via -r requirements-dev.in
+    # via -r requirements/requirements-dev.in
 psycopg2-binary==2.9.9
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 puput==2.0.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 pycparser==2.21
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   cffi
 pyee==11.0.1
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   playwright
 pyproject-hooks==1.0.0
     # via
@@ -294,59 +300,60 @@ pyproject-hooks==1.0.0
     #   pip-tools
 pytest==7.4.4
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   pytest-base-url
     #   pytest-django
     #   pytest-mock
     #   pytest-playwright
 pytest-base-url==2.0.0
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   pytest-playwright
 pytest-django==4.8.0
-    # via -r requirements-test.txt
+    # via -r requirements/requirements-test.txt
 pytest-mock==3.14.0
-    # via -r requirements-test.txt
+    # via -r requirements/requirements-test.txt
 pytest-playwright==0.4.4
-    # via -r requirements-test.txt
+    # via -r requirements/requirements-test.txt
 python-dateutil==2.8.2
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   faker
     #   freezegun
 python-dotenv==1.0.1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 python-slugify==8.0.1
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   pytest-playwright
 pytz==2023.3.post1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   django-modelcluster
+    #   django-post-office
     #   djangorestframework
     #   l18n
 pyyaml==6.0.1
     # via pre-commit
 requests==2.31.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   azure-core
     #   django-anymail
     #   pytest-base-url
     #   wagtail
 sentry-sdk==1.40.4
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 six==1.16.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   azure-core
     #   bleach
     #   html5lib
@@ -355,47 +362,47 @@ six==1.16.0
     #   python-dateutil
 sniffio==1.3.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   anyio
 soupsieve==2.5
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   beautifulsoup4
 sqlparse==0.4.4
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   django
     #   django-debug-toolbar
 supervisor==4.2.5
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 telepath==0.3.1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 text-unidecode==1.3
     # via
-    #   -r requirements-test.txt
+    #   -r requirements/requirements-test.txt
     #   python-slugify
 typing-extensions==4.10.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   azure-core
     #   azure-storage-blob
     #   dj-database-url
     #   pyee
 unittest-parametrize==1.4.0
-    # via -r requirements-test.txt
+    # via -r requirements/requirements-test.txt
 urllib3==2.2.1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   django-anymail
     #   requests
     #   sentry-sdk
@@ -403,31 +410,31 @@ virtualenv==20.25.0
     # via pre-commit
 wagtail==5.0.5
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   puput
     #   wagtail-markdown
 wagtail-markdown==0.11.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   puput
 webencodings==0.5.1
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   bleach
     #   html5lib
 wheel==0.42.0
     # via pip-tools
 whitenoise==6.6.0
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
 willow==1.6.3
     # via
-    #   -r requirements-test.txt
-    #   -r requirements.txt
+    #   -r requirements/requirements-test.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/requirements-test.txt b/requirements/requirements-test.txt
index 7c859948..1dbe6cec 100644
--- a/requirements/requirements-test.txt
+++ b/requirements/requirements-test.txt
@@ -6,56 +6,57 @@
 #
 anyascii==0.3.2
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 anyio==4.2.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   azure-core
 asgiref==3.7.2
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   django
 azure-core==1.29.6
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   azure-storage-blob
 azure-storage-blob==12.19.0
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 beautifulsoup4==4.11.2
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 bleach==4.1.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
+    #   django-post-office
     #   wagtail-markdown
 certifi==2023.11.17
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   requests
     #   sentry-sdk
 cffi==1.16.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   cryptography
 charset-normalizer==3.3.2
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   requests
 cryptography==41.0.7
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   azure-storage-blob
 defusedxml==0.7.1
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   willow
 dj-database-url==2.1.0
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 django==4.1.13
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   dj-database-url
     #   django-anymail
     #   django-colorful
@@ -65,6 +66,7 @@ django==4.1.13
     #   django-filter
     #   django-modelcluster
     #   django-permissionedforms
+    #   django-post-office
     #   django-recaptcha
     #   django-storages
     #   django-taggit
@@ -74,131 +76,133 @@ django==4.1.13
     #   puput
     #   wagtail
 django-anymail==10.3
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 django-colorful==1.3
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   puput
 django-debug-toolbar==4.3.0
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 django-el-pagination==4.0.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   puput
 django-extensions==3.2.3
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 django-filter==22.1
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 django-modelcluster==6.2.1
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 django-permissionedforms==0.1
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
+django-post-office==3.8.0
+    # via -r requirements/requirements.txt
 django-recaptcha==4.0.0
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 django-social-share==2.3.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   puput
 django-storages==1.13.2
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 django-taggit==3.1.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   puput
     #   wagtail
 django-tailwind==3.8.0
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 django-treebeard==4.7
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 django-widget-tweaks==1.5.0
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 djangorestframework==3.14.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 draftjs-exporter==2.1.7
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 et-xmlfile==1.1.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   openpyxl
 factory-boy==3.3.0
-    # via -r requirements-test.in
+    # via -r requirements/requirements-test.in
 faker==23.2.1
     # via factory-boy
 filetype==1.2.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   willow
 freezegun==1.4.0
-    # via -r requirements-test.in
+    # via -r requirements/requirements-test.in
 greenlet==3.0.3
     # via playwright
 html5lib==1.1
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 idna==3.6
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   anyio
     #   requests
 iniconfig==2.0.0
     # via pytest
 isodate==0.6.1
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   azure-storage-blob
 l18n==2021.3
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 markdown==3.5.2
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail-markdown
 openpyxl==3.1.2
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 packaging==23.2
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   bleach
     #   pytest
 pillow==10.2.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 playwright==1.42.0
     # via
-    #   -r requirements-test.in
+    #   -r requirements/requirements-test.in
     #   pytest-playwright
 pluggy==1.3.0
     # via pytest
 psycopg2-binary==2.9.9
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 puput==2.0.0
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 pycparser==2.21
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   cffi
 pyee==11.0.1
     # via playwright
 pytest==7.4.4
     # via
-    #   -r requirements-test.in
+    #   -r requirements/requirements-test.in
     #   pytest-base-url
     #   pytest-django
     #   pytest-mock
@@ -206,37 +210,38 @@ pytest==7.4.4
 pytest-base-url==2.0.0
     # via pytest-playwright
 pytest-django==4.8.0
-    # via -r requirements-test.in
+    # via -r requirements/requirements-test.in
 pytest-mock==3.14.0
-    # via -r requirements-test.in
+    # via -r requirements/requirements-test.in
 pytest-playwright==0.4.4
-    # via -r requirements-test.in
+    # via -r requirements/requirements-test.in
 python-dateutil==2.8.2
     # via
     #   faker
     #   freezegun
 python-dotenv==1.0.1
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 python-slugify==8.0.1
     # via pytest-playwright
 pytz==2023.3.post1
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   django-modelcluster
+    #   django-post-office
     #   djangorestframework
     #   l18n
 requests==2.31.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   azure-core
     #   django-anymail
     #   pytest-base-url
     #   wagtail
 sentry-sdk==1.40.4
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 six==1.16.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   azure-core
     #   bleach
     #   html5lib
@@ -245,59 +250,59 @@ six==1.16.0
     #   python-dateutil
 sniffio==1.3.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   anyio
 soupsieve==2.5
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   beautifulsoup4
 sqlparse==0.4.4
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   django
     #   django-debug-toolbar
 supervisor==4.2.5
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 telepath==0.3.1
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 text-unidecode==1.3
     # via python-slugify
 typing-extensions==4.10.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   azure-core
     #   azure-storage-blob
     #   dj-database-url
     #   pyee
 unittest-parametrize==1.4.0
-    # via -r requirements-test.in
+    # via -r requirements/requirements-test.in
 urllib3==2.2.1
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   django-anymail
     #   requests
     #   sentry-sdk
 wagtail==5.0.5
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   puput
     #   wagtail-markdown
 wagtail-markdown==0.11.0
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   puput
 webencodings==0.5.1
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   bleach
     #   html5lib
 whitenoise==6.6.0
-    # via -r requirements.txt
+    # via -r requirements/requirements.txt
 willow==1.6.3
     # via
-    #   -r requirements.txt
+    #   -r requirements/requirements.txt
     #   wagtail
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/requirements.in b/requirements/requirements.in
index 81280adb..88df1e43 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -18,3 +18,4 @@ sentry-sdk[django]
 supervisor
 django-widget-tweaks
 dj-database-url
+django-post_office
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index 663b83e6..a1252525 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -17,7 +17,9 @@ azure-storage-blob==12.19.0
 beautifulsoup4==4.11.2
     # via wagtail
 bleach==4.1.0
-    # via wagtail-markdown
+    # via
+    #   django-post-office
+    #   wagtail-markdown
 certifi==2023.11.17
     # via
     #   requests
@@ -31,10 +33,10 @@ cryptography==41.0.7
 defusedxml==0.7.1
     # via willow
 dj-database-url==2.1.0
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 django==4.1.13
     # via
-    #   -r requirements.in
+    #   -r requirements/requirements.in
     #   dj-database-url
     #   django-anymail
     #   django-colorful
@@ -44,6 +46,7 @@ django==4.1.13
     #   django-filter
     #   django-modelcluster
     #   django-permissionedforms
+    #   django-post-office
     #   django-recaptcha
     #   django-storages
     #   django-taggit
@@ -54,37 +57,39 @@ django==4.1.13
     #   sentry-sdk
     #   wagtail
 django-anymail==10.3
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 django-colorful==1.3
     # via puput
 django-debug-toolbar==4.3.0
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 django-el-pagination==4.0.0
     # via puput
 django-extensions==3.2.3
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 django-filter==22.1
     # via wagtail
 django-modelcluster==6.2.1
     # via wagtail
 django-permissionedforms==0.1
     # via wagtail
+django-post-office==3.8.0
+    # via -r requirements/requirements.in
 django-recaptcha==4.0.0
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 django-social-share==2.3.0
     # via puput
 django-storages==1.13.2
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 django-taggit==3.1.0
     # via
     #   puput
     #   wagtail
 django-tailwind==3.8.0
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 django-treebeard==4.7
     # via wagtail
 django-widget-tweaks==1.5.0
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 djangorestframework==3.14.0
     # via wagtail
 draftjs-exporter==2.1.7
@@ -112,16 +117,17 @@ packaging==23.2
 pillow==10.2.0
     # via wagtail
 psycopg2-binary==2.9.9
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 puput==2.0.0
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 pycparser==2.21
     # via cffi
 python-dotenv==1.0.1
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 pytz==2023.3.post1
     # via
     #   django-modelcluster
+    #   django-post-office
     #   djangorestframework
     #   l18n
 requests==2.31.0
@@ -130,10 +136,10 @@ requests==2.31.0
     #   django-anymail
     #   wagtail
 sentry-sdk==1.40.4
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 six==1.16.0
     # via
-    #   -r requirements.in
+    #   -r requirements/requirements.in
     #   azure-core
     #   bleach
     #   html5lib
@@ -148,24 +154,24 @@ sqlparse==0.4.4
     #   django
     #   django-debug-toolbar
 supervisor==4.2.5
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 telepath==0.3.1
     # via wagtail
 typing-extensions==4.10.0
     # via
-    #   -r requirements.in
+    #   -r requirements/requirements.in
     #   azure-core
     #   azure-storage-blob
     #   dj-database-url
 urllib3==2.2.1
     # via
-    #   -r requirements.in
+    #   -r requirements/requirements.in
     #   django-anymail
     #   requests
     #   sentry-sdk
 wagtail==5.0.5
     # via
-    #   -r requirements.in
+    #   -r requirements/requirements.in
     #   puput
     #   wagtail-markdown
 wagtail-markdown==0.11.0
@@ -175,7 +181,7 @@ webencodings==0.5.1
     #   bleach
     #   html5lib
 whitenoise==6.6.0
-    # via -r requirements.in
+    # via -r requirements/requirements.in
 willow==1.6.3
     # via wagtail
 
diff --git a/supervisord.conf b/supervisord.conf
index 02d956dc..86941c09 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -3,3 +3,11 @@ nodaemon=false
 
 [program:foo]
 command=/bin/cat
+
+[program:post_office_send_queued_mail]
+command=bash -c 'python /app/manage.py send_queued_mail && sleep 30'
+autorestart=true
+
+[program:post_office_cleanup_mail]
+command=bash -c 'python /app/manage.py python manage.py cleanup_mail --days=30 --delete-attachments && sleep 86400'
+autorestart=true

From fc2dccdf24321485096d6e43585ec8895ab8a845 Mon Sep 17 00:00:00 2001
From: Sarah Boyce <42296566+sarahboyce@users.noreply.github.com>
Date: Mon, 1 Apr 2024 14:34:47 +0200
Subject: [PATCH 02/13] Add a user survey response view. (#370)

---
 home/forms.py                                 | 21 +++++++-
 home/managers.py                              |  6 +--
 .../home/includes/session_apply_btn.html      |  2 +
 home/templates/home/surveys/form.html         |  6 ++-
 home/tests/test_session_views.py              |  7 ++-
 .../test_user_survey_response_form_views.py   | 50 +++++++++++++++++++
 home/urls.py                                  |  6 +++
 home/views.py                                 | 39 ++++++++++++++-
 indymeet/templates/forms/form.html            |  4 +-
 9 files changed, 130 insertions(+), 11 deletions(-)

diff --git a/home/forms.py b/home/forms.py
index c75a1993..1492fa1a 100644
--- a/home/forms.py
+++ b/home/forms.py
@@ -31,7 +31,7 @@ def make_choices(question: Question) -> list[tuple[str, str]]:
 
 
 class BaseSurveyForm(forms.Form):
-    def __init__(self, survey, user, *args, **kwargs):
+    def __init__(self, *args, survey, user, **kwargs):
         self.survey = survey
         self.user = user if user.is_authenticated else None
         self.field_names = []
@@ -158,3 +158,22 @@ def save(self):
                 value=value,
                 user_survey_response=user_survey_response,
             )
+
+
+class UserSurveyResponseForm(BaseSurveyForm):
+    def __init__(self, *args, instance, **kwargs):
+        self.survey = instance.survey
+        self.user_survey_response = instance
+        super().__init__(*args, survey=self.survey, user=instance.user, *args, **kwargs)
+        self._set_initial_data()
+
+    def _set_initial_data(self):
+        question_responses = self.user_survey_response.userquestionresponse_set.all()
+
+        for question_response in question_responses:
+            field_name = f"field_survey_{question_response.question.id}"
+            if question_response.question.type_field == TypeField.MULTI_SELECT:
+                self.fields[field_name].initial = question_response.value.split(",")
+            else:
+                self.fields[field_name].initial = question_response.value
+            self.fields[field_name].disabled = True
diff --git a/home/managers.py b/home/managers.py
index 7f03c569..e75eb29d 100644
--- a/home/managers.py
+++ b/home/managers.py
@@ -1,7 +1,7 @@
 from __future__ import annotations
 
-from django.db.models import Exists
 from django.db.models import OuterRef
+from django.db.models import Subquery
 from django.db.models import Value
 from django.db.models.query import QuerySet
 from django.utils import timezone
@@ -37,10 +37,10 @@ def with_applications(self, user):
         if user.is_anonymous:
             return self.annotate(completed_application=Value(False))
         return self.annotate(
-            completed_application=Exists(
+            completed_application=Subquery(
                 UserSurveyResponse.objects.filter(
                     survey_id=OuterRef("application_survey_id"), user_id=user.id
-                )
+                ).values("id")[:1]
             )
         )
 
diff --git a/home/templates/home/includes/session_apply_btn.html b/home/templates/home/includes/session_apply_btn.html
index 0a6e9fca..ff3abfcd 100644
--- a/home/templates/home/includes/session_apply_btn.html
+++ b/home/templates/home/includes/session_apply_btn.html
@@ -3,5 +3,7 @@
   <a href="{{ session.application_url }}" target="_blank" class="rounded-md bg-primary px-5 py-2.5 text-sm font-medium text-white transition hover:bg-gray-300 hover:text-ds-purple cursor-pointer">Apply</a>
   {% elif request.user.is_authenticated and not session.completed_application and request.user.profile.email_confirmed %}
   <a href="{{ session.get_application_url }}" target="_blank" class="rounded-md bg-primary px-5 py-2.5 text-sm font-medium text-white transition hover:bg-gray-300 hover:text-ds-purple cursor-pointer">Apply</a>
+  {% elif session.completed_application %}
+  <a href="{% url 'user_survey_response' session.completed_application %}" target="_blank" class="rounded-md bg-primary px-5 py-2.5 text-sm font-medium text-white transition hover:bg-gray-300 hover:text-ds-purple cursor-pointer">View Application</a>
   {% endif %}
 {% endif %}
diff --git a/home/templates/home/surveys/form.html b/home/templates/home/surveys/form.html
index f964ea40..213e6f79 100644
--- a/home/templates/home/surveys/form.html
+++ b/home/templates/home/surveys/form.html
@@ -21,9 +21,9 @@ <h1 class="text-center text-5xl">{{ title_page }}</h1>
                         <p class="text-sm text-gray-500">{{ field.help_text|linebreaksbr|urlize }}</p>
                         <div class="mt-1">
                             {% if field.field.widget.input_type == 'radio' or field.field.widget.input_type == 'checkbox' %}
-                                {{ field }}
+                                {{ field|addclass:'read-only:text-slate-700' }}
                             {% else %}
-                                {{ field|addclass:'w-full p-4 pr-12 text-sm border-gray-500 rounded-lg shadow-sm' }}
+                                {{ field|addclass:'w-full p-4 pr-12 text-sm border-gray-500 rounded-lg shadow-sm disabled:bg-slate-50 disabled:text-slate-700 disabled:border-slate-200' }}
                             {% endif %}
                         </div>
                         <span class="text-sm text-red-400">{{ field.errors }}</span>
@@ -31,9 +31,11 @@ <h1 class="text-center text-5xl">{{ title_page }}</h1>
 
                 {% endfor %}
 
+                {% if not read_only %}
                 <button type="submit" class="block w-full mt-5 px-5 py-3 text-sm font-medium text-white bg-blue-500 rounded-lg">
                     {% trans "Submit" %}
                 </button>
+                {% endif %}
             </form>
         </div>
     </div>
diff --git a/home/tests/test_session_views.py b/home/tests/test_session_views.py
index ad20b561..2c16fd5d 100644
--- a/home/tests/test_session_views.py
+++ b/home/tests/test_session_views.py
@@ -84,7 +84,7 @@ def test_session_list_email_confirmed(self):
 
     def test_session_list_email_confirmed_already_applied(self):
         user = UserFactory.create(profile__email_confirmed=True)
-        UserSurveyResponseFactory(survey=self.survey, user=user)
+        survey_response = UserSurveyResponseFactory(survey=self.survey, user=user)
         self.client.force_login(user)
         response = self.client.get(reverse("session_list"))
         self.assertEqual(response.status_code, 200)
@@ -96,6 +96,11 @@ def test_session_list_email_confirmed_already_applied(self):
         )
         self.assertNotContains(response, "Your email is not confirmed!")
         self.assertNotContains(response, "You may not be able to apply for sessions")
+        self.assertContains(response, "View Application")
+        survey_detail_url = reverse(
+            "user_survey_response", kwargs={"pk": survey_response.id}
+        )
+        self.assertContains(response, survey_detail_url)
 
     def test_session_detail_open_application(self):
         url = reverse(
diff --git a/home/tests/test_user_survey_response_form_views.py b/home/tests/test_user_survey_response_form_views.py
index 4cbc0588..0ffa5f85 100644
--- a/home/tests/test_user_survey_response_form_views.py
+++ b/home/tests/test_user_survey_response_form_views.py
@@ -6,6 +6,7 @@
 from accounts.factories import UserFactory
 from home.factories import QuestionFactory
 from home.factories import SurveyFactory
+from home.factories import UserQuestionResponseFactory
 from home.factories import UserSurveyResponseFactory
 from home.models import UserQuestionResponse
 from home.models import UserSurveyResponse
@@ -72,3 +73,52 @@ def test_success_message(self):
             ).value,
             "Amazing",
         )
+
+
+class UserSurveyResponseViewTests(TestCase):
+    @classmethod
+    def setUpTestData(cls):
+        cls.survey = SurveyFactory.create(
+            name="Test Survey", description="This is a description of the survey!"
+        )
+        cls.user = UserFactory.create()
+        cls.question_1 = QuestionFactory.create(
+            survey=cls.survey,
+            label="How are you?",
+        )
+        cls.question_2 = QuestionFactory.create(
+            survey=cls.survey,
+            label="What is your favourite food?",
+        )
+        cls.survey_response = UserSurveyResponseFactory(
+            survey=cls.survey, user=cls.user
+        )
+        UserQuestionResponseFactory(
+            user_survey_response=cls.survey_response,
+            question=cls.question_1,
+            value="Very good",
+        )
+        UserQuestionResponseFactory(
+            user_survey_response=cls.survey_response,
+            question=cls.question_2,
+            value="Pizza",
+        )
+        cls.url = reverse("user_survey_response", kwargs={"pk": cls.survey_response.id})
+
+    def test_success_get(self):
+        self.client.force_login(self.user)
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, 200)
+        self.assertContains(response, "Test Survey")
+        self.assertContains(response, "This is a description of the survey!")
+        self.assertContains(response, "How are you?")
+        self.assertContains(response, "Very good")
+        self.assertContains(response, "What is your favourite food?")
+        self.assertContains(response, "Pizza")
+        self.assertNotContains(response, "Submit")
+
+    def test_cannot_view_others_survey_response(self):
+        different_user = UserFactory.create()
+        self.client.force_login(different_user)
+        response = self.client.get(self.url)
+        self.assertEqual(response.status_code, 403)
diff --git a/home/urls.py b/home/urls.py
index 89c6431b..60ef0722 100644
--- a/home/urls.py
+++ b/home/urls.py
@@ -8,6 +8,7 @@
 from .views import EventListView
 from .views import SessionDetailView
 from .views import SessionListView
+from .views import UserSurveyResponseView
 
 urlpatterns = [
     path("calendar/", event_calendar, name="calendar"),
@@ -24,4 +25,9 @@
         CreateUserSurveyResponseFormView.as_view(),
         name="survey_response_create",
     ),
+    path(
+        "survey_response/<int:pk>/",
+        UserSurveyResponseView.as_view(),
+        name="user_survey_response",
+    ),
 ]
diff --git a/home/views.py b/home/views.py
index bec9f310..c40d431f 100644
--- a/home/views.py
+++ b/home/views.py
@@ -5,16 +5,20 @@
 from django.contrib import messages
 from django.contrib.auth.mixins import LoginRequiredMixin
 from django.contrib.auth.mixins import UserPassesTestMixin
+from django.db.models import Prefetch
 from django.shortcuts import render
 from django.urls import reverse_lazy
 from django.views.generic.detail import DetailView
 from django.views.generic.edit import FormMixin
+from django.views.generic.edit import ModelFormMixin
 from django.views.generic.list import ListView
 
 from .forms import CreateUserSurveyResponseForm
+from .forms import UserSurveyResponseForm
 from .models import Event
 from .models import Session
 from .models import Survey
+from .models import UserQuestionResponse
 from .models import UserSurveyResponse
 
 
@@ -114,11 +118,12 @@ class CreateUserSurveyResponseFormView(
     template_name = "home/surveys/form.html"
 
     def test_func(self):
-        survey = self.get_object()
         user = self.request.user
         return (
             user.profile.email_confirmed
-            and not UserSurveyResponse.objects.filter(survey=survey, user=user).exists()
+            and not UserSurveyResponse.objects.filter(
+                survey__slug=self.kwargs.get(self.slug_url_kwarg), user=user
+            ).exists()
         )
 
     def get_form_kwargs(self):
@@ -143,3 +148,33 @@ def post(self, request, *args, **kwargs):
         else:
             messages.error(self.request, gettext("Something went wrong."))
             return self.form_invalid(form)
+
+
+class UserSurveyResponseView(
+    LoginRequiredMixin, UserPassesTestMixin, ModelFormMixin, DetailView
+):
+    model = UserSurveyResponse
+    form_class = UserSurveyResponseForm
+    success_url = reverse_lazy("session_list")
+    template_name = "home/surveys/form.html"
+
+    def get_queryset(self):
+        return UserSurveyResponse.objects.select_related("survey").prefetch_related(
+            Prefetch(
+                "userquestionresponse_set",
+                queryset=UserQuestionResponse.objects.select_related("question"),
+            )
+        )
+
+    def test_func(self):
+        return UserSurveyResponse.objects.filter(
+            user=self.request.user, id=self.kwargs.get(self.pk_url_kwarg)
+        ).exists()
+
+    def get_context_data(self, **kwargs):
+        survey = self.object.survey
+        kwargs["title_page"] = survey.name
+        kwargs["sub_title_page"] = survey.description
+        kwargs["read_only"] = True
+        context_data = super().get_context_data(**kwargs)
+        return context_data
diff --git a/indymeet/templates/forms/form.html b/indymeet/templates/forms/form.html
index 0b488b36..eb544fc6 100644
--- a/indymeet/templates/forms/form.html
+++ b/indymeet/templates/forms/form.html
@@ -9,9 +9,9 @@
   <label class="block">
     <span>{{ field.label }}</span>
     <!-- Checkbox -->
-    {% if field|field_type == 'booleanfield' %} {{ field|add_class:"rounded border-gray-300 text-indigo-600 shadow-sm focus:border-indigo-300 focus:ring focus:ring-offset-0 focus:ring-indigo-200 focus:ring-opacity-50" }}
+    {% if field|field_type == 'booleanfield' %} {{ field|add_class:"rounded border-gray-300 text-indigo-600 shadow-sm focus:border-indigo-300 focus:ring focus:ring-offset-0 focus:ring-indigo-200 focus:ring-opacity-50 read-only:text-slate-700" }}
     {% else %}
-    {{ field|add_class:"mt-1 block rounded-lg border-gray-300 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50"|attr:"placeholder:" }}
+    {{ field|add_class:"mt-1 block rounded-lg border-gray-300 shadow-sm focus:border-indigo-300 focus:ring focus:ring-indigo-200 focus:ring-opacity-50 disabled:bg-slate-50 disabled:text-slate-700 disabled:border-slate-200"|attr:"placeholder:" }}
     {% endif %}
     {% if field.help_text %}<div class="text-gray-500"{% if field.auto_id %} id="{{ field.auto_id }}_helptext"{% endif %}>{{ field.help_text|safe }}</div>{% endif %}
     {% if field.errors %}<ul class="text-red-700">{% for error in field.errors %}<li>{{ error }}</li>{% endfor %}</ul>{% endif %}

From cc3e25d6000145353bfb4ff9e0783ba1379a4058 Mon Sep 17 00:00:00 2001
From: Rachell Calhoun <RachellCalhoun@users.noreply.github.com>
Date: Tue, 2 Apr 2024 13:57:11 -0400
Subject: [PATCH 03/13] remove owner for general pages (#377)

---
 home/templates/home/general_page.html | 4 ----
 1 file changed, 4 deletions(-)

diff --git a/home/templates/home/general_page.html b/home/templates/home/general_page.html
index a01f7cad..95cd3a25 100644
--- a/home/templates/home/general_page.html
+++ b/home/templates/home/general_page.html
@@ -12,10 +12,6 @@ <h2 class="text-2xl font-extrabold tracking-tight text-slate-900 dark:text-slate
             <a href="{% pageurl page %}">{{ page.title }}</a>
           </h2>
           <ul class="links">
-            <li>
-              <i class="fa fa-user"></i>
-              {{ page.owner }}
-            </li>
             <li>
               <i class="fa fa-calendar"></i>
               {{ page.date|date:"DATE_FORMAT" }}

From 740e224194e759fc224cf396d40b081f31d45727 Mon Sep 17 00:00:00 2001
From: Rachell Calhoun <RachellCalhoun@users.noreply.github.com>
Date: Wed, 3 Apr 2024 17:23:19 -0400
Subject: [PATCH 04/13] add linebreaks to text (#385)

---
 indymeet/templates/blocks/left-image-right-text.html         | 2 +-
 indymeet/templates/blocks/right-image-left-text.html         | 2 +-
 indymeet/templates/blocks/text-image-heading.html            | 2 +-
 indymeet/templates/blocks/text-with-heading-left-image.html  | 2 +-
 indymeet/templates/blocks/text-with-heading-right-image.html | 2 +-
 indymeet/templates/blocks/text-with-heading.html             | 2 +-
 6 files changed, 6 insertions(+), 6 deletions(-)

diff --git a/indymeet/templates/blocks/left-image-right-text.html b/indymeet/templates/blocks/left-image-right-text.html
index d6350959..a3cdf739 100644
--- a/indymeet/templates/blocks/left-image-right-text.html
+++ b/indymeet/templates/blocks/left-image-right-text.html
@@ -5,7 +5,7 @@
         <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>{% image value.image width-1000 %}</div>
             <div>
-                <p>{{ value.text|safe|urlize }}</p>
+                <p>{{ value.text|safe|urlize|linebreaks }}</p>
             </div>
         </div>
     </div>
diff --git a/indymeet/templates/blocks/right-image-left-text.html b/indymeet/templates/blocks/right-image-left-text.html
index c3a9db7e..3bec9de6 100644
--- a/indymeet/templates/blocks/right-image-left-text.html
+++ b/indymeet/templates/blocks/right-image-left-text.html
@@ -4,7 +4,7 @@
     <div class="mt-3 ">
         <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-               <p class="md:text-right">{{ value.text|safe|urlize }}</p>
+               <p class="md:text-right">{{ value.text|safe|urlize|linebreaks }}</p>
             </div>
             <div class="md:float-right">{% image value.image width-1000 %}</div>
         </div>
diff --git a/indymeet/templates/blocks/text-image-heading.html b/indymeet/templates/blocks/text-image-heading.html
index 24237d4a..6b5e30da 100644
--- a/indymeet/templates/blocks/text-image-heading.html
+++ b/indymeet/templates/blocks/text-image-heading.html
@@ -6,7 +6,7 @@ <h2 class="mt-4 mb-4 text-4xl blog-heading">{{ value.heading|safe }}</h2>
         <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>{% image value.image fill-900x700 %}</div>
             <div>
-                <p>{{ value.text|safe|urlize }}</p>
+                <p>{{ value.text|safe|urlize|linebreaks }}</p>
             </div>
         </div>
     </div>
diff --git a/indymeet/templates/blocks/text-with-heading-left-image.html b/indymeet/templates/blocks/text-with-heading-left-image.html
index 24237d4a..6b5e30da 100644
--- a/indymeet/templates/blocks/text-with-heading-left-image.html
+++ b/indymeet/templates/blocks/text-with-heading-left-image.html
@@ -6,7 +6,7 @@ <h2 class="mt-4 mb-4 text-4xl blog-heading">{{ value.heading|safe }}</h2>
         <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>{% image value.image fill-900x700 %}</div>
             <div>
-                <p>{{ value.text|safe|urlize }}</p>
+                <p>{{ value.text|safe|urlize|linebreaks }}</p>
             </div>
         </div>
     </div>
diff --git a/indymeet/templates/blocks/text-with-heading-right-image.html b/indymeet/templates/blocks/text-with-heading-right-image.html
index b232b301..55a5d8df 100644
--- a/indymeet/templates/blocks/text-with-heading-right-image.html
+++ b/indymeet/templates/blocks/text-with-heading-right-image.html
@@ -5,7 +5,7 @@ <h2 class="mt-4 mb-4 text-4xl blog-heading md:text-right">{{ value.heading|safe
     <div>
         <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>
-                <p class="md:text-right">{{ value.text|safe|urlize }}</p>
+                <p class="md:text-right">{{ value.text|safe|urlize|linebreaks }}</p>
             </div>
         <div>
             <div class="md:float-right">{% image value.image fill-900x700 %}</div>
diff --git a/indymeet/templates/blocks/text-with-heading.html b/indymeet/templates/blocks/text-with-heading.html
index eeae2b6b..01f46367 100644
--- a/indymeet/templates/blocks/text-with-heading.html
+++ b/indymeet/templates/blocks/text-with-heading.html
@@ -2,7 +2,7 @@
     <h2 class="mt-4 mb-4 text-4xl blog-heading">{{ value.heading }}</h2>
     <div class="text-container">
         <div>
-            <p>{{ value.text|safe|urlize }}</p>
+            <p>{{ value.text|safe|urlize|linebreaks }}</p>
         </div>
     </div>
 </div>

From dbb11953017fdf2a2ea0e363a21e90c94cae1627 Mon Sep 17 00:00:00 2001
From: Rachell Calhoun <RachellCalhoun@users.noreply.github.com>
Date: Wed, 3 Apr 2024 17:29:09 -0400
Subject: [PATCH 05/13] merge develop (#383)

---
 home/blocks.py                                |  37 +--
 ...ter_generalpage_content_optional_fields.py | 260 ++++++++++++++++++
 ...06_alter_entrypage_body_optional_fields.py | 259 +++++++++++++++++
 .../templates/blocks/text-image-heading.html  |   8 +-
 .../blocks/text-with-heading-left-image.html  |   2 +
 .../blocks/text-with-heading-right-image.html |   2 +
 6 files changed, 535 insertions(+), 33 deletions(-)
 create mode 100644 home/migrations/0027_alter_generalpage_content_optional_fields.py
 create mode 100644 home/puput_migrations/0006_alter_entrypage_body_optional_fields.py

diff --git a/home/blocks.py b/home/blocks.py
index 9fe4af24..a528f476 100644
--- a/home/blocks.py
+++ b/home/blocks.py
@@ -81,7 +81,9 @@ class Meta:
 
 
 class TextWithHeadingWithRightImageBlock(blocks.StructBlock):
-    heading = blocks.CharBlock(max_length=255, class_name="heading-blog")
+    heading = blocks.CharBlock(
+        max_length=255, class_name="heading-blog", required=False
+    )
     text = blocks.TextBlock()
     image = ImageChooserBlock()
 
@@ -94,7 +96,7 @@ class Meta:
 
 
 class TextWithHeadingWithLeftImageBlock(blocks.StructBlock):
-    heading = blocks.CharBlock(max_length=255, class_name="blog")
+    heading = blocks.CharBlock(max_length=255, class_name="blog", required=False)
     text = blocks.TextBlock()
     image = ImageChooserBlock()
 
@@ -106,30 +108,6 @@ class Meta:
         template = "blocks/text-with-heading-left-image.html"
 
 
-class RightImageLeftTextBlock(blocks.StructBlock):
-    image = ImageChooserBlock()
-    text = blocks.TextBlock()
-
-    def __str__(self):
-        return self.text
-
-    class Meta:
-        label = "Text Block: Right Image"
-        template = "blocks/right-image-left-text.html"
-
-
-class LeftImageRightTextBlock(blocks.StructBlock):
-    image = ImageChooserBlock()
-    text = blocks.TextBlock()
-
-    def __str__(self):
-        return self.text
-
-    class Meta:
-        label = "Text Block: Left Image"
-        template = "blocks/left-image-right-text.html"
-
-
 class QuoteBlock(blocks.StructBlock):
     text = blocks.CharBlock(max_length=255)
     attribution = blocks.CharBlock(max_length=255)
@@ -184,10 +162,9 @@ class Meta:
 
 
 class TextHeadingImageBlock(blocks.StructBlock):
-    heading = blocks.CharBlock(max_length=255)
-    text = blocks.TextBlock()
+    heading = blocks.CharBlock(max_length=255, required=False)
+    text = blocks.TextBlock(required=False)
     image = ImageChooserBlock()
-    # TODO: Add left or right side
 
     def __str__(self):
         return self.heading
@@ -243,8 +220,6 @@ class BaseStreamBlock(blocks.StreamBlock):
     text_with_heading_and_image = TextHeadingImageBlock()
     text_with_heading_and_right_image = TextWithHeadingWithRightImageBlock()
     text_with_heading_and_left_image = TextWithHeadingWithLeftImageBlock()
-    right_image_left_text = RightImageLeftTextBlock()
-    left_image_right_text = LeftImageRightTextBlock()
     left_quote_right_image = QuoteLeftImageBlock(icon="openquote")
     video_embed = VideoEmbed()
     table = CustomTableBlock()
diff --git a/home/migrations/0027_alter_generalpage_content_optional_fields.py b/home/migrations/0027_alter_generalpage_content_optional_fields.py
new file mode 100644
index 00000000..792ac1de
--- /dev/null
+++ b/home/migrations/0027_alter_generalpage_content_optional_fields.py
@@ -0,0 +1,260 @@
+# Generated by Django 4.1.13 on 2024-04-03 17:07
+from __future__ import annotations
+
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import home.blocks
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("home", "0026_session_application_survey_and_more"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="generalpage",
+            name="content",
+            field=wagtail.fields.StreamField(
+                [
+                    (
+                        "heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "size",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("text-5xl", "h1"),
+                                            ("text-4xl", "h2"),
+                                            ("text-3xl", "h3"),
+                                            ("text-2xl", "h4"),
+                                            ("text-xl", "h5"),
+                                            ("text-lg", "h6"),
+                                        ],
+                                        icon="title",
+                                    ),
+                                ),
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                            ],
+                            icon="h1",
+                            label="Heading",
+                        ),
+                    ),
+                    (
+                        "rich_text",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "text",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "embed",
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "superscript",
+                                            "subscript",
+                                            "strikethrough",
+                                            "code",
+                                            "hr",
+                                        ],
+                                        icon="title",
+                                        label="Rich Text",
+                                        max_length=10000,
+                                    ),
+                                )
+                            ]
+                        ),
+                    ),
+                    (
+                        "list",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "size",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("circle", "unordered list"),
+                                            ("decimal", "ordered list"),
+                                            ("none", "unstyled"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "text",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=["ul"], icon="list-ol"
+                                    ),
+                                ),
+                            ],
+                            icon="list-ol",
+                            label="List",
+                        ),
+                    ),
+                    ("paragraph", wagtail.blocks.TextBlock(max_length=10000)),
+                    (
+                        "html",
+                        wagtail.blocks.RawHTMLBlock(icon="code", label="Raw HTML"),
+                    ),
+                    ("image", wagtail.images.blocks.ImageChooserBlock()),
+                    (
+                        "caption",
+                        wagtail.blocks.StructBlock(
+                            [("text", wagtail.blocks.TextBlock())]
+                        ),
+                    ),
+                    (
+                        "text_with_heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        max_length=255, required=False
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock(required=False)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_left_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "left_quote_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("quote", wagtail.blocks.TextBlock()),
+                                ("byline", wagtail.blocks.CharBlock(max_length=255)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ],
+                            icon="openquote",
+                        ),
+                    ),
+                    (
+                        "video_embed",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("heading", wagtail.blocks.CharBlock(max_length=255)),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    ("table", home.blocks.CustomTableBlock()),
+                    (
+                        "code_block",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("Python", "python"),
+                                            ("Markup", "html"),
+                                            ("CSS", "css"),
+                                            ("Clojure", "clojure"),
+                                            ("Bash", "shell"),
+                                            ("Django", "django"),
+                                            ("Jinja2", "jinja2"),
+                                            ("Docker", "dockerfile"),
+                                            ("Git", "git"),
+                                            ("GraphQL", "graphql"),
+                                            ("Handlebars", "handlebars"),
+                                            (".ignore", "gitignore"),
+                                            ("JSON", "json"),
+                                            ("JSON5", "json5"),
+                                            ("Markdown", "md"),
+                                            ("Markdown", "md"),
+                                            ("React JSX", "jsx"),
+                                            ("React TSX", "tsx"),
+                                            ("SASS", "sass"),
+                                            ("SCSS", "scss"),
+                                            ("TypeScript", "ts"),
+                                            ("vim", "vim"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "caption",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "page",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "code",
+                                    wagtail.blocks.TextBlock(
+                                        blank=True, max_length=1000
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                null=True,
+                use_json_field=True,
+                verbose_name="StreamField Body",
+            ),
+        ),
+    ]
diff --git a/home/puput_migrations/0006_alter_entrypage_body_optional_fields.py b/home/puput_migrations/0006_alter_entrypage_body_optional_fields.py
new file mode 100644
index 00000000..a0e6cd20
--- /dev/null
+++ b/home/puput_migrations/0006_alter_entrypage_body_optional_fields.py
@@ -0,0 +1,259 @@
+# Generated by Django 4.1.13 on 2024-04-03 17:07
+from __future__ import annotations
+
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import home.blocks
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("puput", "0005_alter_entrypage_body"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="entrypage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    (
+                        "heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "size",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("text-5xl", "h1"),
+                                            ("text-4xl", "h2"),
+                                            ("text-3xl", "h3"),
+                                            ("text-2xl", "h4"),
+                                            ("text-xl", "h5"),
+                                            ("text-lg", "h6"),
+                                        ],
+                                        icon="title",
+                                    ),
+                                ),
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                            ],
+                            icon="h1",
+                            label="Heading",
+                        ),
+                    ),
+                    (
+                        "rich_text",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "text",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "embed",
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "superscript",
+                                            "subscript",
+                                            "strikethrough",
+                                            "code",
+                                            "hr",
+                                        ],
+                                        icon="title",
+                                        label="Rich Text",
+                                        max_length=10000,
+                                    ),
+                                )
+                            ]
+                        ),
+                    ),
+                    (
+                        "list",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "size",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("circle", "unordered list"),
+                                            ("decimal", "ordered list"),
+                                            ("none", "unstyled"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "text",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=["ul"], icon="list-ol"
+                                    ),
+                                ),
+                            ],
+                            icon="list-ol",
+                            label="List",
+                        ),
+                    ),
+                    ("paragraph", wagtail.blocks.TextBlock(max_length=10000)),
+                    (
+                        "html",
+                        wagtail.blocks.RawHTMLBlock(icon="code", label="Raw HTML"),
+                    ),
+                    ("image", wagtail.images.blocks.ImageChooserBlock()),
+                    (
+                        "caption",
+                        wagtail.blocks.StructBlock(
+                            [("text", wagtail.blocks.TextBlock())]
+                        ),
+                    ),
+                    (
+                        "text_with_heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        max_length=255, required=False
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock(required=False)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_left_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "left_quote_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("quote", wagtail.blocks.TextBlock()),
+                                ("byline", wagtail.blocks.CharBlock(max_length=255)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ],
+                            icon="openquote",
+                        ),
+                    ),
+                    (
+                        "video_embed",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("heading", wagtail.blocks.CharBlock(max_length=255)),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    ("table", home.blocks.CustomTableBlock()),
+                    (
+                        "code_block",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("Python", "python"),
+                                            ("Markup", "html"),
+                                            ("CSS", "css"),
+                                            ("Clojure", "clojure"),
+                                            ("Bash", "shell"),
+                                            ("Django", "django"),
+                                            ("Jinja2", "jinja2"),
+                                            ("Docker", "dockerfile"),
+                                            ("Git", "git"),
+                                            ("GraphQL", "graphql"),
+                                            ("Handlebars", "handlebars"),
+                                            (".ignore", "gitignore"),
+                                            ("JSON", "json"),
+                                            ("JSON5", "json5"),
+                                            ("Markdown", "md"),
+                                            ("Markdown", "md"),
+                                            ("React JSX", "jsx"),
+                                            ("React TSX", "tsx"),
+                                            ("SASS", "sass"),
+                                            ("SCSS", "scss"),
+                                            ("TypeScript", "ts"),
+                                            ("vim", "vim"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "caption",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "page",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "code",
+                                    wagtail.blocks.TextBlock(
+                                        blank=True, max_length=1000
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                ],
+                null=True,
+                use_json_field=True,
+                verbose_name="StreamField Body",
+            ),
+        ),
+    ]
diff --git a/indymeet/templates/blocks/text-image-heading.html b/indymeet/templates/blocks/text-image-heading.html
index 6b5e30da..a7c4e266 100644
--- a/indymeet/templates/blocks/text-image-heading.html
+++ b/indymeet/templates/blocks/text-image-heading.html
@@ -1,13 +1,17 @@
 {% load wagtailimages_tags %}
 
 <div class="block-image">
+    {% if value.heading %}
     <h2 class="mt-4 mb-4 text-4xl blog-heading">{{ value.heading|safe }}</h2>
+    {% endif %}
     <div>
-        <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
+        <div class="grid">
             <div>{% image value.image fill-900x700 %}</div>
-            <div>
+            {% if value.text %}
+            <div class="mt-4">
                 <p>{{ value.text|safe|urlize|linebreaks }}</p>
             </div>
+            {% endif %}
         </div>
     </div>
 </div>
diff --git a/indymeet/templates/blocks/text-with-heading-left-image.html b/indymeet/templates/blocks/text-with-heading-left-image.html
index 6b5e30da..de174ec6 100644
--- a/indymeet/templates/blocks/text-with-heading-left-image.html
+++ b/indymeet/templates/blocks/text-with-heading-left-image.html
@@ -1,7 +1,9 @@
 {% load wagtailimages_tags %}
 
 <div class="block-image">
+    {% if value.heading %}
     <h2 class="mt-4 mb-4 text-4xl blog-heading">{{ value.heading|safe }}</h2>
+    {% endif %}
     <div>
         <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>{% image value.image fill-900x700 %}</div>
diff --git a/indymeet/templates/blocks/text-with-heading-right-image.html b/indymeet/templates/blocks/text-with-heading-right-image.html
index 55a5d8df..01c7cea4 100644
--- a/indymeet/templates/blocks/text-with-heading-right-image.html
+++ b/indymeet/templates/blocks/text-with-heading-right-image.html
@@ -1,7 +1,9 @@
 {% load wagtailimages_tags %}
 
 <div class="block-image">
+    {% if value.heading %}
     <h2 class="mt-4 mb-4 text-4xl blog-heading md:text-right">{{ value.heading|safe }}</h2>
+    {% endif %}
     <div>
         <div class="grid grid-cols-1 md:grid-cols-2 gap-4">
             <div>

From 12914f536d7785b6429c3de56927e2b9735226c4 Mon Sep 17 00:00:00 2001
From: Rachell Calhoun <RachellCalhoun@users.noreply.github.com>
Date: Wed, 3 Apr 2024 17:34:12 -0400
Subject: [PATCH 06/13] 372 Add Image Card Blocks (#381)

* add precom

remove migrations

* fix migrations
---
 home/blocks.py                                |  20 ++
 ...ter_generalpage_content_vert_image_card.py | 304 ++++++++++++++++++
 ...07_alter_entrypage_body_vert_image_card.py | 303 +++++++++++++++++
 home/templates/home/general_page.html         |   2 +-
 .../blocks/vertical_image_cards_block.html    |  26 ++
 indymeet/templates/puput/entry_page.html      |   2 +-
 6 files changed, 655 insertions(+), 2 deletions(-)
 create mode 100644 home/migrations/0028_alter_generalpage_content_vert_image_card.py
 create mode 100644 home/puput_migrations/0007_alter_entrypage_body_vert_image_card.py
 create mode 100644 indymeet/templates/blocks/vertical_image_cards_block.html

diff --git a/home/blocks.py b/home/blocks.py
index a528f476..954f8bd8 100644
--- a/home/blocks.py
+++ b/home/blocks.py
@@ -186,6 +186,25 @@ class Meta:
         template = "blocks/caption.html"
 
 
+class VerticalImageCardBlock(blocks.StreamBlock):
+    images = blocks.StructBlock(
+        [
+            ("image", ImageChooserBlock(required=True, help_text="size: 800X450px")),
+            ("caption", CustomCaption()),
+            (
+                "description",
+                blocks.CharBlock(
+                    max_length=300, required=False, help_text="300 characters limit"
+                ),
+            ),
+            ("link", blocks.URLBlock(required=False)),
+        ]
+    )
+
+    class Meta:
+        template = "blocks/vertical_image_cards_block.html"
+
+
 class RichTextBlock(blocks.StructBlock):
     text = blocks.RichTextBlock(
         max_length=10000,
@@ -224,3 +243,4 @@ class BaseStreamBlock(blocks.StreamBlock):
     video_embed = VideoEmbed()
     table = CustomTableBlock()
     code_block = CodeBlock()
+    vertical_image_cards = VerticalImageCardBlock()
diff --git a/home/migrations/0028_alter_generalpage_content_vert_image_card.py b/home/migrations/0028_alter_generalpage_content_vert_image_card.py
new file mode 100644
index 00000000..b16e77b0
--- /dev/null
+++ b/home/migrations/0028_alter_generalpage_content_vert_image_card.py
@@ -0,0 +1,304 @@
+# Generated by Django 4.1.13 on 2024-04-03 21:30
+from __future__ import annotations
+
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import home.blocks
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("home", "0027_alter_generalpage_content_optional_fields"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="generalpage",
+            name="content",
+            field=wagtail.fields.StreamField(
+                [
+                    (
+                        "heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "size",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("text-5xl", "h1"),
+                                            ("text-4xl", "h2"),
+                                            ("text-3xl", "h3"),
+                                            ("text-2xl", "h4"),
+                                            ("text-xl", "h5"),
+                                            ("text-lg", "h6"),
+                                        ],
+                                        icon="title",
+                                    ),
+                                ),
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                            ],
+                            icon="h1",
+                            label="Heading",
+                        ),
+                    ),
+                    (
+                        "rich_text",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "text",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "embed",
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "superscript",
+                                            "subscript",
+                                            "strikethrough",
+                                            "code",
+                                            "hr",
+                                        ],
+                                        icon="title",
+                                        label="Rich Text",
+                                        max_length=10000,
+                                    ),
+                                )
+                            ]
+                        ),
+                    ),
+                    (
+                        "list",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "size",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("circle", "unordered list"),
+                                            ("decimal", "ordered list"),
+                                            ("none", "unstyled"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "text",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=["ul"], icon="list-ol"
+                                    ),
+                                ),
+                            ],
+                            icon="list-ol",
+                            label="List",
+                        ),
+                    ),
+                    ("paragraph", wagtail.blocks.TextBlock(max_length=10000)),
+                    (
+                        "html",
+                        wagtail.blocks.RawHTMLBlock(icon="code", label="Raw HTML"),
+                    ),
+                    ("image", wagtail.images.blocks.ImageChooserBlock()),
+                    (
+                        "caption",
+                        wagtail.blocks.StructBlock(
+                            [("text", wagtail.blocks.TextBlock())]
+                        ),
+                    ),
+                    (
+                        "text_with_heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        max_length=255, required=False
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock(required=False)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_left_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "left_quote_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("quote", wagtail.blocks.TextBlock()),
+                                ("byline", wagtail.blocks.CharBlock(max_length=255)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ],
+                            icon="openquote",
+                        ),
+                    ),
+                    (
+                        "video_embed",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("heading", wagtail.blocks.CharBlock(max_length=255)),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    ("table", home.blocks.CustomTableBlock()),
+                    (
+                        "code_block",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("Python", "python"),
+                                            ("Markup", "html"),
+                                            ("CSS", "css"),
+                                            ("Clojure", "clojure"),
+                                            ("Bash", "shell"),
+                                            ("Django", "django"),
+                                            ("Jinja2", "jinja2"),
+                                            ("Docker", "dockerfile"),
+                                            ("Git", "git"),
+                                            ("GraphQL", "graphql"),
+                                            ("Handlebars", "handlebars"),
+                                            (".ignore", "gitignore"),
+                                            ("JSON", "json"),
+                                            ("JSON5", "json5"),
+                                            ("Markdown", "md"),
+                                            ("Markdown", "md"),
+                                            ("React JSX", "jsx"),
+                                            ("React TSX", "tsx"),
+                                            ("SASS", "sass"),
+                                            ("SCSS", "scss"),
+                                            ("TypeScript", "ts"),
+                                            ("vim", "vim"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "caption",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "page",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "code",
+                                    wagtail.blocks.TextBlock(
+                                        blank=True, max_length=1000
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "vertical_image_cards",
+                        wagtail.blocks.StreamBlock(
+                            [
+                                (
+                                    "images",
+                                    wagtail.blocks.StructBlock(
+                                        [
+                                            (
+                                                "image",
+                                                wagtail.images.blocks.ImageChooserBlock(
+                                                    help_text="size: 800X450px",
+                                                    required=True,
+                                                ),
+                                            ),
+                                            (
+                                                "caption",
+                                                wagtail.blocks.StructBlock(
+                                                    [
+                                                        (
+                                                            "text",
+                                                            wagtail.blocks.TextBlock(),
+                                                        )
+                                                    ]
+                                                ),
+                                            ),
+                                            (
+                                                "description",
+                                                wagtail.blocks.CharBlock(
+                                                    help_text="300 characters limit",
+                                                    max_length=300,
+                                                    required=False,
+                                                ),
+                                            ),
+                                            (
+                                                "link",
+                                                wagtail.blocks.URLBlock(required=False),
+                                            ),
+                                        ]
+                                    ),
+                                )
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                null=True,
+                use_json_field=True,
+                verbose_name="StreamField Body",
+            ),
+        ),
+    ]
diff --git a/home/puput_migrations/0007_alter_entrypage_body_vert_image_card.py b/home/puput_migrations/0007_alter_entrypage_body_vert_image_card.py
new file mode 100644
index 00000000..2347cdaa
--- /dev/null
+++ b/home/puput_migrations/0007_alter_entrypage_body_vert_image_card.py
@@ -0,0 +1,303 @@
+# Generated by Django 4.1.13 on 2024-04-03 21:30
+from __future__ import annotations
+
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import home.blocks
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("puput", "0006_alter_entrypage_body_optional_fields"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="entrypage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    (
+                        "heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "size",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("text-5xl", "h1"),
+                                            ("text-4xl", "h2"),
+                                            ("text-3xl", "h3"),
+                                            ("text-2xl", "h4"),
+                                            ("text-xl", "h5"),
+                                            ("text-lg", "h6"),
+                                        ],
+                                        icon="title",
+                                    ),
+                                ),
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                            ],
+                            icon="h1",
+                            label="Heading",
+                        ),
+                    ),
+                    (
+                        "rich_text",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "text",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "embed",
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "superscript",
+                                            "subscript",
+                                            "strikethrough",
+                                            "code",
+                                            "hr",
+                                        ],
+                                        icon="title",
+                                        label="Rich Text",
+                                        max_length=10000,
+                                    ),
+                                )
+                            ]
+                        ),
+                    ),
+                    (
+                        "list",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "size",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("circle", "unordered list"),
+                                            ("decimal", "ordered list"),
+                                            ("none", "unstyled"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "text",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=["ul"], icon="list-ol"
+                                    ),
+                                ),
+                            ],
+                            icon="list-ol",
+                            label="List",
+                        ),
+                    ),
+                    ("paragraph", wagtail.blocks.TextBlock(max_length=10000)),
+                    (
+                        "html",
+                        wagtail.blocks.RawHTMLBlock(icon="code", label="Raw HTML"),
+                    ),
+                    ("image", wagtail.images.blocks.ImageChooserBlock()),
+                    (
+                        "caption",
+                        wagtail.blocks.StructBlock(
+                            [("text", wagtail.blocks.TextBlock())]
+                        ),
+                    ),
+                    (
+                        "text_with_heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        max_length=255, required=False
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock(required=False)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_left_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "left_quote_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("quote", wagtail.blocks.TextBlock()),
+                                ("byline", wagtail.blocks.CharBlock(max_length=255)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ],
+                            icon="openquote",
+                        ),
+                    ),
+                    (
+                        "video_embed",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("heading", wagtail.blocks.CharBlock(max_length=255)),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    ("table", home.blocks.CustomTableBlock()),
+                    (
+                        "code_block",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("Python", "python"),
+                                            ("Markup", "html"),
+                                            ("CSS", "css"),
+                                            ("Clojure", "clojure"),
+                                            ("Bash", "shell"),
+                                            ("Django", "django"),
+                                            ("Jinja2", "jinja2"),
+                                            ("Docker", "dockerfile"),
+                                            ("Git", "git"),
+                                            ("GraphQL", "graphql"),
+                                            ("Handlebars", "handlebars"),
+                                            (".ignore", "gitignore"),
+                                            ("JSON", "json"),
+                                            ("JSON5", "json5"),
+                                            ("Markdown", "md"),
+                                            ("Markdown", "md"),
+                                            ("React JSX", "jsx"),
+                                            ("React TSX", "tsx"),
+                                            ("SASS", "sass"),
+                                            ("SCSS", "scss"),
+                                            ("TypeScript", "ts"),
+                                            ("vim", "vim"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "caption",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "page",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "code",
+                                    wagtail.blocks.TextBlock(
+                                        blank=True, max_length=1000
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "vertical_image_cards",
+                        wagtail.blocks.StreamBlock(
+                            [
+                                (
+                                    "images",
+                                    wagtail.blocks.StructBlock(
+                                        [
+                                            (
+                                                "image",
+                                                wagtail.images.blocks.ImageChooserBlock(
+                                                    help_text="size: 800X450px",
+                                                    required=True,
+                                                ),
+                                            ),
+                                            (
+                                                "caption",
+                                                wagtail.blocks.StructBlock(
+                                                    [
+                                                        (
+                                                            "text",
+                                                            wagtail.blocks.TextBlock(),
+                                                        )
+                                                    ]
+                                                ),
+                                            ),
+                                            (
+                                                "description",
+                                                wagtail.blocks.CharBlock(
+                                                    help_text="300 characters limit",
+                                                    max_length=300,
+                                                    required=False,
+                                                ),
+                                            ),
+                                            (
+                                                "link",
+                                                wagtail.blocks.URLBlock(required=False),
+                                            ),
+                                        ]
+                                    ),
+                                )
+                            ]
+                        ),
+                    ),
+                ],
+                null=True,
+                use_json_field=True,
+                verbose_name="StreamField Body",
+            ),
+        ),
+    ]
diff --git a/home/templates/home/general_page.html b/home/templates/home/general_page.html
index 95cd3a25..65c39377 100644
--- a/home/templates/home/general_page.html
+++ b/home/templates/home/general_page.html
@@ -6,7 +6,7 @@
 {% block content %}
   <main>
     <div class="container mx-auto flex justify-center">
-      <article class="box max-w-3xl blog-container">
+      <article class="box max-w-4xl blog-container">
         <header>
           <h2 class="text-2xl font-extrabold tracking-tight text-slate-900 dark:text-slate-700 md:text-3xl">
             <a href="{% pageurl page %}">{{ page.title }}</a>
diff --git a/indymeet/templates/blocks/vertical_image_cards_block.html b/indymeet/templates/blocks/vertical_image_cards_block.html
new file mode 100644
index 00000000..c9266b31
--- /dev/null
+++ b/indymeet/templates/blocks/vertical_image_cards_block.html
@@ -0,0 +1,26 @@
+{% load wagtailcore_tags wagtailimages_tags %}
+<div class="flex md:flex-wrap place-content-center">
+{% for child in self %}
+<div class="max-w-sm flex-initial w-80 rounded overflow-hidden shadow-lg my-3 mx-3 ">
+    {% if child.value.link %}
+        <a class="text-black" href="{{ child.value.link }}">
+    {% endif %}
+    {% image child.value.image fill-800x450-c100 as image %}
+    <figure class="overlay">
+        <img class="w-full" src="{{ image.url }}" alt="{{ child.value.image.title }}"/>
+    </figure>
+    {% if child.value.link %}
+        </a>
+    {% endif %}
+    <div class="px-6 py-4">
+      <div class="font-bold mb-2">{{ child.value.caption.text }}</div>
+      <p class="text-gray-700 text-base">
+        {{ child.value.description }}
+      </p>
+    </div>
+    <div class="px-6 pt-4 pb-2">
+    </div>
+  </div>
+{% endfor %}
+
+</div>
diff --git a/indymeet/templates/puput/entry_page.html b/indymeet/templates/puput/entry_page.html
index 6a4edcfd..f4ffdade 100644
--- a/indymeet/templates/puput/entry_page.html
+++ b/indymeet/templates/puput/entry_page.html
@@ -43,7 +43,7 @@
 
 {% block content %}
         <div class="container mx-auto flex justify-center">
-            <article class="box max-w-3xl blog-container"
+            <article class="box max-w-4xl blog-container"
                     {% if self.id %}data-entry-page-update-comments-url="{% url 'entry_page_update_comments' self.id %}{% endif %}">
                 {% include 'puput/entry_page_header.html' with entry=self %}
                 <section>

From 9defedd02dbf1d8caf779ca30e20ce54df18de3c Mon Sep 17 00:00:00 2001
From: Rachell Calhoun <RachellCalhoun@users.noreply.github.com>
Date: Wed, 3 Apr 2024 17:38:35 -0400
Subject: [PATCH 07/13] 373 Update List Block and Templates (#380)

* pre-commit

remove migrations

* add migrations
---
 home/blocks.py                                |  17 +-
 ...029_alter_generalpage_content_listblock.py | 330 ++++++++++++++++++
 .../0008_alter_entrypage_body_listblock.py    | 329 +++++++++++++++++
 indymeet/templates/blocks/list.html           |  18 +-
 4 files changed, 689 insertions(+), 5 deletions(-)
 create mode 100644 home/migrations/0029_alter_generalpage_content_listblock.py
 create mode 100644 home/puput_migrations/0008_alter_entrypage_body_listblock.py

diff --git a/home/blocks.py b/home/blocks.py
index 954f8bd8..3e92aac2 100644
--- a/home/blocks.py
+++ b/home/blocks.py
@@ -51,15 +51,28 @@ class Meta:
         template = "blocks/heading.html"
 
 
+class ListItemBlock(blocks.StructBlock):
+    text = blocks.CharBlock()
+    link = blocks.URLBlock(required=False)
+    icon = blocks.CharBlock(
+        max_length=50,
+        required=False,
+        help_text="Use font awesome class names ex: 'fa-solid fa-xs fa-tv'",
+    )
+    icon_color = blocks.CharBlock(
+        max_length=50, required=False, help_text="Names, hex etc ex: 'grey', '#999999'"
+    )
+
+
 class ListBlock(blocks.StructBlock):
-    size = blocks.ChoiceBlock(
+    style = blocks.ChoiceBlock(
         choices=[
             ("circle", "unordered list"),
             ("decimal", "ordered list"),
             ("none", "unstyled"),
         ]
     )
-    text = blocks.RichTextBlock(features=["ul"], icon="list-ol")
+    list_items = blocks.ListBlock(ListItemBlock())
 
     def __str__(self):
         return self.text
diff --git a/home/migrations/0029_alter_generalpage_content_listblock.py b/home/migrations/0029_alter_generalpage_content_listblock.py
new file mode 100644
index 00000000..60513fa9
--- /dev/null
+++ b/home/migrations/0029_alter_generalpage_content_listblock.py
@@ -0,0 +1,330 @@
+# Generated by Django 4.1.13 on 2024-04-03 21:35
+from __future__ import annotations
+
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import home.blocks
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("home", "0028_alter_generalpage_content_vert_image_card"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="generalpage",
+            name="content",
+            field=wagtail.fields.StreamField(
+                [
+                    (
+                        "heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "size",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("text-5xl", "h1"),
+                                            ("text-4xl", "h2"),
+                                            ("text-3xl", "h3"),
+                                            ("text-2xl", "h4"),
+                                            ("text-xl", "h5"),
+                                            ("text-lg", "h6"),
+                                        ],
+                                        icon="title",
+                                    ),
+                                ),
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                            ],
+                            icon="h1",
+                            label="Heading",
+                        ),
+                    ),
+                    (
+                        "rich_text",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "text",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "embed",
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "superscript",
+                                            "subscript",
+                                            "strikethrough",
+                                            "code",
+                                            "hr",
+                                        ],
+                                        icon="title",
+                                        label="Rich Text",
+                                        max_length=10000,
+                                    ),
+                                )
+                            ]
+                        ),
+                    ),
+                    (
+                        "list",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "style",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("circle", "unordered list"),
+                                            ("decimal", "ordered list"),
+                                            ("none", "unstyled"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "list_items",
+                                    wagtail.blocks.ListBlock(
+                                        wagtail.blocks.StructBlock(
+                                            [
+                                                ("text", wagtail.blocks.CharBlock()),
+                                                (
+                                                    "link",
+                                                    wagtail.blocks.URLBlock(
+                                                        required=False
+                                                    ),
+                                                ),
+                                                (
+                                                    "icon",
+                                                    wagtail.blocks.CharBlock(
+                                                        help_text="Use font awesome class names ex: 'fa-solid fa-xs fa-tv'",
+                                                        max_length=50,
+                                                        required=False,
+                                                    ),
+                                                ),
+                                                (
+                                                    "icon_color",
+                                                    wagtail.blocks.CharBlock(
+                                                        help_text="Names, hex etc ex: 'grey', '#999999'",
+                                                        max_length=50,
+                                                        required=False,
+                                                    ),
+                                                ),
+                                            ]
+                                        )
+                                    ),
+                                ),
+                            ],
+                            icon="list-ol",
+                            label="List",
+                        ),
+                    ),
+                    ("paragraph", wagtail.blocks.TextBlock(max_length=10000)),
+                    (
+                        "html",
+                        wagtail.blocks.RawHTMLBlock(icon="code", label="Raw HTML"),
+                    ),
+                    ("image", wagtail.images.blocks.ImageChooserBlock()),
+                    (
+                        "caption",
+                        wagtail.blocks.StructBlock(
+                            [("text", wagtail.blocks.TextBlock())]
+                        ),
+                    ),
+                    (
+                        "text_with_heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        max_length=255, required=False
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock(required=False)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_left_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "left_quote_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("quote", wagtail.blocks.TextBlock()),
+                                ("byline", wagtail.blocks.CharBlock(max_length=255)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ],
+                            icon="openquote",
+                        ),
+                    ),
+                    (
+                        "video_embed",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("heading", wagtail.blocks.CharBlock(max_length=255)),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    ("table", home.blocks.CustomTableBlock()),
+                    (
+                        "code_block",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("Python", "python"),
+                                            ("Markup", "html"),
+                                            ("CSS", "css"),
+                                            ("Clojure", "clojure"),
+                                            ("Bash", "shell"),
+                                            ("Django", "django"),
+                                            ("Jinja2", "jinja2"),
+                                            ("Docker", "dockerfile"),
+                                            ("Git", "git"),
+                                            ("GraphQL", "graphql"),
+                                            ("Handlebars", "handlebars"),
+                                            (".ignore", "gitignore"),
+                                            ("JSON", "json"),
+                                            ("JSON5", "json5"),
+                                            ("Markdown", "md"),
+                                            ("Markdown", "md"),
+                                            ("React JSX", "jsx"),
+                                            ("React TSX", "tsx"),
+                                            ("SASS", "sass"),
+                                            ("SCSS", "scss"),
+                                            ("TypeScript", "ts"),
+                                            ("vim", "vim"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "caption",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "page",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "code",
+                                    wagtail.blocks.TextBlock(
+                                        blank=True, max_length=1000
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "vertical_image_cards",
+                        wagtail.blocks.StreamBlock(
+                            [
+                                (
+                                    "images",
+                                    wagtail.blocks.StructBlock(
+                                        [
+                                            (
+                                                "image",
+                                                wagtail.images.blocks.ImageChooserBlock(
+                                                    help_text="size: 800X450px",
+                                                    required=True,
+                                                ),
+                                            ),
+                                            (
+                                                "caption",
+                                                wagtail.blocks.StructBlock(
+                                                    [
+                                                        (
+                                                            "text",
+                                                            wagtail.blocks.TextBlock(),
+                                                        )
+                                                    ]
+                                                ),
+                                            ),
+                                            (
+                                                "description",
+                                                wagtail.blocks.CharBlock(
+                                                    help_text="300 characters limit",
+                                                    max_length=300,
+                                                    required=False,
+                                                ),
+                                            ),
+                                            (
+                                                "link",
+                                                wagtail.blocks.URLBlock(required=False),
+                                            ),
+                                        ]
+                                    ),
+                                )
+                            ]
+                        ),
+                    ),
+                ],
+                blank=True,
+                null=True,
+                use_json_field=True,
+                verbose_name="StreamField Body",
+            ),
+        ),
+    ]
diff --git a/home/puput_migrations/0008_alter_entrypage_body_listblock.py b/home/puput_migrations/0008_alter_entrypage_body_listblock.py
new file mode 100644
index 00000000..50d317a7
--- /dev/null
+++ b/home/puput_migrations/0008_alter_entrypage_body_listblock.py
@@ -0,0 +1,329 @@
+# Generated by Django 4.1.13 on 2024-04-03 21:35
+from __future__ import annotations
+
+import wagtail.blocks
+import wagtail.fields
+import wagtail.images.blocks
+from django.db import migrations
+
+import home.blocks
+
+
+class Migration(migrations.Migration):
+    dependencies = [
+        ("puput", "0007_alter_entrypage_body_vert_image_card"),
+    ]
+
+    operations = [
+        migrations.AlterField(
+            model_name="entrypage",
+            name="body",
+            field=wagtail.fields.StreamField(
+                [
+                    (
+                        "heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "size",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("text-5xl", "h1"),
+                                            ("text-4xl", "h2"),
+                                            ("text-3xl", "h3"),
+                                            ("text-2xl", "h4"),
+                                            ("text-xl", "h5"),
+                                            ("text-lg", "h6"),
+                                        ],
+                                        icon="title",
+                                    ),
+                                ),
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                            ],
+                            icon="h1",
+                            label="Heading",
+                        ),
+                    ),
+                    (
+                        "rich_text",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "text",
+                                    wagtail.blocks.RichTextBlock(
+                                        features=[
+                                            "embed",
+                                            "bold",
+                                            "italic",
+                                            "link",
+                                            "superscript",
+                                            "subscript",
+                                            "strikethrough",
+                                            "code",
+                                            "hr",
+                                        ],
+                                        icon="title",
+                                        label="Rich Text",
+                                        max_length=10000,
+                                    ),
+                                )
+                            ]
+                        ),
+                    ),
+                    (
+                        "list",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "style",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("circle", "unordered list"),
+                                            ("decimal", "ordered list"),
+                                            ("none", "unstyled"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "list_items",
+                                    wagtail.blocks.ListBlock(
+                                        wagtail.blocks.StructBlock(
+                                            [
+                                                ("text", wagtail.blocks.CharBlock()),
+                                                (
+                                                    "link",
+                                                    wagtail.blocks.URLBlock(
+                                                        required=False
+                                                    ),
+                                                ),
+                                                (
+                                                    "icon",
+                                                    wagtail.blocks.CharBlock(
+                                                        help_text="Use font awesome class names ex: 'fa-solid fa-xs fa-tv'",
+                                                        max_length=50,
+                                                        required=False,
+                                                    ),
+                                                ),
+                                                (
+                                                    "icon_color",
+                                                    wagtail.blocks.CharBlock(
+                                                        help_text="Names, hex etc ex: 'grey', '#999999'",
+                                                        max_length=50,
+                                                        required=False,
+                                                    ),
+                                                ),
+                                            ]
+                                        )
+                                    ),
+                                ),
+                            ],
+                            icon="list-ol",
+                            label="List",
+                        ),
+                    ),
+                    ("paragraph", wagtail.blocks.TextBlock(max_length=10000)),
+                    (
+                        "html",
+                        wagtail.blocks.RawHTMLBlock(icon="code", label="Raw HTML"),
+                    ),
+                    ("image", wagtail.images.blocks.ImageChooserBlock()),
+                    (
+                        "caption",
+                        wagtail.blocks.StructBlock(
+                            [("text", wagtail.blocks.TextBlock())]
+                        ),
+                    ),
+                    (
+                        "text_with_heading",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog", max_length=255
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        max_length=255, required=False
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock(required=False)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="heading-blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "text_with_heading_and_left_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "heading",
+                                    wagtail.blocks.CharBlock(
+                                        class_name="blog",
+                                        max_length=255,
+                                        required=False,
+                                    ),
+                                ),
+                                ("text", wagtail.blocks.TextBlock()),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ]
+                        ),
+                    ),
+                    (
+                        "left_quote_right_image",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("quote", wagtail.blocks.TextBlock()),
+                                ("byline", wagtail.blocks.CharBlock(max_length=255)),
+                                ("image", wagtail.images.blocks.ImageChooserBlock()),
+                            ],
+                            icon="openquote",
+                        ),
+                    ),
+                    (
+                        "video_embed",
+                        wagtail.blocks.StructBlock(
+                            [
+                                ("heading", wagtail.blocks.CharBlock(max_length=255)),
+                                ("text", wagtail.blocks.TextBlock()),
+                            ]
+                        ),
+                    ),
+                    ("table", home.blocks.CustomTableBlock()),
+                    (
+                        "code_block",
+                        wagtail.blocks.StructBlock(
+                            [
+                                (
+                                    "language",
+                                    wagtail.blocks.ChoiceBlock(
+                                        choices=[
+                                            ("Python", "python"),
+                                            ("Markup", "html"),
+                                            ("CSS", "css"),
+                                            ("Clojure", "clojure"),
+                                            ("Bash", "shell"),
+                                            ("Django", "django"),
+                                            ("Jinja2", "jinja2"),
+                                            ("Docker", "dockerfile"),
+                                            ("Git", "git"),
+                                            ("GraphQL", "graphql"),
+                                            ("Handlebars", "handlebars"),
+                                            (".ignore", "gitignore"),
+                                            ("JSON", "json"),
+                                            ("JSON5", "json5"),
+                                            ("Markdown", "md"),
+                                            ("Markdown", "md"),
+                                            ("React JSX", "jsx"),
+                                            ("React TSX", "tsx"),
+                                            ("SASS", "sass"),
+                                            ("SCSS", "scss"),
+                                            ("TypeScript", "ts"),
+                                            ("vim", "vim"),
+                                        ]
+                                    ),
+                                ),
+                                (
+                                    "caption",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "page",
+                                    wagtail.blocks.CharBlock(
+                                        blank=True, max_length=255
+                                    ),
+                                ),
+                                (
+                                    "code",
+                                    wagtail.blocks.TextBlock(
+                                        blank=True, max_length=1000
+                                    ),
+                                ),
+                            ]
+                        ),
+                    ),
+                    (
+                        "vertical_image_cards",
+                        wagtail.blocks.StreamBlock(
+                            [
+                                (
+                                    "images",
+                                    wagtail.blocks.StructBlock(
+                                        [
+                                            (
+                                                "image",
+                                                wagtail.images.blocks.ImageChooserBlock(
+                                                    help_text="size: 800X450px",
+                                                    required=True,
+                                                ),
+                                            ),
+                                            (
+                                                "caption",
+                                                wagtail.blocks.StructBlock(
+                                                    [
+                                                        (
+                                                            "text",
+                                                            wagtail.blocks.TextBlock(),
+                                                        )
+                                                    ]
+                                                ),
+                                            ),
+                                            (
+                                                "description",
+                                                wagtail.blocks.CharBlock(
+                                                    help_text="300 characters limit",
+                                                    max_length=300,
+                                                    required=False,
+                                                ),
+                                            ),
+                                            (
+                                                "link",
+                                                wagtail.blocks.URLBlock(required=False),
+                                            ),
+                                        ]
+                                    ),
+                                )
+                            ]
+                        ),
+                    ),
+                ],
+                null=True,
+                use_json_field=True,
+                verbose_name="StreamField Body",
+            ),
+        ),
+    ]
diff --git a/indymeet/templates/blocks/list.html b/indymeet/templates/blocks/list.html
index 90559905..dd2c77d5 100644
--- a/indymeet/templates/blocks/list.html
+++ b/indymeet/templates/blocks/list.html
@@ -1,7 +1,19 @@
 {% load wagtailcore_tags %}
 <style>
-    ul.{{value.size}} ul {
-        list-style-type: {{value.size}} !important;
+    ul.{{value.style}} ul {
+        list-style-type: {{value.style}} !important;
     }
 </style>
-<ul class="pl-8 pb-4 {{value.size}}">{{ value.text|richtext }}</ul>
+
+<ul class="pl-8 pb-4 {{value.style}}">
+    {% for item in value.list_items %}
+    <li>
+        {% if item.icon %}<i class="{{ item.icon }}" style="color:{{item.color}};"></i>{% endif %}
+        {% if item.link %}
+            <a href="{{item.link}}">
+        {% endif %}
+            {{ item.text }}
+        {% if item.link %}</a>{% endif %}
+    </li>
+    {% endfor %}
+</ul>

From f5cfeab686c5c717795ac529d4b487b24dba5f57 Mon Sep 17 00:00:00 2001
From: Rachell Calhoun <RachellCalhoun@users.noreply.github.com>
Date: Sat, 6 Apr 2024 15:18:39 -0400
Subject: [PATCH 08/13] center session template (#379)

center event detail page

add container to base

standardize container sizes
---
 home/templates/home/general_page.html         | 60 +++++++++----------
 .../templates/home/includes/session_card.html |  2 +-
 .../home/prerelease/event_detail.html         | 26 ++++----
 .../templates/home/prerelease/event_list.html |  3 +-
 .../home/prerelease/session_detail.html       | 50 ++++++++--------
 indymeet/templates/base.html                  | 10 +++-
 indymeet/templates/includes/nav.html          |  2 +-
 indymeet/templates/puput/entry_page.html      |  4 +-
 8 files changed, 77 insertions(+), 80 deletions(-)

diff --git a/home/templates/home/general_page.html b/home/templates/home/general_page.html
index 65c39377..cf3025c3 100644
--- a/home/templates/home/general_page.html
+++ b/home/templates/home/general_page.html
@@ -4,36 +4,32 @@
 {% block body_class %}template-generalpage{% endblock %}
 
 {% block content %}
-  <main>
-    <div class="container mx-auto flex justify-center">
-      <article class="box max-w-4xl blog-container">
-        <header>
-          <h2 class="text-2xl font-extrabold tracking-tight text-slate-900 dark:text-slate-700 md:text-3xl">
-            <a href="{% pageurl page %}">{{ page.title }}</a>
-          </h2>
-          <ul class="links">
-            <li>
-              <i class="fa fa-calendar"></i>
-              {{ page.date|date:"DATE_FORMAT" }}
-            </li>
-            <li>
-              {% for tag in page.tags.all %}
-                <a type="button" href="{{ page.get_parent.url }}search/?query={{ tag }}"
-                   class="bg-purple-500 text-white font-bold py-1 px-2 text-xs rounded-full">{{ tag }}</a>
-              {% endfor %}
-            </li>
-          </ul>
-          <section class="leading-6 mt-5">
-            {{ page.intro|richtext }}
-          </section>
-        </header>
-        <section class="leading-6 mt-3">
-          {{ page.content }}
-        </section>
-        <section class="leading-6 mt-3">
-          {{ page.body|richtext }}
-        </section>
-      </article>
-    </div>
-  </main>
+<main>
+  <header>
+    <h2 class="text-2xl font-extrabold tracking-tight text-slate-900 dark:text-slate-700 md:text-3xl">
+      <a href="{% pageurl page %}">{{ page.title }}</a>
+    </h2>
+    <ul class="links">
+      <li>
+        <i class="fa fa-calendar"></i>
+        {{ page.date|date:"DATE_FORMAT" }}
+      </li>
+      <li>
+        {% for tag in page.tags.all %}
+          <a type="button" href="{{ page.get_parent.url }}search/?query={{ tag }}"
+              class="bg-purple-500 text-white font-bold py-1 px-2 text-xs rounded-full">{{ tag }}</a>
+        {% endfor %}
+      </li>
+    </ul>
+    <section class="leading-6 mt-5">
+      {{ page.intro|richtext }}
+    </section>
+  </header>
+  <section class="leading-6 mt-3">
+    {{ page.body|richtext }}
+  </section>
+  <section class="leading-6 mt-3">
+    {{ page.content }}
+  </section>
+</main>
 {% endblock %}
diff --git a/home/templates/home/includes/session_card.html b/home/templates/home/includes/session_card.html
index 84c81728..05c340af 100644
--- a/home/templates/home/includes/session_card.html
+++ b/home/templates/home/includes/session_card.html
@@ -18,7 +18,7 @@ <h6 class="text-lg">Starts</h6>
       </div>
       <div class="px-6 py-3 mb-2 card-footer">
         {% include 'home/includes/session_apply_btn.html' %}
-        <a href="{{ session.get_absolute_url }}" class="card-link">Details</a>
+        <a href="{{ session.get_absolute_url }}" class="card-link px-2">Details</a>
       </div>
     </div>
 </div>
diff --git a/home/templates/home/prerelease/event_detail.html b/home/templates/home/prerelease/event_detail.html
index 3ce2c62d..9ba3fb93 100644
--- a/home/templates/home/prerelease/event_detail.html
+++ b/home/templates/home/prerelease/event_detail.html
@@ -11,22 +11,20 @@
 {% endblock social_share %}
 
 {% block content %}
-<div class="container main my-3 mx-3">
-  <div class="row my-3">
+<main class="section my-3 mx-5">
+  <div class="section-container">
+  <h1 class="text-5xl my-3">{{ event.title }}</h1>
+    <div class="row">
       <div class="col">
-          <h1 class="text-5xl my-3">{{ event.title }}</h1>
+          {% localtime on %}
+          <p><strong>Start:</strong> {{ event.start_time|date:"M d, Y H:i e" }}</p>
+          <p><strong>End:</strong> {{ event.end_time|date:"M d, Y H:i e" }}</p>
+          {% endlocaltime %}
+          <p><strong>Location:</strong> {{ event.location|urlizetrunc:25 }}</p>
+          <br>
+          <p>{{ event.description|linebreaksbr|urlizetrunc:25 }}</p>
       </div>
-  </div>
-  <div class="row">
-    <div class="col">
-        {% localtime on %}
-        <p><strong>Start:</strong> {{ event.start_time|date:"M d, Y H:i e" }}</p>
-        <p><strong>End:</strong> {{ event.end_time|date:"M d, Y H:i e" }}</p>
-        {% endlocaltime %}
-        <p><strong>Location:</strong> {{ event.location|urlizetrunc:25 }}</p>
-        <br>
-        <p>{{ event.description|linebreaksbr|urlizetrunc:25 }}</p>
     </div>
   </div>
-</div>
+</main>
 {% endblock content %}
diff --git a/home/templates/home/prerelease/event_list.html b/home/templates/home/prerelease/event_list.html
index e7a9b0af..dfba16dd 100644
--- a/home/templates/home/prerelease/event_list.html
+++ b/home/templates/home/prerelease/event_list.html
@@ -33,7 +33,8 @@ <h2 class="text-4xl">Upcoming Events</h2>
             {% endfor %}
 
         </div>
-        <h2 class="text-4xl">Past Events</h2>
+        <br>
+        <h2 class="text-4xl pt-4">Past Events</h2>
         <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 pt-4">
 
             {% for event in past_events %}
diff --git a/home/templates/home/prerelease/session_detail.html b/home/templates/home/prerelease/session_detail.html
index fd2268e9..df66692a 100644
--- a/home/templates/home/prerelease/session_detail.html
+++ b/home/templates/home/prerelease/session_detail.html
@@ -15,34 +15,32 @@
 
 {% block content %}
 {% include 'home/includes/email_confirmed_warning.html' %}
-<div class="container main my-3 mx-3">
-  <div class="row my-3">
+<main class="section my-3 mx-5">
+  <div class="section-container">
+    <h1 class="text-5xl">{{ session.title }}</h1>
+    <div class="row pt-4 pb-4">
       <div class="col">
-          <h1 class="text-5xl my-3">{{ session.title }}</h1>
+        <dl class="px-4 py-3 sm:grid sm:grid-cols-3 sm:gap-2 sm:px-0">
+          <dt class="text-sm font-bold leading-6 text-gray-900">Applications Open:</dt>
+          <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">{{ session.application_start_date|date:"M d, Y" }} AOE</dd>
+          <dt class="text-sm font-bold leading-6 text-gray-900">Applications Close:</dt>
+          <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">{{ session.application_end_date|date:"M d, Y" }} AOE</dd>
+          <dt class="text-sm font-bold leading-6 text-gray-900">Invitations Sent:</dt>
+          <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">{{ session.invitation_date|date:"M d, Y" }}</dd>
+          <dt class="text-sm font-bold leading-6 text-gray-900">Start:</dt>
+          <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">{{ session.start_date|date:"M d, Y" }}</dd>
+          <dt class="text-sm font-bold leading-6 text-gray-900">End:</dt>
+          <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">{{ session.end_date|date:"M d, Y" }}</dd>
+        </dl>
+        <p>{{ session.description|linebreaksbr|urlizetrunc:25 }}</p>
+        {% if session.is_accepting_applications and not session.completed_application %}
+          <br />
+          <h2 class="text-4xl">You have {{ session.application_end_anywhere_on_earth|timeuntil}} to submit your application</h2>
+          <br />
+        {% endif %}
+        {% include 'home/includes/session_apply_btn.html' %}
       </div>
-  </div>
-  <div class="row">
-    <div class="col">
-      <dl class="px-4 py-3 sm:grid sm:grid-cols-3 sm:gap-2 sm:px-0">
-        <dt class="text-sm font-bold leading-6 text-gray-900">Applications Open:</dt>
-        <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">{{ session.application_start_date|date:"M d, Y" }} AOE</dd>
-        <dt class="text-sm font-bold leading-6 text-gray-900">Applications Close:</dt>
-        <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">{{ session.application_end_date|date:"M d, Y" }} AOE</dd>
-        <dt class="text-sm font-bold leading-6 text-gray-900">Invitations Sent:</dt>
-        <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">{{ session.invitation_date|date:"M d, Y" }}</dd>
-        <dt class="text-sm font-bold leading-6 text-gray-900">Start:</dt>
-        <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">{{ session.start_date|date:"M d, Y" }}</dd>
-        <dt class="text-sm font-bold leading-6 text-gray-900">End:</dt>
-        <dd class="mt-1 text-sm leading-6 text-gray-700 sm:col-span-2 sm:mt-0">{{ session.end_date|date:"M d, Y" }}</dd>
-      </dl>
-      <p>{{ session.description|linebreaksbr|urlizetrunc:25 }}</p>
-      {% if session.is_accepting_applications and not session.completed_application %}
-        <br />
-        <h2 class="text-4xl">You have {{ session.application_end_anywhere_on_earth|timeuntil}} to submit your application</h2>
-        <br />
-      {% endif %}
-      {% include 'home/includes/session_apply_btn.html' %}
     </div>
   </div>
-</div>
+</main>
 {% endblock content %}
diff --git a/indymeet/templates/base.html b/indymeet/templates/base.html
index 9cefc2f2..a59c98aa 100644
--- a/indymeet/templates/base.html
+++ b/indymeet/templates/base.html
@@ -91,9 +91,13 @@
         <script src="https://unpkg.com/htmx.org@1.8.4"></script>
         {% wagtailuserbar %}
         {% include 'includes/messages.html' %}
-        {% block content %}
-            {# other page stuff goes here #}
-        {% endblock %}
+        <div class="{% if not blog_page %}container flex justify-center mx-auto max-w-screen-xl {% endif %}">
+            <div class="{% if not blog_page %}w-3/4{% endif %}">
+            {% block content %}
+                {# other page stuff goes here #}
+            {% endblock %}
+            </div>
+        </div>
         {# Global javascript #}
         {% include 'includes/footer.html' %}
     </body>
diff --git a/indymeet/templates/includes/nav.html b/indymeet/templates/includes/nav.html
index a37b45a2..9d415db6 100644
--- a/indymeet/templates/includes/nav.html
+++ b/indymeet/templates/includes/nav.html
@@ -1,6 +1,6 @@
 {% load i18n static wagtailcore_tags %}
 <nav class="bg-white {% if 'Home' in page.title %}stars{% endif %}">
-    <div class="mx-2 flex h-16 max-w-screen-xl items-center gap-8 px-1 sm:px-4 lg:px-2">
+    <div class="mx-2 flex h-16 items-center gap-8 px-1 sm:px-4 lg:px-2">
         <a class="block text-teal-600" href="/">
             <img alt="Djangonaut Space" class="nav-brand-icon" src="{% static 'img/main-purple-transparent.png' %}"/>
         </a>
diff --git a/indymeet/templates/puput/entry_page.html b/indymeet/templates/puput/entry_page.html
index f4ffdade..35824665 100644
--- a/indymeet/templates/puput/entry_page.html
+++ b/indymeet/templates/puput/entry_page.html
@@ -43,14 +43,14 @@
 
 {% block content %}
         <div class="container mx-auto flex justify-center">
-            <article class="box max-w-4xl blog-container"
+            <article class="box max-w-5xl blog-container"
                     {% if self.id %}data-entry-page-update-comments-url="{% url 'entry_page_update_comments' self.id %}{% endif %}">
                 {% include 'puput/entry_page_header.html' with entry=self %}
                 <section>
                     {% if self.header_image %}
                         <div class="image featured">
                             {% image self.header_image fill-800x450 as header_image %}
-                            <img alt="{{ self.header_image.title }}" src="{{ header_image.url }}">
+                            <img alt="{{ self.header_image.title }}" class="mx-auto" src="{{ header_image.url }}">
                         </div>
                     {% endif %}
                     {% include 'puput/entry_links.html' with entry=self %}

From a529e360077c45b4d56fcf41297462d28fb1ec19 Mon Sep 17 00:00:00 2001
From: raffaella <suardini.raffaella@gmail.com>
Date: Thu, 18 Apr 2024 16:52:17 +0200
Subject: [PATCH 09/13] chore: inserted pre-commit instructions

---
 README.md | 22 +++++++++++++++-------
 1 file changed, 15 insertions(+), 7 deletions(-)

diff --git a/README.md b/README.md
index ec113167..ffa77b97 100644
--- a/README.md
+++ b/README.md
@@ -128,7 +128,15 @@ This is an example of how to list things you need to use the software and how to
    ```sh
    venv\Scripts\activate
    ```
-3. Create a posgresql database
+3. Install pre-commit
+   ```sh
+   pip install pre-commit
+   ```
+   Install git hook scripts:
+   ```sh
+   pre-commit install
+   ```
+4. Create a posgresql database
    ```sh
    psql -U postgres
    ```
@@ -140,12 +148,12 @@ This is an example of how to list things you need to use the software and how to
    ```sh
    postgres=# exit
    ```
-4. install requirements:
+5. install requirements:
    ```sh
    pip install -r requirements/requirements-dev.txt
    ```
 
-5. Copy `.env.template.local` file, rename to `.env` and use variables for your local postgres database.
+6. Copy `.env.template.local` file, rename to `.env` and use variables for your local postgres database.
    Copy in Linux:
    ```sh
    cp .env.template.local .env
@@ -154,22 +162,22 @@ This is an example of how to list things you need to use the software and how to
    ```sh
    copy .env.template.local .env
    ```
-6. Run migrations and create superuser
+7. Run migrations and create superuser
    ```sh
    python manage.py migrate
    # Potentially load data first
    # python manage.py loaddata fixtures/data.json
    python manage.py createsuperuser
    ```
-7. Install tailwind. You also need npm installed.
+8. Install tailwind. You also need npm installed.
    ```sh
    python manage.py tailwind install
    ```
-8. Run server locally
+9. Run server locally
    ```sh
    python manage.py runserver
    ```
-9. Run tailwind in another terminal locally
+10. Run tailwind in another terminal locally
    ```sh
    python manage.py tailwind start
    ```

From 1dbd9346b3b8ff93bc76739d1fa1530cf0877881 Mon Sep 17 00:00:00 2001
From: raffaella <suardini.raffaella@gmail.com>
Date: Tue, 23 Apr 2024 11:36:33 +0200
Subject: [PATCH 10/13] chore: relocate pre-commit install instruction

---
 README.md | 27 +++++++++++----------------
 1 file changed, 11 insertions(+), 16 deletions(-)

diff --git a/README.md b/README.md
index ffa77b97..c0e4a72a 100644
--- a/README.md
+++ b/README.md
@@ -128,15 +128,7 @@ This is an example of how to list things you need to use the software and how to
    ```sh
    venv\Scripts\activate
    ```
-3. Install pre-commit
-   ```sh
-   pip install pre-commit
-   ```
-   Install git hook scripts:
-   ```sh
-   pre-commit install
-   ```
-4. Create a posgresql database
+3. Create a posgresql database
    ```sh
    psql -U postgres
    ```
@@ -148,12 +140,15 @@ This is an example of how to list things you need to use the software and how to
    ```sh
    postgres=# exit
    ```
-5. install requirements:
+4. install requirements:
    ```sh
    pip install -r requirements/requirements-dev.txt
    ```
-
-6. Copy `.env.template.local` file, rename to `.env` and use variables for your local postgres database.
+   set up the git hook scripts
+   ```sh
+   pre-commit install
+   ```
+5. Copy `.env.template.local` file, rename to `.env` and use variables for your local postgres database.
    Copy in Linux:
    ```sh
    cp .env.template.local .env
@@ -162,22 +157,22 @@ This is an example of how to list things you need to use the software and how to
    ```sh
    copy .env.template.local .env
    ```
-7. Run migrations and create superuser
+6. Run migrations and create superuser
    ```sh
    python manage.py migrate
    # Potentially load data first
    # python manage.py loaddata fixtures/data.json
    python manage.py createsuperuser
    ```
-8. Install tailwind. You also need npm installed.
+7. Install tailwind. You also need npm installed.
    ```sh
    python manage.py tailwind install
    ```
-9. Run server locally
+8. Run server locally
    ```sh
    python manage.py runserver
    ```
-10. Run tailwind in another terminal locally
+9. Run tailwind in another terminal locally
    ```sh
    python manage.py tailwind start
    ```

From f2844a1786fe156cd2c75c988b04fc936b7ee16f Mon Sep 17 00:00:00 2001
From: Raffaella <45825990+raffaellasuardini@users.noreply.github.com>
Date: Mon, 10 Jun 2024 14:39:41 +0200
Subject: [PATCH 11/13] Feature: placeholder for sessions (#392)

* feat: created placeholder for session_list.html

* Update session_list.html

* feat: updated session order from more recent

* chore: moved placeholder before active sessions

---------
---
 home/templates/home/prerelease/session_list.html | 12 +++++++++++-
 home/views.py                                    |  4 +++-
 2 files changed, 14 insertions(+), 2 deletions(-)

diff --git a/home/templates/home/prerelease/session_list.html b/home/templates/home/prerelease/session_list.html
index fba27f67..5ddd5d70 100644
--- a/home/templates/home/prerelease/session_list.html
+++ b/home/templates/home/prerelease/session_list.html
@@ -25,7 +25,17 @@ <h1 class="text-5xl">Sessions</h1>
         </div>
         <div class="grid grid-cols-1 md:grid-cols-2 lg:grid-cols-3 pt-4">
             {% for session in sessions %}
-                {% include 'home/includes/session_card.html' %}
+                {% if forloop.first and not session.is_accepting_applications %}
+                     <div class="col col-lg-3 col-md-4 col-sm-6 col-12">
+                        <div class="max-w-sm rounded overflow-hidden shadow-lg card">
+                          <div class="px-6 py-4 card-body">
+                              <h5 class="font-bold text-xl mb-1 card-title">No active session</h5>
+                                <p class="text-gray-700 text-base card-text">While we're busy checking our on-board instrumental code for the next cosmic journey, you can prepare by exploring our <a href="https://github.com/djangonaut-space/program">Program Documentation</a>.</p>
+                          </div>
+                        </div>
+                     </div>
+                {% endif%}
+            {% include 'home/includes/session_card.html' %}
             {% endfor %}
         </div>
     </div>
diff --git a/home/views.py b/home/views.py
index c40d431f..29ccb6e6 100644
--- a/home/views.py
+++ b/home/views.py
@@ -105,7 +105,9 @@ class SessionListView(ListView):
     context_object_name = "sessions"
 
     def get_queryset(self):
-        return Session.objects.with_applications(user=self.request.user)
+        return Session.objects.with_applications(user=self.request.user).order_by(
+            "-end_date"
+        )
 
 
 class CreateUserSurveyResponseFormView(

From ba427694f59f1a3e497b52964c074cd69224bb0f Mon Sep 17 00:00:00 2001
From: Tim Schilling <schillingt@better-simple.com>
Date: Mon, 24 Jun 2024 21:37:41 -0500
Subject: [PATCH 12/13] Avoid urlizing richtext fields

The richtext blocks should handle formatting the links which will result in a tags. This is why we need the `|safe` template filter.
---
 indymeet/templates/blocks/rich_text.html | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/indymeet/templates/blocks/rich_text.html b/indymeet/templates/blocks/rich_text.html
index 18f2cf2e..4c875fdd 100644
--- a/indymeet/templates/blocks/rich_text.html
+++ b/indymeet/templates/blocks/rich_text.html
@@ -1,3 +1,3 @@
 <div class="mt-3 ">
-  {{ value.text|safe|urlize }}
+  {{ value.text|safe }}
 </div>

From 408da3afc1a0e93baad9d011a7b7f2320dc4a55d Mon Sep 17 00:00:00 2001
From: tschilling <schillingt@better-simple.com>
Date: Mon, 24 Jun 2024 21:41:27 -0500
Subject: [PATCH 13/13] Revert "feat: Add django-post_office for mail queueing
 (#359)"

This reverts commit aeae55a05b23db681b9da5c55c1c103fc0cba6d0.
---
 indymeet/settings/base.py          |   9 -
 indymeet/settings/dev.py           |   2 +-
 indymeet/settings/production.py    |   1 +
 requirements/requirements-dev.txt  | 293 ++++++++++++++---------------
 requirements/requirements-test.txt | 143 +++++++-------
 requirements/requirements.in       |   1 -
 requirements/requirements.txt      |  46 ++---
 supervisord.conf                   |   8 -
 8 files changed, 234 insertions(+), 269 deletions(-)

diff --git a/indymeet/settings/base.py b/indymeet/settings/base.py
index 0f7b1029..b17d5e4a 100644
--- a/indymeet/settings/base.py
+++ b/indymeet/settings/base.py
@@ -66,7 +66,6 @@
     "tailwind",
     "theme",
     "widget_tweaks",
-    "post_office",
 ]
 
 MIDDLEWARE = [
@@ -223,14 +222,6 @@
 SERVER_EMAIL = "contact@djangonaut.space"
 SILENCED_SYSTEM_CHECKS = ["django_recaptcha.recaptcha_test_key_error"]
 
-EMAIL_BACKEND = "post_office.EmailBackend"
-
-POST_OFFICE = {
-    "BACKENDS": {
-        "default": "anymail.backends.mailjet.EmailBackend",
-    }
-}
-
 PUPUT_AS_PLUGIN = True
 PUPUT_ENTRY_MODEL = "home.models.BlogAbstract"
 
diff --git a/indymeet/settings/dev.py b/indymeet/settings/dev.py
index ca9cc52b..778b9e53 100644
--- a/indymeet/settings/dev.py
+++ b/indymeet/settings/dev.py
@@ -21,7 +21,7 @@
 # SECURITY WARNING: define the correct hosts in production!
 ALLOWED_HOSTS = ["*"]
 
-POST_OFFICE["BACKENDS"] = {"default": "django.core.mail.backends.console.EmailBackend"}
+EMAIL_BACKEND = "django.core.mail.backends.console.EmailBackend"
 
 INSTALLED_APPS += ["django_extensions"]  # noqa F405
 
diff --git a/indymeet/settings/production.py b/indymeet/settings/production.py
index fefbac4d..a2bd5da9 100644
--- a/indymeet/settings/production.py
+++ b/indymeet/settings/production.py
@@ -36,6 +36,7 @@
     # unless there was a setting that needs it.
     DATABASES["default"].setdefault("OPTIONS", {})["sslmode"] = "require"
 
+    EMAIL_BACKEND = "anymail.backends.mailjet.EmailBackend"
     MAILJET_API_KEY = os.getenv("MAILJET_API_KEY")
     MAILJET_SECRET_KEY = os.getenv("MAILJET_SECRET_KEY")
     ANYMAIL = {
diff --git a/requirements/requirements-dev.txt b/requirements/requirements-dev.txt
index b30f63b5..68f021df 100644
--- a/requirements/requirements-dev.txt
+++ b/requirements/requirements-dev.txt
@@ -6,82 +6,81 @@
 #
 anyascii==0.3.2
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 anyio==4.2.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   azure-core
 asgiref==3.7.2
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   django
     #   django-browser-reload
 azure-core==1.29.6
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   azure-storage-blob
 azure-storage-blob==12.19.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 beautifulsoup4==4.11.2
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 bleach==4.1.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
-    #   django-post-office
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail-markdown
 build==1.0.3
     # via pip-tools
 certifi==2023.11.17
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   requests
     #   sentry-sdk
 cffi==1.16.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   cryptography
 cfgv==3.4.0
     # via pre-commit
 charset-normalizer==3.3.2
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   requests
 click==8.1.7
     # via pip-tools
 cryptography==41.0.7
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   azure-storage-blob
 defusedxml==0.7.1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   willow
 distlib==0.3.8
     # via virtualenv
 dj-database-url==2.1.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 django==4.1.13
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   dj-database-url
     #   django-anymail
     #   django-browser-reload
@@ -92,7 +91,6 @@ django==4.1.13
     #   django-filter
     #   django-modelcluster
     #   django-permissionedforms
-    #   django-post-office
     #   django-recaptcha
     #   django-storages
     #   django-taggit
@@ -103,196 +101,192 @@ django==4.1.13
     #   wagtail
 django-anymail==10.3
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 django-browser-reload==1.12.1
     # via django-tailwind
 django-colorful==1.3
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   puput
 django-debug-toolbar==4.3.0
     # via
-    #   -r requirements/requirements-dev.in
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-dev.in
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 django-el-pagination==4.0.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   puput
 django-extensions==3.2.3
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 django-filter==22.1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 django-modelcluster==6.2.1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 django-permissionedforms==0.1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
-django-post-office==3.8.0
-    # via -r requirements/requirements.txt
 django-recaptcha==4.0.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 django-social-share==2.3.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   puput
 django-storages==1.13.2
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 django-taggit==3.1.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   puput
     #   wagtail
 django-tailwind==3.8.0
     # via
-    #   -r requirements/requirements-dev.in
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-dev.in
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 django-treebeard==4.7
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 django-widget-tweaks==1.5.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 djangorestframework==3.14.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 draftjs-exporter==2.1.7
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 et-xmlfile==1.1.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   openpyxl
-exceptiongroup==1.2.0
-    # via -r requirements/requirements-test.txt
 factory-boy==3.3.0
-    # via -r requirements/requirements-test.txt
+    # via -r requirements-test.txt
 faker==23.2.1
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   factory-boy
 filelock==3.13.1
     # via virtualenv
 filetype==1.2.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   willow
 freezegun==1.4.0
-    # via -r requirements/requirements-test.txt
+    # via -r requirements-test.txt
 greenlet==3.0.3
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   playwright
 html5lib==1.1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 identify==2.5.33
     # via pre-commit
 idna==3.6
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   anyio
     #   requests
 iniconfig==2.0.0
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   pytest
 isodate==0.6.1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   azure-storage-blob
 l18n==2021.3
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 markdown==3.5.2
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail-markdown
 nodeenv==1.8.0
     # via pre-commit
 openpyxl==3.1.2
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 packaging==23.2
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   bleach
     #   build
     #   pytest
 pillow==10.2.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 pip-tools==7.4.1
-    # via -r requirements/requirements-dev.in
+    # via -r requirements-dev.in
 platformdirs==4.1.0
     # via virtualenv
 playwright==1.42.0
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   pytest-playwright
 pluggy==1.3.0
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   pytest
 pre-commit==3.7.0
-    # via -r requirements/requirements-dev.in
+    # via -r requirements-dev.in
 psycopg2-binary==2.9.9
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 puput==2.0.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 pycparser==2.21
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   cffi
 pyee==11.0.1
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   playwright
 pyproject-hooks==1.0.0
     # via
@@ -300,60 +294,59 @@ pyproject-hooks==1.0.0
     #   pip-tools
 pytest==7.4.4
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   pytest-base-url
     #   pytest-django
     #   pytest-mock
     #   pytest-playwright
 pytest-base-url==2.0.0
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   pytest-playwright
 pytest-django==4.8.0
-    # via -r requirements/requirements-test.txt
+    # via -r requirements-test.txt
 pytest-mock==3.14.0
-    # via -r requirements/requirements-test.txt
+    # via -r requirements-test.txt
 pytest-playwright==0.4.4
-    # via -r requirements/requirements-test.txt
+    # via -r requirements-test.txt
 python-dateutil==2.8.2
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   faker
     #   freezegun
 python-dotenv==1.0.1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 python-slugify==8.0.1
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   pytest-playwright
 pytz==2023.3.post1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   django-modelcluster
-    #   django-post-office
     #   djangorestframework
     #   l18n
 pyyaml==6.0.1
     # via pre-commit
 requests==2.31.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   azure-core
     #   django-anymail
     #   pytest-base-url
     #   wagtail
 sentry-sdk==1.40.4
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 six==1.16.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   azure-core
     #   bleach
     #   html5lib
@@ -362,47 +355,47 @@ six==1.16.0
     #   python-dateutil
 sniffio==1.3.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   anyio
 soupsieve==2.5
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   beautifulsoup4
 sqlparse==0.4.4
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   django
     #   django-debug-toolbar
 supervisor==4.2.5
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 telepath==0.3.1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 text-unidecode==1.3
     # via
-    #   -r requirements/requirements-test.txt
+    #   -r requirements-test.txt
     #   python-slugify
 typing-extensions==4.10.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   azure-core
     #   azure-storage-blob
     #   dj-database-url
     #   pyee
 unittest-parametrize==1.4.0
-    # via -r requirements/requirements-test.txt
+    # via -r requirements-test.txt
 urllib3==2.2.1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   django-anymail
     #   requests
     #   sentry-sdk
@@ -410,31 +403,31 @@ virtualenv==20.25.0
     # via pre-commit
 wagtail==5.0.5
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   puput
     #   wagtail-markdown
 wagtail-markdown==0.11.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   puput
 webencodings==0.5.1
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   bleach
     #   html5lib
 wheel==0.42.0
     # via pip-tools
 whitenoise==6.6.0
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
 willow==1.6.3
     # via
-    #   -r requirements/requirements-test.txt
-    #   -r requirements/requirements.txt
+    #   -r requirements-test.txt
+    #   -r requirements.txt
     #   wagtail
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/requirements-test.txt b/requirements/requirements-test.txt
index 1dbe6cec..7c859948 100644
--- a/requirements/requirements-test.txt
+++ b/requirements/requirements-test.txt
@@ -6,57 +6,56 @@
 #
 anyascii==0.3.2
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 anyio==4.2.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   azure-core
 asgiref==3.7.2
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   django
 azure-core==1.29.6
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   azure-storage-blob
 azure-storage-blob==12.19.0
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 beautifulsoup4==4.11.2
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 bleach==4.1.0
     # via
-    #   -r requirements/requirements.txt
-    #   django-post-office
+    #   -r requirements.txt
     #   wagtail-markdown
 certifi==2023.11.17
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   requests
     #   sentry-sdk
 cffi==1.16.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   cryptography
 charset-normalizer==3.3.2
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   requests
 cryptography==41.0.7
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   azure-storage-blob
 defusedxml==0.7.1
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   willow
 dj-database-url==2.1.0
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 django==4.1.13
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   dj-database-url
     #   django-anymail
     #   django-colorful
@@ -66,7 +65,6 @@ django==4.1.13
     #   django-filter
     #   django-modelcluster
     #   django-permissionedforms
-    #   django-post-office
     #   django-recaptcha
     #   django-storages
     #   django-taggit
@@ -76,133 +74,131 @@ django==4.1.13
     #   puput
     #   wagtail
 django-anymail==10.3
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 django-colorful==1.3
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   puput
 django-debug-toolbar==4.3.0
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 django-el-pagination==4.0.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   puput
 django-extensions==3.2.3
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 django-filter==22.1
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 django-modelcluster==6.2.1
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 django-permissionedforms==0.1
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
-django-post-office==3.8.0
-    # via -r requirements/requirements.txt
 django-recaptcha==4.0.0
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 django-social-share==2.3.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   puput
 django-storages==1.13.2
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 django-taggit==3.1.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   puput
     #   wagtail
 django-tailwind==3.8.0
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 django-treebeard==4.7
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 django-widget-tweaks==1.5.0
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 djangorestframework==3.14.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 draftjs-exporter==2.1.7
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 et-xmlfile==1.1.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   openpyxl
 factory-boy==3.3.0
-    # via -r requirements/requirements-test.in
+    # via -r requirements-test.in
 faker==23.2.1
     # via factory-boy
 filetype==1.2.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   willow
 freezegun==1.4.0
-    # via -r requirements/requirements-test.in
+    # via -r requirements-test.in
 greenlet==3.0.3
     # via playwright
 html5lib==1.1
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 idna==3.6
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   anyio
     #   requests
 iniconfig==2.0.0
     # via pytest
 isodate==0.6.1
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   azure-storage-blob
 l18n==2021.3
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 markdown==3.5.2
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail-markdown
 openpyxl==3.1.2
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 packaging==23.2
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   bleach
     #   pytest
 pillow==10.2.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 playwright==1.42.0
     # via
-    #   -r requirements/requirements-test.in
+    #   -r requirements-test.in
     #   pytest-playwright
 pluggy==1.3.0
     # via pytest
 psycopg2-binary==2.9.9
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 puput==2.0.0
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 pycparser==2.21
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   cffi
 pyee==11.0.1
     # via playwright
 pytest==7.4.4
     # via
-    #   -r requirements/requirements-test.in
+    #   -r requirements-test.in
     #   pytest-base-url
     #   pytest-django
     #   pytest-mock
@@ -210,38 +206,37 @@ pytest==7.4.4
 pytest-base-url==2.0.0
     # via pytest-playwright
 pytest-django==4.8.0
-    # via -r requirements/requirements-test.in
+    # via -r requirements-test.in
 pytest-mock==3.14.0
-    # via -r requirements/requirements-test.in
+    # via -r requirements-test.in
 pytest-playwright==0.4.4
-    # via -r requirements/requirements-test.in
+    # via -r requirements-test.in
 python-dateutil==2.8.2
     # via
     #   faker
     #   freezegun
 python-dotenv==1.0.1
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 python-slugify==8.0.1
     # via pytest-playwright
 pytz==2023.3.post1
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   django-modelcluster
-    #   django-post-office
     #   djangorestframework
     #   l18n
 requests==2.31.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   azure-core
     #   django-anymail
     #   pytest-base-url
     #   wagtail
 sentry-sdk==1.40.4
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 six==1.16.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   azure-core
     #   bleach
     #   html5lib
@@ -250,59 +245,59 @@ six==1.16.0
     #   python-dateutil
 sniffio==1.3.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   anyio
 soupsieve==2.5
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   beautifulsoup4
 sqlparse==0.4.4
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   django
     #   django-debug-toolbar
 supervisor==4.2.5
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 telepath==0.3.1
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 text-unidecode==1.3
     # via python-slugify
 typing-extensions==4.10.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   azure-core
     #   azure-storage-blob
     #   dj-database-url
     #   pyee
 unittest-parametrize==1.4.0
-    # via -r requirements/requirements-test.in
+    # via -r requirements-test.in
 urllib3==2.2.1
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   django-anymail
     #   requests
     #   sentry-sdk
 wagtail==5.0.5
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   puput
     #   wagtail-markdown
 wagtail-markdown==0.11.0
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   puput
 webencodings==0.5.1
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   bleach
     #   html5lib
 whitenoise==6.6.0
-    # via -r requirements/requirements.txt
+    # via -r requirements.txt
 willow==1.6.3
     # via
-    #   -r requirements/requirements.txt
+    #   -r requirements.txt
     #   wagtail
 
 # The following packages are considered to be unsafe in a requirements file:
diff --git a/requirements/requirements.in b/requirements/requirements.in
index 88df1e43..81280adb 100644
--- a/requirements/requirements.in
+++ b/requirements/requirements.in
@@ -18,4 +18,3 @@ sentry-sdk[django]
 supervisor
 django-widget-tweaks
 dj-database-url
-django-post_office
diff --git a/requirements/requirements.txt b/requirements/requirements.txt
index a1252525..663b83e6 100644
--- a/requirements/requirements.txt
+++ b/requirements/requirements.txt
@@ -17,9 +17,7 @@ azure-storage-blob==12.19.0
 beautifulsoup4==4.11.2
     # via wagtail
 bleach==4.1.0
-    # via
-    #   django-post-office
-    #   wagtail-markdown
+    # via wagtail-markdown
 certifi==2023.11.17
     # via
     #   requests
@@ -33,10 +31,10 @@ cryptography==41.0.7
 defusedxml==0.7.1
     # via willow
 dj-database-url==2.1.0
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 django==4.1.13
     # via
-    #   -r requirements/requirements.in
+    #   -r requirements.in
     #   dj-database-url
     #   django-anymail
     #   django-colorful
@@ -46,7 +44,6 @@ django==4.1.13
     #   django-filter
     #   django-modelcluster
     #   django-permissionedforms
-    #   django-post-office
     #   django-recaptcha
     #   django-storages
     #   django-taggit
@@ -57,39 +54,37 @@ django==4.1.13
     #   sentry-sdk
     #   wagtail
 django-anymail==10.3
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 django-colorful==1.3
     # via puput
 django-debug-toolbar==4.3.0
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 django-el-pagination==4.0.0
     # via puput
 django-extensions==3.2.3
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 django-filter==22.1
     # via wagtail
 django-modelcluster==6.2.1
     # via wagtail
 django-permissionedforms==0.1
     # via wagtail
-django-post-office==3.8.0
-    # via -r requirements/requirements.in
 django-recaptcha==4.0.0
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 django-social-share==2.3.0
     # via puput
 django-storages==1.13.2
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 django-taggit==3.1.0
     # via
     #   puput
     #   wagtail
 django-tailwind==3.8.0
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 django-treebeard==4.7
     # via wagtail
 django-widget-tweaks==1.5.0
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 djangorestframework==3.14.0
     # via wagtail
 draftjs-exporter==2.1.7
@@ -117,17 +112,16 @@ packaging==23.2
 pillow==10.2.0
     # via wagtail
 psycopg2-binary==2.9.9
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 puput==2.0.0
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 pycparser==2.21
     # via cffi
 python-dotenv==1.0.1
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 pytz==2023.3.post1
     # via
     #   django-modelcluster
-    #   django-post-office
     #   djangorestframework
     #   l18n
 requests==2.31.0
@@ -136,10 +130,10 @@ requests==2.31.0
     #   django-anymail
     #   wagtail
 sentry-sdk==1.40.4
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 six==1.16.0
     # via
-    #   -r requirements/requirements.in
+    #   -r requirements.in
     #   azure-core
     #   bleach
     #   html5lib
@@ -154,24 +148,24 @@ sqlparse==0.4.4
     #   django
     #   django-debug-toolbar
 supervisor==4.2.5
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 telepath==0.3.1
     # via wagtail
 typing-extensions==4.10.0
     # via
-    #   -r requirements/requirements.in
+    #   -r requirements.in
     #   azure-core
     #   azure-storage-blob
     #   dj-database-url
 urllib3==2.2.1
     # via
-    #   -r requirements/requirements.in
+    #   -r requirements.in
     #   django-anymail
     #   requests
     #   sentry-sdk
 wagtail==5.0.5
     # via
-    #   -r requirements/requirements.in
+    #   -r requirements.in
     #   puput
     #   wagtail-markdown
 wagtail-markdown==0.11.0
@@ -181,7 +175,7 @@ webencodings==0.5.1
     #   bleach
     #   html5lib
 whitenoise==6.6.0
-    # via -r requirements/requirements.in
+    # via -r requirements.in
 willow==1.6.3
     # via wagtail
 
diff --git a/supervisord.conf b/supervisord.conf
index 86941c09..02d956dc 100644
--- a/supervisord.conf
+++ b/supervisord.conf
@@ -3,11 +3,3 @@ nodaemon=false
 
 [program:foo]
 command=/bin/cat
-
-[program:post_office_send_queued_mail]
-command=bash -c 'python /app/manage.py send_queued_mail && sleep 30'
-autorestart=true
-
-[program:post_office_cleanup_mail]
-command=bash -c 'python /app/manage.py python manage.py cleanup_mail --days=30 --delete-attachments && sleep 86400'
-autorestart=true