From 549a48769daff7adc6b6367230d853a9b0603c93 Mon Sep 17 00:00:00 2001
From: Jake Howard <git@theorangeone.net>
Date: Wed, 5 Oct 2022 14:17:00 +0100
Subject: [PATCH] Swap curlylint and djhtml with djlint

---
 .gitlab-ci.yml                                |   9 +-
 justfile                                      |   5 +-
 poetry.lock                                   | 331 +++++++++++++++---
 pyproject.toml                                |  30 +-
 .../templates/blog/blog_post_list_page.html   |   2 +-
 website/common/templates/404.html             |   4 +-
 website/common/templates/500.html             |   4 +-
 website/common/templates/base.html            |   4 +-
 .../templates/common/blocks/iframe.html       |   2 +-
 .../templates/common/blocks/tangent.html      |   4 +-
 .../common/templates/common/breadcrumbs.html  |   4 +-
 .../common/templates/common/content_page.html |   2 +-
 website/common/templates/common/footer.html   |  10 +-
 .../common/templates/common/listing-item.html |   6 +-
 .../common/templates/common/listing_page.html |   2 +-
 website/common/templates/common/navbar.html   |   8 +-
 .../common/templates/common/pagination.html   |  28 +-
 .../common/templates/password_required.html   |  23 +-
 website/common/templates/wagtail_base.html    |  12 +-
 .../templates/wagtailmetadata/parts/tags.html |   4 +-
 .../templates/contact/contact_page.html       |   4 +-
 .../unsplash/templates/unsplash/results.html  |  10 +-
 website/home/templates/home/home_page.html    |   6 +-
 .../search/templates/search/search_page.html  |  13 +-
 .../templates/search/search_results.html      |   4 +-
 .../templates/spotify/spotify-item.html       |  17 +-
 26 files changed, 383 insertions(+), 165 deletions(-)

diff --git a/.gitlab-ci.yml b/.gitlab-ci.yml
index f53a356..a164d92 100644
--- a/.gitlab-ci.yml
+++ b/.gitlab-ci.yml
@@ -107,21 +107,16 @@ mypy:
   script:
     - mypy .
 
-curlylint:
+djlint:
   extends: .python_test_template
   script:
-    - curlylint .
+    - djlint website/ --lint --check
 
 gunicorn_check:
   extends: .python_test_template
   script:
     - gunicorn --check-config --config etc/gunicorn.conf.py
 
-djhtml:
-  extends: .python_test_template
-  script:
-    - find website/ -name '*.html' | xargs djhtml --check --tabwidth 2
-
 npm_lint:
   image: node:18-slim
   stage: test
diff --git a/justfile b/justfile
index 9ac7434..63ac430 100644
--- a/justfile
+++ b/justfile
@@ -34,7 +34,7 @@ coverage:
 format:
   black .
   isort .
-  find website/ -name '*.html' | xargs djhtml -i --tabwidth 2
+  djlint website/ --reformat
   npm run format
 
 lint: lint_python lint_node
@@ -44,8 +44,7 @@ lint_python:
   isort --check .
   flake8
   mypy . --show-error-codes
-  curlylint .
-  find website/ -name '*.html' | xargs djhtml --check --tabwidth 2
+  djlint website/ --lint --check
 
 @lint_node:
   npm run lint
diff --git a/poetry.lock b/poetry.lock
index 45337eb..bf93e1d 100644
--- a/poetry.lock
+++ b/poetry.lock
@@ -158,19 +158,17 @@ python-versions = ">=3.7"
 toml = ["tomli"]
 
 [[package]]
-name = "curlylint"
-version = "0.13.1"
-description = "{{ 🎀}} Experimental HTML templates linting for Jinja, Nunjucks, Django templates, Twig, Liquid"
+name = "cssbeautifier"
+version = "1.14.6"
+description = "CSS unobfuscator and beautifier."
 category = "dev"
 optional = false
-python-versions = ">=3.6"
+python-versions = "*"
 
 [package.dependencies]
-attrs = ">=17.2.0"
-click = ">=6.5"
-parsy = "1.1.0"
-pathspec = ">=0.6,<1"
-toml = ">=0.9.4"
+editorconfig = ">=0.12.2"
+jsbeautifier = "*"
+six = ">=1.13.0"
 
 [[package]]
 name = "Deprecated"
@@ -411,15 +409,26 @@ django = ">=2.2"
 pytz = "*"
 
 [[package]]
-name = "djhtml"
-version = "1.5.1"
-description = "Django/Jinja template indenter"
+name = "djlint"
+version = "1.18.0"
+description = "HTML Template Linter and Formatter"
 category = "dev"
 optional = false
-python-versions = "*"
+python-versions = ">=3.7.2,<4.0.0"
 
-[package.extras]
-dev = ["black", "flake8", "isort", "nox", "pre-commit"]
+[package.dependencies]
+click = ">=8.0.1,<9.0.0"
+colorama = ">=0.4.4,<0.5.0"
+cssbeautifier = ">=1.14.4,<2.0.0"
+html-tag-names = ">=0.1.2,<0.2.0"
+html-void-elements = ">=0.1.0,<0.2.0"
+importlib-metadata = ">=4.11.0,<5.0.0"
+jsbeautifier = ">=1.14.4,<2.0.0"
+pathspec = ">=0.10.0,<0.11.0"
+PyYAML = ">=6.0,<7.0"
+regex = ">=2022.1.18,<2023.0.0"
+tomli = {version = ">=2.0.1,<3.0.0", markers = "python_version < \"3.11\""}
+tqdm = ">=4.62.2,<5.0.0"
 
 [[package]]
 name = "draftjs-exporter"
@@ -456,6 +465,14 @@ uritemplate = ">=3.0.0"
 [package.extras]
 validation = ["swagger-spec-validator (>=2.1.0)"]
 
+[[package]]
+name = "EditorConfig"
+version = "0.12.3"
+description = "EditorConfig File Locator and Interpreter for Python"
+category = "dev"
+optional = false
+python-versions = "*"
+
 [[package]]
 name = "et-xmlfile"
 version = "1.1.0"
@@ -609,6 +626,22 @@ colorama = {version = "*", markers = "sys_platform == \"win32\""}
 [package.extras]
 export = ["jinja2 (>=2.7,<3)"]
 
+[[package]]
+name = "html-tag-names"
+version = "0.1.2"
+description = "List of known HTML tag names"
+category = "dev"
+optional = false
+python-versions = ">=3.7,<4.0"
+
+[[package]]
+name = "html-void-elements"
+version = "0.1.0"
+description = "List of HTML void tag names."
+category = "dev"
+optional = false
+python-versions = ">=3.7,<4.0"
+
 [[package]]
 name = "html5lib"
 version = "1.1"
@@ -646,6 +679,22 @@ category = "main"
 optional = false
 python-versions = ">=3.5"
 
+[[package]]
+name = "importlib-metadata"
+version = "4.13.0"
+description = "Read metadata from Python packages"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+
+[package.dependencies]
+zipp = ">=0.5"
+
+[package.extras]
+docs = ["furo", "jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx (>=3.5)"]
+perf = ["ipython"]
+testing = ["flake8 (<5)", "flufl.flake8", "importlib-resources (>=1.3)", "packaging", "pyfakefs", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)", "pytest-perf (>=0.9.2)"]
+
 [[package]]
 name = "inflection"
 version = "0.5.1"
@@ -690,6 +739,18 @@ MarkupSafe = ">=2.0"
 [package.extras]
 i18n = ["Babel (>=2.7)"]
 
+[[package]]
+name = "jsbeautifier"
+version = "1.14.6"
+description = "JavaScript unobfuscator and beautifier."
+category = "dev"
+optional = false
+python-versions = "*"
+
+[package.dependencies]
+editorconfig = ">=0.12.2"
+six = ">=1.13.0"
+
 [[package]]
 name = "l18n"
 version = "2021.3"
@@ -788,14 +849,6 @@ python-versions = ">=3.6"
 [package.dependencies]
 pyparsing = ">=2.0.2,<3.0.5 || >3.0.5"
 
-[[package]]
-name = "parsy"
-version = "1.1.0"
-description = "easy-to-use parser combinators, for parsing in pure Python"
-category = "dev"
-optional = false
-python-versions = "*"
-
 [[package]]
 name = "pathspec"
 version = "0.10.1"
@@ -893,6 +946,14 @@ category = "main"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "PyYAML"
+version = "6.0"
+description = "YAML parser and emitter for Python"
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
 [[package]]
 name = "qrcode"
 version = "7.3.1"
@@ -928,6 +989,14 @@ packaging = ">=20.4"
 hiredis = ["hiredis (>=1.0.0)"]
 ocsp = ["cryptography (>=36.0.1)", "pyopenssl (==20.0.1)", "requests (>=2.26.0)"]
 
+[[package]]
+name = "regex"
+version = "2022.9.13"
+description = "Alternative regular expression module, to replace re."
+category = "dev"
+optional = false
+python-versions = ">=3.6"
+
 [[package]]
 name = "requests"
 version = "2.28.1"
@@ -1084,14 +1153,6 @@ python-versions = ">=3.5"
 [package.extras]
 docs = ["mkdocs (>=1.1,<1.2)", "mkdocs-material (>=6.2,<6.3)"]
 
-[[package]]
-name = "toml"
-version = "0.10.2"
-description = "Python Library for Tom's Obvious, Minimal Language"
-category = "dev"
-optional = false
-python-versions = ">=2.6, !=3.0.*, !=3.1.*, !=3.2.*"
-
 [[package]]
 name = "tomli"
 version = "2.0.1"
@@ -1100,6 +1161,23 @@ category = "dev"
 optional = false
 python-versions = ">=3.7"
 
+[[package]]
+name = "tqdm"
+version = "4.64.1"
+description = "Fast, Extensible Progress Meter"
+category = "dev"
+optional = false
+python-versions = "!=3.0.*,!=3.1.*,!=3.2.*,!=3.3.*,>=2.7"
+
+[package.dependencies]
+colorama = {version = "*", markers = "platform_system == \"Windows\""}
+
+[package.extras]
+dev = ["py-make (>=0.1.0)", "twine", "wheel"]
+notebook = ["ipywidgets (>=6)"]
+slack = ["slack-sdk"]
+telegram = ["requests"]
+
 [[package]]
 name = "types-requests"
 version = "2.28.5"
@@ -1368,10 +1446,22 @@ category = "main"
 optional = false
 python-versions = "*"
 
+[[package]]
+name = "zipp"
+version = "3.8.1"
+description = "Backport of pathlib-compatible object wrapper for zip files"
+category = "dev"
+optional = false
+python-versions = ">=3.7"
+
+[package.extras]
+docs = ["jaraco.packaging (>=9)", "jaraco.tidelift (>=1.4)", "rst.linker (>=1.9)", "sphinx"]
+testing = ["func-timeout", "jaraco.itertools", "pytest (>=6)", "pytest-black (>=0.3.7)", "pytest-checkdocs (>=2.4)", "pytest-cov", "pytest-enabler (>=1.3)", "pytest-flake8", "pytest-mypy (>=0.9.1)"]
+
 [metadata]
 lock-version = "1.1"
 python-versions = "^3.10"
-content-hash = "d963569b79f63bea87352d7f80b07a8ffaf5286aa30b10d4cfa5e44aaee61b90"
+content-hash = "dde3e70abe67ae09433d9e53cfa2ece401194b2583e21bd06990261eeb210639"
 
 [metadata.files]
 anyascii = [
@@ -1560,9 +1650,8 @@ coverage = [
     {file = "coverage-6.4.4-pp36.pp37.pp38-none-any.whl", hash = "sha256:f67cf9f406cf0d2f08a3515ce2db5b82625a7257f88aad87904674def6ddaec1"},
     {file = "coverage-6.4.4.tar.gz", hash = "sha256:e16c45b726acb780e1e6f88b286d3c10b3914ab03438f32117c4aa52d7f30d58"},
 ]
-curlylint = [
-    {file = "curlylint-0.13.1-py3-none-any.whl", hash = "sha256:9546ea82cdfc9292fd6fe49dca28587164bd315782a209c0a46e013d7f38d2fa"},
-    {file = "curlylint-0.13.1.tar.gz", hash = "sha256:008b9d160f3920404ac12efb05c0a39e209cb972f9aafd956b79c5f4e2162752"},
+cssbeautifier = [
+    {file = "cssbeautifier-1.14.6.tar.gz", hash = "sha256:ad77a23e842e78320655825fe48ebf9df373eb9b996858d74d96514d5dfdcd13"},
 ]
 Deprecated = [
     {file = "Deprecated-1.2.13-py2.py3-none-any.whl", hash = "sha256:64756e3e14c8c5eea9795d93c524551432a0be75629f8f29e67ab8caf076c76d"},
@@ -1636,8 +1725,9 @@ djangorestframework = [
     {file = "djangorestframework-3.13.1-py3-none-any.whl", hash = "sha256:24c4bf58ed7e85d1fe4ba250ab2da926d263cd57d64b03e8dcef0ac683f8b1aa"},
     {file = "djangorestframework-3.13.1.tar.gz", hash = "sha256:0c33407ce23acc68eca2a6e46424b008c9c02eceb8cf18581921d0092bc1f2ee"},
 ]
-djhtml = [
-    {file = "djhtml-1.5.1.tar.gz", hash = "sha256:d3b9060e9c45e2a56125203f2508ae591aba41a2f14ed2fa8bafb99b0fc15eb3"},
+djlint = [
+    {file = "djlint-1.18.0-py3-none-any.whl", hash = "sha256:ec414f46b5575985cb782d20b2c805247dc9d8b8b876d2745e570591587a94e8"},
+    {file = "djlint-1.18.0.tar.gz", hash = "sha256:f6b07793d8687e31c6a1d3c34d88cc3a352d66a0f0444286618cf5edfdb2207d"},
 ]
 draftjs-exporter = [
     {file = "draftjs_exporter-2.1.7-py3-none-any.whl", hash = "sha256:d415a9964690a2cddb66a31ef32dd46c277e9b80434b94e39e3043188ed83e33"},
@@ -1647,6 +1737,10 @@ drf-yasg = [
     {file = "drf-yasg-1.21.3.tar.gz", hash = "sha256:b2eebb438fa641503a08dac791be24183ea26dbcfe371a9824ea91f6e3a988aa"},
     {file = "drf_yasg-1.21.3-py3-none-any.whl", hash = "sha256:85899b8b173cac7d39af3fea205bdc1a599aed8de3389a3bcccc29b37b9b983e"},
 ]
+EditorConfig = [
+    {file = "EditorConfig-0.12.3-py3-none-any.whl", hash = "sha256:6b0851425aa875b08b16789ee0eeadbd4ab59666e9ebe728e526314c4a2e52c1"},
+    {file = "EditorConfig-0.12.3.tar.gz", hash = "sha256:57f8ce78afcba15c8b18d46b5170848c88d56fd38f05c2ec60dbbfcb8996e89e"},
+]
 et-xmlfile = [
     {file = "et_xmlfile-1.1.0-py3-none-any.whl", hash = "sha256:a2ba85d1d6a74ef63837eed693bcb89c3f752169b0e3e7ae5b16ca5e1b3deada"},
     {file = "et_xmlfile-1.1.0.tar.gz", hash = "sha256:8eb9e2bc2f8c97e37a2dc85a09ecdcdec9d8a396530a6d5a33b30b9a92da0c5c"},
@@ -1695,6 +1789,14 @@ honcho = [
     {file = "honcho-1.1.0-py2.py3-none-any.whl", hash = "sha256:a4d6e3a88a7b51b66351ecfc6e9d79d8f4b87351db9ad7e923f5632cc498122f"},
     {file = "honcho-1.1.0.tar.gz", hash = "sha256:c5eca0bded4bef6697a23aec0422fd4f6508ea3581979a3485fc4b89357eb2a9"},
 ]
+html-tag-names = [
+    {file = "html-tag-names-0.1.2.tar.gz", hash = "sha256:04924aca48770f36b5a41c27e4d917062507be05118acb0ba869c97389084297"},
+    {file = "html_tag_names-0.1.2-py3-none-any.whl", hash = "sha256:eeb69ef21078486b615241f0393a72b41352c5219ee648e7c61f5632d26f0420"},
+]
+html-void-elements = [
+    {file = "html-void-elements-0.1.0.tar.gz", hash = "sha256:931b88f84cd606fee0b582c28fcd00e41d7149421fb673e1e1abd2f0c4f231f0"},
+    {file = "html_void_elements-0.1.0-py3-none-any.whl", hash = "sha256:784cf39db03cdeb017320d9301009f8f3480f9d7b254d0974272e80e0cb5e0d2"},
+]
 html5lib = [
     {file = "html5lib-1.1-py2.py3-none-any.whl", hash = "sha256:0d78f8fde1c230e99fe37986a60526d7049ed4bf8a9fadbad5f00e22e58e041d"},
     {file = "html5lib-1.1.tar.gz", hash = "sha256:b2e5b40261e20f354d198eae92afc10d750afb487ed5e50f9c4eaf07c184146f"},
@@ -1707,6 +1809,10 @@ idna = [
     {file = "idna-3.3-py3-none-any.whl", hash = "sha256:84d9dd047ffa80596e0f246e2eab0b391788b0503584e8945f2368256d2735ff"},
     {file = "idna-3.3.tar.gz", hash = "sha256:9d643ff0a55b762d5cdb124b8eaa99c66322e2157b69160bc32796e824360e6d"},
 ]
+importlib-metadata = [
+    {file = "importlib_metadata-4.13.0-py3-none-any.whl", hash = "sha256:8a8a81bcf996e74fee46f0d16bd3eaa382a7eb20fd82445c3ad11f4090334116"},
+    {file = "importlib_metadata-4.13.0.tar.gz", hash = "sha256:dd0173e8f150d6815e098fd354f6414b0f079af4644ddfe90c71e2fc6174346d"},
+]
 inflection = [
     {file = "inflection-0.5.1-py2.py3-none-any.whl", hash = "sha256:f38b2b640938a4f35ade69ac3d053042959b62a0f1076a5bbaa1b9526605a8a2"},
     {file = "inflection-0.5.1.tar.gz", hash = "sha256:1a29730d366e996aaacffb2f1f1cb9593dc38e2ddd30c91250c6dde09ea9b417"},
@@ -1723,6 +1829,9 @@ Jinja2 = [
     {file = "Jinja2-3.1.2-py3-none-any.whl", hash = "sha256:6088930bfe239f0e6710546ab9c19c9ef35e29792895fed6e6e31a023a182a61"},
     {file = "Jinja2-3.1.2.tar.gz", hash = "sha256:31351a702a408a9e7595a8fc6150fc3f43bb6bf7e319770cbc0db9df9437e852"},
 ]
+jsbeautifier = [
+    {file = "jsbeautifier-1.14.6.tar.gz", hash = "sha256:0d5244851144dc473b1d1044be3dd6c56f61fd69ebdc1f93b813d8224272f06f"},
+]
 l18n = [
     {file = "l18n-2021.3-py3-none-any.whl", hash = "sha256:78495d1df95b6f7dcc694d1ba8994df709c463a1cbac1bf016e1b9a5ce7280b9"},
     {file = "l18n-2021.3.tar.gz", hash = "sha256:1956e890d673d17135cc20913253c154f6bc1c00266c22b7d503cc1a5a42d848"},
@@ -1886,10 +1995,6 @@ packaging = [
     {file = "packaging-21.3-py3-none-any.whl", hash = "sha256:ef103e05f519cdc783ae24ea4e2e0f508a9c99b2d4969652eed6a2e1ea5bd522"},
     {file = "packaging-21.3.tar.gz", hash = "sha256:dd47c42927d89ab911e606518907cc2d3a1f38bbd026385970643f9c5b8ecfeb"},
 ]
-parsy = [
-    {file = "parsy-1.1.0-py3-none-any.whl", hash = "sha256:25bd5cea2954950ebbfdf71f8bdaf7fd45a5df5325fd36a1064be2204d9d4c94"},
-    {file = "parsy-1.1.0.tar.gz", hash = "sha256:36173ba01a5372c7a1b32352cc73a279a49198f52252adf1c8c1ed41d1f94e8d"},
-]
 pathspec = [
     {file = "pathspec-0.10.1-py3-none-any.whl", hash = "sha256:46846318467efc4556ccfd27816e004270a9eeeeb4d062ce5e6fc7a87c573f93"},
     {file = "pathspec-0.10.1.tar.gz", hash = "sha256:7ace6161b621d31e7902eb6b5ae148d12cfd23f4a249b9ffb6b9fee12084323d"},
@@ -1995,6 +2100,48 @@ pytz = [
     {file = "pytz-2022.2.1-py2.py3-none-any.whl", hash = "sha256:220f481bdafa09c3955dfbdddb7b57780e9a94f5127e35456a48589b9e0c0197"},
     {file = "pytz-2022.2.1.tar.gz", hash = "sha256:cea221417204f2d1a2aa03ddae3e867921971d0d76f14d87abb4414415bbdcf5"},
 ]
+PyYAML = [
+    {file = "PyYAML-6.0-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:d4db7c7aef085872ef65a8fd7d6d09a14ae91f691dec3e87ee5ee0539d516f53"},
+    {file = "PyYAML-6.0-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:9df7ed3b3d2e0ecfe09e14741b857df43adb5a3ddadc919a2d94fbdf78fea53c"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:77f396e6ef4c73fdc33a9157446466f1cff553d979bd00ecb64385760c6babdc"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a80a78046a72361de73f8f395f1f1e49f956c6be882eed58505a15f3e430962b"},
+    {file = "PyYAML-6.0-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:f84fbc98b019fef2ee9a1cb3ce93e3187a6df0b2538a651bfb890254ba9f90b5"},
+    {file = "PyYAML-6.0-cp310-cp310-win32.whl", hash = "sha256:2cd5df3de48857ed0544b34e2d40e9fac445930039f3cfe4bcc592a1f836d513"},
+    {file = "PyYAML-6.0-cp310-cp310-win_amd64.whl", hash = "sha256:daf496c58a8c52083df09b80c860005194014c3698698d1a57cbcfa182142a3a"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:d4b0ba9512519522b118090257be113b9468d804b19d63c71dbcf4a48fa32358"},
+    {file = "PyYAML-6.0-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:81957921f441d50af23654aa6c5e5eaf9b06aba7f0a19c18a538dc7ef291c5a1"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:afa17f5bc4d1b10afd4466fd3a44dc0e245382deca5b3c353d8b757f9e3ecb8d"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dbad0e9d368bb989f4515da330b88a057617d16b6a8245084f1b05400f24609f"},
+    {file = "PyYAML-6.0-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:432557aa2c09802be39460360ddffd48156e30721f5e8d917f01d31694216782"},
+    {file = "PyYAML-6.0-cp311-cp311-win32.whl", hash = "sha256:bfaef573a63ba8923503d27530362590ff4f576c626d86a9fed95822a8255fd7"},
+    {file = "PyYAML-6.0-cp311-cp311-win_amd64.whl", hash = "sha256:01b45c0191e6d66c470b6cf1b9531a771a83c1c4208272ead47a3ae4f2f603bf"},
+    {file = "PyYAML-6.0-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:897b80890765f037df3403d22bab41627ca8811ae55e9a722fd0392850ec4d86"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:50602afada6d6cbfad699b0c7bb50d5ccffa7e46a3d738092afddc1f9758427f"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:48c346915c114f5fdb3ead70312bd042a953a8ce5c7106d5bfb1a5254e47da92"},
+    {file = "PyYAML-6.0-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:98c4d36e99714e55cfbaaee6dd5badbc9a1ec339ebfc3b1f52e293aee6bb71a4"},
+    {file = "PyYAML-6.0-cp36-cp36m-win32.whl", hash = "sha256:0283c35a6a9fbf047493e3a0ce8d79ef5030852c51e9d911a27badfde0605293"},
+    {file = "PyYAML-6.0-cp36-cp36m-win_amd64.whl", hash = "sha256:07751360502caac1c067a8132d150cf3d61339af5691fe9e87803040dbc5db57"},
+    {file = "PyYAML-6.0-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:819b3830a1543db06c4d4b865e70ded25be52a2e0631ccd2f6a47a2822f2fd7c"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:473f9edb243cb1935ab5a084eb238d842fb8f404ed2193a915d1784b5a6b5fc0"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:0ce82d761c532fe4ec3f87fc45688bdd3a4c1dc5e0b4a19814b9009a29baefd4"},
+    {file = "PyYAML-6.0-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:231710d57adfd809ef5d34183b8ed1eeae3f76459c18fb4a0b373ad56bedcdd9"},
+    {file = "PyYAML-6.0-cp37-cp37m-win32.whl", hash = "sha256:c5687b8d43cf58545ade1fe3e055f70eac7a5a1a0bf42824308d868289a95737"},
+    {file = "PyYAML-6.0-cp37-cp37m-win_amd64.whl", hash = "sha256:d15a181d1ecd0d4270dc32edb46f7cb7733c7c508857278d3d378d14d606db2d"},
+    {file = "PyYAML-6.0-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:0b4624f379dab24d3725ffde76559cff63d9ec94e1736b556dacdfebe5ab6d4b"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:213c60cd50106436cc818accf5baa1aba61c0189ff610f64f4a3e8c6726218ba"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:9fa600030013c4de8165339db93d182b9431076eb98eb40ee068700c9c813e34"},
+    {file = "PyYAML-6.0-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:277a0ef2981ca40581a47093e9e2d13b3f1fbbeffae064c1d21bfceba2030287"},
+    {file = "PyYAML-6.0-cp38-cp38-win32.whl", hash = "sha256:d4eccecf9adf6fbcc6861a38015c2a64f38b9d94838ac1810a9023a0609e1b78"},
+    {file = "PyYAML-6.0-cp38-cp38-win_amd64.whl", hash = "sha256:1e4747bc279b4f613a09eb64bba2ba602d8a6664c6ce6396a4d0cd413a50ce07"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:055d937d65826939cb044fc8c9b08889e8c743fdc6a32b33e2390f66013e449b"},
+    {file = "PyYAML-6.0-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:e61ceaab6f49fb8bdfaa0f92c4b57bcfbea54c09277b1b4f7ac376bfb7a7c174"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:d67d839ede4ed1b28a4e8909735fc992a923cdb84e618544973d7dfc71540803"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:cba8c411ef271aa037d7357a2bc8f9ee8b58b9965831d9e51baf703280dc73d3"},
+    {file = "PyYAML-6.0-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:40527857252b61eacd1d9af500c3337ba8deb8fc298940291486c465c8b46ec0"},
+    {file = "PyYAML-6.0-cp39-cp39-win32.whl", hash = "sha256:b5b9eccad747aabaaffbc6064800670f0c297e52c12754eb1d976c57e4f74dcb"},
+    {file = "PyYAML-6.0-cp39-cp39-win_amd64.whl", hash = "sha256:b3d267842bf12586ba6c734f89d1f5b871df0273157918b0ccefa29deb05c21c"},
+    {file = "PyYAML-6.0.tar.gz", hash = "sha256:68fb519c14306fec9720a2a5b45bc9f0c8d1b9c72adf45c37baedfcd949c35a2"},
+]
 qrcode = [
     {file = "qrcode-7.3.1.tar.gz", hash = "sha256:375a6ff240ca9bd41adc070428b5dfc1dcfbb0f2507f1ac848f6cded38956578"},
 ]
@@ -2002,6 +2149,96 @@ redis = [
     {file = "redis-4.3.4-py3-none-any.whl", hash = "sha256:a52d5694c9eb4292770084fa8c863f79367ca19884b329ab574d5cb2036b3e54"},
     {file = "redis-4.3.4.tar.gz", hash = "sha256:ddf27071df4adf3821c4f2ca59d67525c3a82e5f268bed97b813cb4fabf87880"},
 ]
+regex = [
+    {file = "regex-2022.9.13-cp310-cp310-macosx_10_9_x86_64.whl", hash = "sha256:0394265391a86e2bbaa7606e59ac71bd9f1edf8665a59e42771a9c9adbf6fd4f"},
+    {file = "regex-2022.9.13-cp310-cp310-macosx_11_0_arm64.whl", hash = "sha256:86df2049b18745f3cd4b0f4c4ef672bfac4b80ca488e6ecfd2bbfe68d2423a2c"},
+    {file = "regex-2022.9.13-cp310-cp310-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ce331b076b2b013e7d7f07157f957974ef0b0881a808e8a4a4b3b5105aee5d04"},
+    {file = "regex-2022.9.13-cp310-cp310-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:360ffbc9357794ae41336b681dff1c0463193199dfb91fcad3ec385ea4972f46"},
+    {file = "regex-2022.9.13-cp310-cp310-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:18e503b1e515a10282b3f14f1b3d856194ecece4250e850fad230842ed31227f"},
+    {file = "regex-2022.9.13-cp310-cp310-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:f6e167d1ccd41d27b7b6655bb7a2dcb1b1eb1e0d2d662043470bd3b4315d8b2b"},
+    {file = "regex-2022.9.13-cp310-cp310-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:4146cb7ae6029fc83b5c905ec6d806b7e5568dc14297c423e66b86294bad6c39"},
+    {file = "regex-2022.9.13-cp310-cp310-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:a1aec4ae549fd7b3f52ceaf67e133010e2fba1538bf4d5fc5cd162a5e058d5df"},
+    {file = "regex-2022.9.13-cp310-cp310-musllinux_1_1_aarch64.whl", hash = "sha256:cab548d6d972e1de584161487b2ac1aa82edd8430d1bde69587ba61698ad1cfb"},
+    {file = "regex-2022.9.13-cp310-cp310-musllinux_1_1_i686.whl", hash = "sha256:3d64e1a7e6d98a4cdc8b29cb8d8ed38f73f49e55fbaa737bdb5933db99b9de22"},
+    {file = "regex-2022.9.13-cp310-cp310-musllinux_1_1_ppc64le.whl", hash = "sha256:67a4c625361db04ae40ef7c49d3cbe2c1f5ff10b5a4491327ab20f19f2fb5d40"},
+    {file = "regex-2022.9.13-cp310-cp310-musllinux_1_1_s390x.whl", hash = "sha256:5d0dd8b06896423211ce18fba0c75dacc49182a1d6514c004b535be7163dca0f"},
+    {file = "regex-2022.9.13-cp310-cp310-musllinux_1_1_x86_64.whl", hash = "sha256:4318f69b79f9f7d84a7420e97d4bfe872dc767c72f891d4fea5fa721c74685f7"},
+    {file = "regex-2022.9.13-cp310-cp310-win32.whl", hash = "sha256:26df88c9636a0c3f3bd9189dd435850a0c49d0b7d6e932500db3f99a6dd604d1"},
+    {file = "regex-2022.9.13-cp310-cp310-win_amd64.whl", hash = "sha256:6fe1dd1021e0f8f3f454ce2811f1b0b148f2d25bb38c712fec00316551e93650"},
+    {file = "regex-2022.9.13-cp311-cp311-macosx_10_9_x86_64.whl", hash = "sha256:83cc32a1a2fa5bac00f4abc0e6ce142e3c05d3a6d57e23bd0f187c59b4e1e43b"},
+    {file = "regex-2022.9.13-cp311-cp311-macosx_11_0_arm64.whl", hash = "sha256:a2effeaf50a6838f3dd4d3c5d265f06eabc748f476e8441892645ae3a697e273"},
+    {file = "regex-2022.9.13-cp311-cp311-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:59a786a55d00439d8fae4caaf71581f2aaef7297d04ee60345c3594efef5648a"},
+    {file = "regex-2022.9.13-cp311-cp311-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:b7b701dbc124558fd2b1b08005eeca6c9160e209108fbcbd00091fcfac641ac7"},
+    {file = "regex-2022.9.13-cp311-cp311-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:dab81cc4d58026861445230cfba27f9825e9223557926e7ec22156a1a140d55c"},
+    {file = "regex-2022.9.13-cp311-cp311-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:7b0c5cc3d1744a67c3b433dce91e5ef7c527d612354c1f1e8576d9e86bc5c5e2"},
+    {file = "regex-2022.9.13-cp311-cp311-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:518272f25da93e02af4f1e94985f5042cec21557ef3591027d0716f2adda5d0a"},
+    {file = "regex-2022.9.13-cp311-cp311-musllinux_1_1_aarch64.whl", hash = "sha256:8418ee2cb857b83881b8f981e4c636bc50a0587b12d98cb9b947408a3c484fe7"},
+    {file = "regex-2022.9.13-cp311-cp311-musllinux_1_1_i686.whl", hash = "sha256:cfa4c956ff0a977c4823cb3b930b0a4e82543b060733628fec7ab3eb9b1abe37"},
+    {file = "regex-2022.9.13-cp311-cp311-musllinux_1_1_ppc64le.whl", hash = "sha256:a1c4d17879dd4c4432c08a1ca1ab379f12ab54af569e945b6fc1c4cf6a74ca45"},
+    {file = "regex-2022.9.13-cp311-cp311-musllinux_1_1_s390x.whl", hash = "sha256:77c2879d3ba51e5ca6c2b47f2dcf3d04a976a623a8fc8236010a16c9e0b0a3c7"},
+    {file = "regex-2022.9.13-cp311-cp311-musllinux_1_1_x86_64.whl", hash = "sha256:d2885ec6eea629c648ecc9bde0837ec6b92208b7f36381689937fe5d64a517e8"},
+    {file = "regex-2022.9.13-cp311-cp311-win32.whl", hash = "sha256:2dda4b096a6f630d6531728a45bd12c67ec3badf44342046dc77d4897277d4f2"},
+    {file = "regex-2022.9.13-cp311-cp311-win_amd64.whl", hash = "sha256:592b9e2e1862168e71d9e612bfdc22c451261967dbd46681f14e76dfba7105fd"},
+    {file = "regex-2022.9.13-cp36-cp36m-macosx_10_9_x86_64.whl", hash = "sha256:df8fe00b60e4717662c7f80c810ba66dcc77309183c76b7754c0dff6f1d42054"},
+    {file = "regex-2022.9.13-cp36-cp36m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:995e70bb8c91d1b99ed2aaf8ec44863e06ad1dfbb45d7df95f76ef583ec323a9"},
+    {file = "regex-2022.9.13-cp36-cp36m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:ad75173349ad79f9d21e0d0896b27dcb37bfd233b09047bc0b4d226699cf5c87"},
+    {file = "regex-2022.9.13-cp36-cp36m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:7681c49da1a2d4b905b4f53d86c9ba4506e79fba50c4a664d9516056e0f7dfcc"},
+    {file = "regex-2022.9.13-cp36-cp36m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:9bc8edc5f8ef0ebb46f3fa0d02bd825bbe9cc63d59e428ffb6981ff9672f6de1"},
+    {file = "regex-2022.9.13-cp36-cp36m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:b7bee775ff05c9d519195bd9e8aaaccfe3971db60f89f89751ee0f234e8aeac5"},
+    {file = "regex-2022.9.13-cp36-cp36m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:1a901ce5cd42658ab8f8eade51b71a6d26ad4b68c7cfc86b87efc577dfa95602"},
+    {file = "regex-2022.9.13-cp36-cp36m-musllinux_1_1_aarch64.whl", hash = "sha256:14a7ab070fa3aec288076eed6ed828587b805ef83d37c9bfccc1a4a7cfbd8111"},
+    {file = "regex-2022.9.13-cp36-cp36m-musllinux_1_1_i686.whl", hash = "sha256:d23ac6b4bf9e32fcde5fcdb2e1fd5e7370d6693fcac51ee1d340f0e886f50d1f"},
+    {file = "regex-2022.9.13-cp36-cp36m-musllinux_1_1_ppc64le.whl", hash = "sha256:4cdbfa6d2befeaee0c899f19222e9b20fc5abbafe5e9c43a46ef819aeb7b75e5"},
+    {file = "regex-2022.9.13-cp36-cp36m-musllinux_1_1_s390x.whl", hash = "sha256:ab07934725e6f25c6f87465976cc69aef1141e86987af49d8c839c3ffd367c72"},
+    {file = "regex-2022.9.13-cp36-cp36m-musllinux_1_1_x86_64.whl", hash = "sha256:d2a1371dc73e921f3c2e087c05359050f3525a9a34b476ebc8130e71bec55e97"},
+    {file = "regex-2022.9.13-cp36-cp36m-win32.whl", hash = "sha256:fcbd1edff1473d90dc5cf4b52d355cf1f47b74eb7c85ba6e45f45d0116b8edbd"},
+    {file = "regex-2022.9.13-cp36-cp36m-win_amd64.whl", hash = "sha256:fe428822b7a8c486bcd90b334e9ab541ce6cc0d6106993d59f201853e5e14121"},
+    {file = "regex-2022.9.13-cp37-cp37m-macosx_10_9_x86_64.whl", hash = "sha256:d7430f041755801b712ec804aaf3b094b9b5facbaa93a6339812a8e00d7bd53a"},
+    {file = "regex-2022.9.13-cp37-cp37m-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:079c182f99c89524069b9cd96f5410d6af437e9dca576a7d59599a574972707e"},
+    {file = "regex-2022.9.13-cp37-cp37m-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:59bac44b5a07b08a261537f652c26993af9b1bbe2a29624473968dd42fc29d56"},
+    {file = "regex-2022.9.13-cp37-cp37m-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:a59d0377e58d96a6f11636e97992f5b51b7e1e89eb66332d1c01b35adbabfe8a"},
+    {file = "regex-2022.9.13-cp37-cp37m-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:b9d68eb704b24bc4d441b24e4a12653acd07d2c39940548761e0985a08bc1fff"},
+    {file = "regex-2022.9.13-cp37-cp37m-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:0385d66e73cdd4462f3cc42c76a6576ddcc12472c30e02a2ae82061bff132c32"},
+    {file = "regex-2022.9.13-cp37-cp37m-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:db45016364eec9ddbb5af93c8740c5c92eb7f5fc8848d1ae04205a40a1a2efc6"},
+    {file = "regex-2022.9.13-cp37-cp37m-musllinux_1_1_aarch64.whl", hash = "sha256:03ff695518482b946a6d3d4ce9cbbd99a21320e20d94913080aa3841f880abcd"},
+    {file = "regex-2022.9.13-cp37-cp37m-musllinux_1_1_i686.whl", hash = "sha256:6b32b45433df1fad7fed738fe15200b6516da888e0bd1fdd6aa5e50cc16b76bc"},
+    {file = "regex-2022.9.13-cp37-cp37m-musllinux_1_1_ppc64le.whl", hash = "sha256:003a2e1449d425afc817b5f0b3d4c4aa9072dd5f3dfbf6c7631b8dc7b13233de"},
+    {file = "regex-2022.9.13-cp37-cp37m-musllinux_1_1_s390x.whl", hash = "sha256:a9eb9558e1d0f78e07082d8a70d5c4d631c8dd75575fae92105df9e19c736730"},
+    {file = "regex-2022.9.13-cp37-cp37m-musllinux_1_1_x86_64.whl", hash = "sha256:f6e0321921d2fdc082ef90c1fd0870f129c2e691bfdc4937dcb5cd308aba95c4"},
+    {file = "regex-2022.9.13-cp37-cp37m-win32.whl", hash = "sha256:3f3b4594d564ed0b2f54463a9f328cf6a5b2a32610a90cdff778d6e3e561d08b"},
+    {file = "regex-2022.9.13-cp37-cp37m-win_amd64.whl", hash = "sha256:8aba0d01e3dfd335f2cb107079b07fdddb4cd7fb2d8c8a1986f9cb8ce9246c24"},
+    {file = "regex-2022.9.13-cp38-cp38-macosx_10_9_x86_64.whl", hash = "sha256:944567bb08f52268d8600ee5bdf1798b2b62ea002cc692a39cec113244cbdd0d"},
+    {file = "regex-2022.9.13-cp38-cp38-macosx_11_0_arm64.whl", hash = "sha256:0b664a4d33ffc6be10996606dfc25fd3248c24cc589c0b139feb4c158053565e"},
+    {file = "regex-2022.9.13-cp38-cp38-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:f06cc1190f3db3192ab8949e28f2c627e1809487e2cfc435b6524c1ce6a2f391"},
+    {file = "regex-2022.9.13-cp38-cp38-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6c57d50d4d5eb0c862569ca3c840eba2a73412f31d9ecc46ef0d6b2e621a592b"},
+    {file = "regex-2022.9.13-cp38-cp38-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:19a4da6f513045f5ba00e491215bd00122e5bd131847586522463e5a6b2bd65f"},
+    {file = "regex-2022.9.13-cp38-cp38-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a926339356fe29595f8e37af71db37cd87ff764e15da8ad5129bbaff35bcc5a6"},
+    {file = "regex-2022.9.13-cp38-cp38-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:091efcfdd4178a7e19a23776dc2b1fafb4f57f4d94daf340f98335817056f874"},
+    {file = "regex-2022.9.13-cp38-cp38-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:880dbeb6bdde7d926b4d8e41410b16ffcd4cb3b4c6d926280fea46e2615c7a01"},
+    {file = "regex-2022.9.13-cp38-cp38-musllinux_1_1_aarch64.whl", hash = "sha256:73b985c9fc09a7896846e26d7b6f4d1fd5a20437055f4ef985d44729f9f928d0"},
+    {file = "regex-2022.9.13-cp38-cp38-musllinux_1_1_i686.whl", hash = "sha256:c0b7cb9598795b01f9a3dd3f770ab540889259def28a3bf9b2fa24d52edecba3"},
+    {file = "regex-2022.9.13-cp38-cp38-musllinux_1_1_ppc64le.whl", hash = "sha256:37e5a26e76c46f54b3baf56a6fdd56df9db89758694516413757b7d127d4c57b"},
+    {file = "regex-2022.9.13-cp38-cp38-musllinux_1_1_s390x.whl", hash = "sha256:99945ddb4f379bb9831c05e9f80f02f079ba361a0fb1fba1fc3b267639b6bb2e"},
+    {file = "regex-2022.9.13-cp38-cp38-musllinux_1_1_x86_64.whl", hash = "sha256:8dcbcc9e72a791f622a32d17ff5011326a18996647509cac0609a7fc43adc229"},
+    {file = "regex-2022.9.13-cp38-cp38-win32.whl", hash = "sha256:d3102ab9bf16bf541ca228012d45d88d2a567c9682a805ae2c145a79d3141fdd"},
+    {file = "regex-2022.9.13-cp38-cp38-win_amd64.whl", hash = "sha256:14216ea15efc13f28d0ef1c463d86d93ca7158a79cd4aec0f9273f6d4c6bb047"},
+    {file = "regex-2022.9.13-cp39-cp39-macosx_10_9_x86_64.whl", hash = "sha256:9a165a05979e212b2c2d56a9f40b69c811c98a788964e669eb322de0a3e420b4"},
+    {file = "regex-2022.9.13-cp39-cp39-macosx_11_0_arm64.whl", hash = "sha256:14c71437ffb89479c89cc7022a5ea2075a842b728f37205e47c824cc17b30a42"},
+    {file = "regex-2022.9.13-cp39-cp39-manylinux_2_17_aarch64.manylinux2014_aarch64.whl", hash = "sha256:ee7045623a5ace70f3765e452528b4c1f2ce669ed31959c63f54de64fe2f6ff7"},
+    {file = "regex-2022.9.13-cp39-cp39-manylinux_2_17_ppc64le.manylinux2014_ppc64le.whl", hash = "sha256:6e521d9db006c5e4a0f8acfef738399f72b704913d4e083516774eb51645ad7c"},
+    {file = "regex-2022.9.13-cp39-cp39-manylinux_2_17_s390x.manylinux2014_s390x.whl", hash = "sha256:b86548b8234b2be3985dbc0b385e35f5038f0f3e6251464b827b83ebf4ed90e5"},
+    {file = "regex-2022.9.13-cp39-cp39-manylinux_2_17_x86_64.manylinux2014_x86_64.whl", hash = "sha256:a2b39ee3b280e15824298b97cec3f7cbbe6539d8282cc8a6047a455b9a72c598"},
+    {file = "regex-2022.9.13-cp39-cp39-manylinux_2_5_i686.manylinux1_i686.manylinux_2_17_i686.manylinux2014_i686.whl", hash = "sha256:e6e6e61e9a38b6cc60ca3e19caabc90261f070f23352e66307b3d21a24a34aaf"},
+    {file = "regex-2022.9.13-cp39-cp39-manylinux_2_5_x86_64.manylinux1_x86_64.manylinux_2_12_x86_64.manylinux2010_x86_64.whl", hash = "sha256:d837ccf3bd2474feabee96cd71144e991472e400ed26582edc8ca88ce259899c"},
+    {file = "regex-2022.9.13-cp39-cp39-musllinux_1_1_aarch64.whl", hash = "sha256:6adfe300848d61a470ec7547adc97b0ccf86de86a99e6830f1d8c8d19ecaf6b3"},
+    {file = "regex-2022.9.13-cp39-cp39-musllinux_1_1_i686.whl", hash = "sha256:d5b003d248e6f292475cd24b04e5f72c48412231961a675edcb653c70730e79e"},
+    {file = "regex-2022.9.13-cp39-cp39-musllinux_1_1_ppc64le.whl", hash = "sha256:d5edd3eb877c9fc2e385173d4a4e1d792bf692d79e25c1ca391802d36ecfaa01"},
+    {file = "regex-2022.9.13-cp39-cp39-musllinux_1_1_s390x.whl", hash = "sha256:50e764ffbd08b06aa8c4e86b8b568b6722c75d301b33b259099f237c46b2134e"},
+    {file = "regex-2022.9.13-cp39-cp39-musllinux_1_1_x86_64.whl", hash = "sha256:6d43bd402b27e0e7eae85c612725ba1ce7798f20f6fab4e8bc3de4f263294f03"},
+    {file = "regex-2022.9.13-cp39-cp39-win32.whl", hash = "sha256:7fcf7f94ccad19186820ac67e2ec7e09e0ac2dac39689f11cf71eac580503296"},
+    {file = "regex-2022.9.13-cp39-cp39-win_amd64.whl", hash = "sha256:322bd5572bed36a5b39952d88e072738926759422498a96df138d93384934ff8"},
+    {file = "regex-2022.9.13.tar.gz", hash = "sha256:f07373b6e56a6f3a0df3d75b651a278ca7bd357a796078a26a958ea1ce0588fd"},
+]
 requests = [
     {file = "requests-2.28.1-py3-none-any.whl", hash = "sha256:8fefa2a1a1365bf5520aac41836fbee479da67864514bdb821f31ce07ce65349"},
     {file = "requests-2.28.1.tar.gz", hash = "sha256:7c5599b102feddaa661c826c56ab4fee28bfd17f5abca1ebbe3e7f19d7c97983"},
@@ -2074,14 +2311,14 @@ telepath = [
     {file = "telepath-0.3-py35-none-any.whl", hash = "sha256:fbdbc6bdd9a4a5c2b230caae242fa6ba4994c9dbcfd780df9be63f2966feb034"},
     {file = "telepath-0.3.tar.gz", hash = "sha256:54f4b57232461bc67c54f63f437cb6d26843c189bae6b7ba8e4457f98d78e515"},
 ]
-toml = [
-    {file = "toml-0.10.2-py2.py3-none-any.whl", hash = "sha256:806143ae5bfb6a3c6e736a764057db0e6a0e05e338b5630894a5f779cabb4f9b"},
-    {file = "toml-0.10.2.tar.gz", hash = "sha256:b3bda1d108d5dd99f4a20d24d9c348e91c4db7ab1b749200bded2f839ccbe68f"},
-]
 tomli = [
     {file = "tomli-2.0.1-py3-none-any.whl", hash = "sha256:939de3e7a6161af0c887ef91b7d41a53e7c5a1ca976325f429cb46ea9bc30ecc"},
     {file = "tomli-2.0.1.tar.gz", hash = "sha256:de526c12914f0c550d15924c62d72abc48d6fe7364aa87328337a31007fe8a4f"},
 ]
+tqdm = [
+    {file = "tqdm-4.64.1-py2.py3-none-any.whl", hash = "sha256:6fee160d6ffcd1b1c68c65f14c829c22832bc401726335ce92c52d395944a6a1"},
+    {file = "tqdm-4.64.1.tar.gz", hash = "sha256:5f4f682a004951c1b450bc753c710e9280c5746ce6ffedee253ddbcbf54cf1e4"},
+]
 types-requests = [
     {file = "types-requests-2.28.5.tar.gz", hash = "sha256:ac618bfefcb3742eaf97c961e13e9e5a226e545eda4a3dbe293b898d40933ad1"},
     {file = "types_requests-2.28.5-py3-none-any.whl", hash = "sha256:98ab647ae88b5e2c41d6d20cfcb5117da1bea561110000b6fdeeea07b3e89877"},
@@ -2228,3 +2465,7 @@ xlwt = [
     {file = "xlwt-1.3.0-py2.py3-none-any.whl", hash = "sha256:a082260524678ba48a297d922cc385f58278b8aa68741596a87de01a9c628b2e"},
     {file = "xlwt-1.3.0.tar.gz", hash = "sha256:c59912717a9b28f1a3c2a98fd60741014b06b043936dcecbc113eaaada156c88"},
 ]
+zipp = [
+    {file = "zipp-3.8.1-py3-none-any.whl", hash = "sha256:47c40d7fe183a6f21403a199b3e4192cca5774656965b0a4988ad2f8feb5f009"},
+    {file = "zipp-3.8.1.tar.gz", hash = "sha256:05b45f1ee8f807d0cc928485ca40a07cb491cf092ff587c0df9cb1fd154848d2"},
+]
diff --git a/pyproject.toml b/pyproject.toml
index 591105f..49e042c 100644
--- a/pyproject.toml
+++ b/pyproject.toml
@@ -45,8 +45,6 @@ django-browser-reload = "1.6.0"
 django-debug-toolbar = "3.5.0"
 types-requests = "2.28.5"
 mypy = "0.971"
-curlylint = "0.13.1"
-djhtml = "1.5.1"
 wagtail-factories = "3.1.0"
 coverage = "6.4.4"
 flake8-bugbear = "22.8.23"
@@ -55,24 +53,22 @@ flake8-comprehensions = "3.10.0"
 flake8-mutable = "1.2.0"
 flake8-print = "5.0.0"
 flake8-tuple = "0.4.1"
+djlint = "1.18.0"
 
 [build-system]
 requires = ["poetry-core"]
 build-backend = "poetry.core.masonry.api"
 
-[tool.curlylint]
-include = '/website/.*\.html'
-exclude = '''
-(
-    navbar\.html
-  | referrallink_snippet_link\.html
-  | onlineaccount_snippet_link\.html
-  | 500\.html
-  | content-details\.html
-  | listing-item\.html
-)
-'''
-
-[tool.curlylint.rules]
+[tool.djlint]
+ignore = "T003,H006,H023,H030,H031"
 indent = 2
-html_has_lang = 'en-GB'
+preserve_blank_lines = true
+profile = "django"
+max_line_length = 12000
+max_attribute_length = 1000
+extension = "html"
+format_attribute_template_tags=true
+custom_blocks="cache"
+
+[tool.djlint.per-file-ignores]
+"_snippet_link.html" = "H025"
diff --git a/website/blog/templates/blog/blog_post_list_page.html b/website/blog/templates/blog/blog_post_list_page.html
index 038f5f0..536b831 100644
--- a/website/blog/templates/blog/blog_post_list_page.html
+++ b/website/blog/templates/blog/blog_post_list_page.html
@@ -5,7 +5,7 @@
     {% for page in listing_pages %}
       {% ifchanged %}
         <h3 id="date-{{ page.date|date:'Y-m' }}" class="date-header">
-          <time datetime="{{ page.date|date:'Y-m' }}" title='{{ page.date|date:"F Y" }}'>
+          <time datetime="{{ page.date|date:'Y-m' }}" title="{{ page.date|date:'F Y' }}">
             {{ page.date|date:"Y-m" }}
           </time>
         </h3>
diff --git a/website/common/templates/404.html b/website/common/templates/404.html
index da9ae2a..092db91 100644
--- a/website/common/templates/404.html
+++ b/website/common/templates/404.html
@@ -16,6 +16,8 @@
   <div class="content-wrapper">
     <h1>There's nothing here!</h1>
     <p>The page you are looking for could not be found.</p>
-    <p><a href="{% pageurl homepage %}">Go home</a></p>
+    <p>
+      <a href="{% pageurl homepage %}">Go home</a>
+    </p>
   </div>
 {% endblock %}
diff --git a/website/common/templates/500.html b/website/common/templates/500.html
index 10cb03c..ac12a93 100644
--- a/website/common/templates/500.html
+++ b/website/common/templates/500.html
@@ -34,6 +34,8 @@
   <body>
     <h1>Internal server error</h1>
     <p>You found a bug in my code - how dare you!</p>
-    <p><a href="javascript:history.back()">Return to safety &rarr;</a></p>
+    <p>
+      <a href="" onclick="history.back()">Return to safety &rarr;</a>
+    </p>
   </body>
 </html>
diff --git a/website/common/templates/base.html b/website/common/templates/base.html
index 764799f..756cb78 100644
--- a/website/common/templates/base.html
+++ b/website/common/templates/base.html
@@ -12,9 +12,7 @@
       {% endblock %}
     </title>
     <meta name="viewport" content="width=device-width, initial-scale=1" />
-    {% if not SEO_INDEX %}
-      <meta name="robots" content="noindex" />
-    {% endif %}
+    {% if not SEO_INDEX %}<meta name="robots" content="noindex" />{% endif %}
 
     {% favicon_meta %}
 
diff --git a/website/common/templates/common/blocks/iframe.html b/website/common/templates/common/blocks/iframe.html
index 437710d..994e606 100644
--- a/website/common/templates/common/blocks/iframe.html
+++ b/website/common/templates/common/blocks/iframe.html
@@ -1,4 +1,4 @@
-{% load wagtailcore_tags  %}
+{% load wagtailcore_tags %}
 
 <figure>
   <div class="image is-16by9">
diff --git a/website/common/templates/common/blocks/tangent.html b/website/common/templates/common/blocks/tangent.html
index 5e45f08..bb6015c 100644
--- a/website/common/templates/common/blocks/tangent.html
+++ b/website/common/templates/common/blocks/tangent.html
@@ -2,8 +2,6 @@
 
 <code>&lt;{{ value.name }}&gt;</code>
 
-<div class="inner">
-  {{ value.content|richtext }}
-</div>
+<div class="inner">{{ value.content|richtext }}</div>
 
 <code>&lt;/{{ value.name }}&gt;</code>
diff --git a/website/common/templates/common/breadcrumbs.html b/website/common/templates/common/breadcrumbs.html
index 7b70726..edaf251 100644
--- a/website/common/templates/common/breadcrumbs.html
+++ b/website/common/templates/common/breadcrumbs.html
@@ -4,7 +4,9 @@
   <nav class="breadcrumb" aria-label="breadcrumbs">
     <ul>
       {% for parent in parents %}
-        <li><a href="{% pageurl parent %}">{{ parent.title }}</a></li>
+        <li>
+          <a href="{% pageurl parent %}">{{ parent.title }}</a>
+        </li>
       {% endfor %}
     </ul>
   </nav>
diff --git a/website/common/templates/common/content_page.html b/website/common/templates/common/content_page.html
index 0fc4776..3b5b541 100644
--- a/website/common/templates/common/content_page.html
+++ b/website/common/templates/common/content_page.html
@@ -20,7 +20,7 @@
   {% sri_static "contrib/shareon/shareon.min.css" %}
   {% sri_static "contrib/glightbox/glightbox.min.css" %}
 
-  <link rel="stylesheet" type="text/css" href="{% url 'code-block:styles' %}">
+  <link rel="stylesheet" type="text/css" href="{% url 'code-block:styles' %}" />
 {% endblock %}
 
 {% block extra_js %}
diff --git a/website/common/templates/common/footer.html b/website/common/templates/common/footer.html
index 069652a..8114cd5 100644
--- a/website/common/templates/common/footer.html
+++ b/website/common/templates/common/footer.html
@@ -4,9 +4,7 @@
   <div class="content has-text-centered">
     {% if online_accounts %}
       <p class="is-size-3">
-        {% for online_account in online_accounts %}
-          <a href="{{ online_account.url }}" title="{{ online_account.name }}"><i class="{{ online_account.icon }}"></i></a>
-        {% endfor %}
+        {% for online_account in online_accounts %}<a href="{{ online_account.url }}" title="{{ online_account.name }}"><i class="{{ online_account.icon }}"></i></a>{% endfor %}
       </p>
     {% endif %}
     <p class="is-size-6">
@@ -14,11 +12,7 @@
     </p>
     <p id="to-top" class="is-size-7">
       <a class="scroll-top">To top</a>
-      <a
-        id="to-top-elevator"
-        data-main-audio="{% static 'contrib/elevator-js/elevator.mp3' %}"
-        data-end-audio="{% static 'contrib/elevator-js/ding.mp3' %}"
-      >
+      <a id="to-top-elevator" data-main-audio="{% static 'contrib/elevator-js/elevator.mp3' %}" data-end-audio="{% static 'contrib/elevator-js/ding.mp3' %}">
         <em>in style</em>
       </a>
     </p>
diff --git a/website/common/templates/common/listing-item.html b/website/common/templates/common/listing-item.html
index 7805d89..056fa21 100644
--- a/website/common/templates/common/listing-item.html
+++ b/website/common/templates/common/listing-item.html
@@ -6,13 +6,15 @@
       <figure class="media-left column is-3 image-column">
         {% if page.list_image_url %}
           <a href="{% pageurl page %}" class="image">
-            <img src="{{ page.list_image_url }}" loading="lazy" decoding="async" />
+            <img src="{{ page.list_image_url }}" alt="" loading="lazy" decoding="async" />
           </a>
         {% endif %}
       </figure>
       <div class="media-content column">
         <div>
-          <h2 class="title is-3"><a href="{% pageurl page %}">{{ page.title }}</a></h2>
+          <h2 class="title is-3">
+            <a href="{% pageurl page %}">{{ page.title }}</a>
+          </h2>
           {% include "common/content-details.html" %}
           <p>{{ page.summary }}</p>
         </div>
diff --git a/website/common/templates/common/listing_page.html b/website/common/templates/common/listing_page.html
index c87f8ad..2cec9f2 100644
--- a/website/common/templates/common/listing_page.html
+++ b/website/common/templates/common/listing_page.html
@@ -4,7 +4,7 @@
 
 {% block extra_head %}
   {{ block.super }}
-  <link rel="alternate" type="application/rss+xml" href="{% routablepageurl page 'feed' %}">
+  <link rel="alternate" type="application/rss+xml" href="{% routablepageurl page 'feed' %}" />
 {% endblock %}
 
 {% block hero_buttons %}
diff --git a/website/common/templates/common/navbar.html b/website/common/templates/common/navbar.html
index 0f81c1e..cd1f5cd 100644
--- a/website/common/templates/common/navbar.html
+++ b/website/common/templates/common/navbar.html
@@ -2,9 +2,7 @@
 
 <nav class="navbar is-family-code" role="navigation" aria-label="main navigation">
   <div class="navbar-brand">
-    <a class="navbar-item home-link" href="{{ homepage_url }}">
-      /home/theorangeone
-    </a>
+    <a class="navbar-item home-link" href="{{ homepage_url }}">/home/theorangeone</a>
 
     <a role="button" class="navbar-burger" id="navbar-burger" aria-label="menu" aria-expanded="false" data-target="navbar">
       <span aria-hidden="true"></span>
@@ -16,9 +14,7 @@
   <div id="navbar" class="navbar-menu">
     <div class="navbar-start">
       {% for nav_page in nav_pages %}
-        <a class="navbar-item" href="{% pageurl nav_page %}">
-          ~/{{ nav_page.slug }}
-        </a>
+        <a class="navbar-item" href="{% pageurl nav_page %}">~/{{ nav_page.slug }}</a>
       {% endfor %}
     </div>
 
diff --git a/website/common/templates/common/pagination.html b/website/common/templates/common/pagination.html
index 776dd3e..db0f736 100644
--- a/website/common/templates/common/pagination.html
+++ b/website/common/templates/common/pagination.html
@@ -15,23 +15,37 @@
 
   <ul class="pagination-list">
     {% if page.has_previous and page.previous_page_number != 1 %}
-      <li><a class="pagination-link" aria-label="Goto page 1" href="{% querystring page=1 %}">1</a></li>
-      <li><span class="pagination-ellipsis">&hellip;</span></li>
+      <li>
+        <a class="pagination-link" aria-label="Goto page 1" href="{% querystring page=1 %}">1</a>
+      </li>
+      <li>
+        <span class="pagination-ellipsis">&hellip;</span>
+      </li>
     {% endif %}
 
     {% if page.has_previous %}
-      <li><a class="pagination-link" aria-label="Goto page {{ page.previous_page_number }}" href="{% querystring page=page.previous_page_number %}">{{ page.previous_page_number }}</a></li>
+      <li>
+        <a class="pagination-link" aria-label="Goto page {{ page.previous_page_number }}" href="{% querystring page=page.previous_page_number %}">{{ page.previous_page_number }}</a>
+      </li>
     {% endif %}
 
-    <li><a class="pagination-link is-current" aria-label="Page {{ page.number }}" aria-current="page">{{ page.number }}</a></li>
+    <li>
+      <a class="pagination-link is-current" aria-label="Page {{ page.number }}" aria-current="page">{{ page.number }}</a>
+    </li>
 
     {% if page.has_next %}
-      <li><a class="pagination-link" aria-label="Goto page {{ page.next_page_number }}" href="{% querystring page=page.next_page_number %}">{{ page.next_page_number }}</a></li>
+      <li>
+        <a class="pagination-link" aria-label="Goto page {{ page.next_page_number }}" href="{% querystring page=page.next_page_number %}">{{ page.next_page_number }}</a>
+      </li>
     {% endif %}
 
     {% if page.has_next and page.next_page_number != page.paginator.num_pages %}
-      <li><span class="pagination-ellipsis">&hellip;</span></li>
-      <li><a class="pagination-link" aria-label="Goto page {{ page.paginator.num_pages }}" href="{% querystring page=page.paginator.num_pages %}">{{ page.paginator.num_pages }}</a></li>
+      <li>
+        <span class="pagination-ellipsis">&hellip;</span>
+      </li>
+      <li>
+        <a class="pagination-link" aria-label="Goto page {{ page.paginator.num_pages }}" href="{% querystring page=page.paginator.num_pages %}">{{ page.paginator.num_pages }}</a>
+      </li>
     {% endif %}
   </ul>
 </nav>
diff --git a/website/common/templates/password_required.html b/website/common/templates/password_required.html
index 99feecc..5a1cd28 100644
--- a/website/common/templates/password_required.html
+++ b/website/common/templates/password_required.html
@@ -6,35 +6,26 @@
 
 {% block title %}Password required{% endblock %}
 
-{% block extra_head %}
-  <meta name="robots" content="noindex" />
-{% endblock %}
+{% block extra_head %}<meta name="robots" content="noindex" />{% endblock %}
 
 {% block main_content %}
-  <h1 class="is-size-1 has-text-primary"><i class="fa-solid fa-lock"></i></h1>
+  <h1 class="is-size-1 has-text-primary">
+    <i class="fa-solid fa-lock"></i>
+  </h1>
   <h1 class="is-size-3 has-text-weight-bold">Password required</h1>
   <p>You need a password to access this page.</p>
 
-  <form action="{{ action_url }}" method="POST" class="mt-5">
+  <form action="{{ action_url }}" method="post" class="mt-5">
     {% csrf_token %}
 
     {{ form.non_field_errors }}
     {{ form.password.errors }}
 
     <div class="field">
-      <input
-        class="input is-medium"
-        type="password"
-        name="{{ form.password.html_name }}"
-        required=""
-        id="{{ form.password.id_for_label }}"
-        placeholder="Password"
-      >
+      <input class="input is-medium" type="password" name="{{ form.password.html_name }}" required="" id="{{ form.password.id_for_label }}" placeholder="Password" />
     </div>
 
-    {% for field in form.hidden_fields %}
-      {{ field }}
-    {% endfor %}
+    {% for field in form.hidden_fields %}{{ field }}{% endfor %}
 
     <input class="button is-primary" type="submit" value="Submit" />
   </form>
diff --git a/website/common/templates/wagtail_base.html b/website/common/templates/wagtail_base.html
index f399e30..bc87c6e 100644
--- a/website/common/templates/wagtail_base.html
+++ b/website/common/templates/wagtail_base.html
@@ -11,9 +11,7 @@
 {% endblock %}
 
 {% block main_content %}
-  {% if page.hero_image_url %}
-    <img class="hero" src="{{ page.hero_image_url }}" decoding="async" alt=""/>
-  {% endif %}
+  {% if page.hero_image_url %}<img class="hero" src="{{ page.hero_image_url }}" decoding="async" alt=""/>{% endif %}
 
   {% if page.get_view_restrictions.exists %}
     <section class="notification is-danger" id="view-restriction-banner">
@@ -28,9 +26,7 @@
           <div class="column">
             {% include "common/breadcrumbs.html" with parents=page.get_parent_pages %}
             <h1 class="title is-spaced">{{ page.hero_title }}</h1>
-            {% if page.subtitle %}
-              <h2 class="subtitle is-size-4">{{ page.subtitle|richtext }}</h2>
-            {% endif %}
+            {% if page.subtitle %}<h2 class="subtitle is-size-4">{{ page.subtitle|richtext }}</h2>{% endif %}
 
             {% include "common/content-details.html" %}
           </div>
@@ -58,7 +54,9 @@
                 </div>
               {% endif %}
 
-              <button class="button is-radiusless scroll-top">Top <i class="fas fa-angle-up ml-2" aria-hidden="true"></i></button>
+              <button class="button is-radiusless scroll-top">
+                Top <i class="fas fa-angle-up ml-2" aria-hidden="true"></i>
+              </button>
             {% endblock %}
           </div>
         </div>
diff --git a/website/common/templates/wagtailmetadata/parts/tags.html b/website/common/templates/wagtailmetadata/parts/tags.html
index 6b3c9eb..479b889 100644
--- a/website/common/templates/wagtailmetadata/parts/tags.html
+++ b/website/common/templates/wagtailmetadata/parts/tags.html
@@ -14,9 +14,7 @@
   {{ block.super }}
 
   <meta name="article:modified_time" content="{{ object.last_published_at|date:'c' }}" />
-  {% if object.date %}
-    <meta name="article:published_time" content="{{ object.date|date:'c' }}" />
-  {% endif %}
+  {% if object.date %}<meta name="article:published_time" content="{{ object.date|date:'c' }}" />{% endif %}
 {% endblock %}
 
 {% block meta %}
diff --git a/website/contact/templates/contact/contact_page.html b/website/contact/templates/contact/contact_page.html
index 5293958..1ec6ac4 100644
--- a/website/contact/templates/contact/contact_page.html
+++ b/website/contact/templates/contact/contact_page.html
@@ -9,9 +9,7 @@
             <div class="media-content">
               <p class="title is-4">
                 <a href="{{ account.url }}">
-                  {% if account.icon %}
-                    <i class="{{ account.icon }}"></i>
-                  {% endif %}
+                  {% if account.icon %}<i class="{{ account.icon }}"></i>{% endif %}
                   {{ account.name }}
                 </a>
               </p>
diff --git a/website/contrib/unsplash/templates/unsplash/results.html b/website/contrib/unsplash/templates/unsplash/results.html
index 6a680a4..44ede50 100644
--- a/website/contrib/unsplash/templates/unsplash/results.html
+++ b/website/contrib/unsplash/templates/unsplash/results.html
@@ -18,15 +18,15 @@
       <tr>
         <td>
           <a class="item-choice" href="{{ row.choose_url }}">
-            <img src="{{ row.item.get_thumbnail_url }}" width="165" referrerpolicy="no-referrer" decoding="async" />
+            <img src="{{ row.item.get_thumbnail_url }}" alt="{{ row.item.unsplash_id }}" width="165" referrerpolicy="no-referrer" decoding="async" />
           </a>
         </td>
         <td class="title">
-          <h2><a class="item-choice" href="{{ row.choose_url }}">{{ row.item.unsplash_id }}</a></h2>
-        </td>
-        <td>
-          {{ row.item.get_description }}
+          <h2>
+            <a class="item-choice" href="{{ row.choose_url }}">{{ row.item.unsplash_id }}</a>
+          </h2>
         </td>
+        <td>{{ row.item.get_description }}</td>
       </tr>
     {% endfor %}
   </tbody>
diff --git a/website/home/templates/home/home_page.html b/website/home/templates/home/home_page.html
index f349b27..103068f 100644
--- a/website/home/templates/home/home_page.html
+++ b/website/home/templates/home/home_page.html
@@ -8,14 +8,16 @@
       <h1>{{ page.heading }}</h1>
       {% if search_page_url %}
         <form action="{{ search_page_url }}">
-          <input id="search-input" class="input" type="text" placeholder="Search" name="q">
+          <input id="search-input" class="input" type="text" placeholder="Search" name="q" />
         </form>
       {% endif %}
     </div>
 
     {% if latest_blog_post %}
       <div class="box latest">
-        <strong>Latest Post</strong>: <a href="{% pageurl latest_blog_post %}">{{ latest_blog_post.title }}</a> &rarr;
+        <strong>Latest Post</strong>:
+        <a href="{% pageurl latest_blog_post %}">{{ latest_blog_post.title }}</a>
+        &rarr;
       </div>
     {% endif %}
   </main>
diff --git a/website/search/templates/search/search_page.html b/website/search/templates/search/search_page.html
index 4c85007..85a34a2 100644
--- a/website/search/templates/search/search_page.html
+++ b/website/search/templates/search/search_page.html
@@ -6,18 +6,7 @@
   <section class="container search-controls">
     <div class="field">
       <p class="control has-icons-left has-icons-right">
-        <input
-          type="search"
-          class="input"
-          name="q"
-          placeholder="Search"
-          hx-get="{{ search_url }}"
-          hx-trigger="keyup changed delay:300ms, search{% if search_query %}, load{% endif %}"
-          hx-target="#search-results"
-          autocomplete="off"
-          value="{{ search_query }}"
-          hx-indicator="#search-indicator"
-        >
+        <input type="search" class="input" name="q" placeholder="Search" hx-get="{{ search_url }}" hx-trigger="keyup changed delay:300ms, search{% if search_query %}, load{% endif %}" hx-target="#search-results" autocomplete="off" value="{{ search_query }}" hx-indicator="#search-indicator" />
         <span class="icon is-small is-left">
           <i class="fas fa-search"></i>
         </span>
diff --git a/website/search/templates/search/search_results.html b/website/search/templates/search/search_results.html
index adf28e3..6996be9 100644
--- a/website/search/templates/search/search_results.html
+++ b/website/search/templates/search/search_results.html
@@ -4,9 +4,7 @@
   {% include "common/listing-item.html" %}
 {% endfor %}
 
-{% if not results and page_num == 1 %}
-  <p>No results found</p>
-{% endif %}
+{% if not results and page_num == 1 %}<p>No results found</p>{% endif %}
 
 {% if results.has_next %}
   <span hx-get="{{ search_url }}{% querystring page=results.next_page_number %}" hx-trigger="revealed" hx-swap="outerHTML"></span>
diff --git a/website/spotify/templates/spotify/spotify-item.html b/website/spotify/templates/spotify/spotify-item.html
index 867967e..3da9397 100644
--- a/website/spotify/templates/spotify/spotify-item.html
+++ b/website/spotify/templates/spotify/spotify-item.html
@@ -2,16 +2,21 @@
   <tr>
     <td>
       <a href="{{ url }}">
-        <img src="{{ track.album.images.0.url }}" decoding="async" loading="lazy" referrerpolicy="no-referrer" class="image"/>
+        <img src="{{ track.album.images.0.url }}" alt="{{ track.album.name }}" decoding="async" loading="lazy" referrerpolicy="no-referrer" class="image"/>
       </a>
     </td>
     <td>
-      {% if track.preview_url %}
-        <a href="{{ track.preview_url }}"><i class="fas fa-play"></i></a>
-      {% endif %}
+      {% if track.preview_url %}<a href="{{ track.preview_url }}"><i class="fas fa-play"></i></a>{% endif %}
+    </td>
+    <td>
+      <a href="{{ url }}">{{ track.name }}</a>
+    </td>
+    <td>
+      {% for artist in track.artists %}
+        {% if not forloop.first %},{% endif %}
+        {{ artist.name }}
+      {% endfor %}
     </td>
-    <td><a href="{{ url }}">{{ track.name }}</a></td>
-    <td>{% for artist in track.artists %}{% if not forloop.first %}, {% endif %}{{ artist.name }}{% endfor %}</td>
     <td>{{ track.album.name }}</td>
   </tr>
 {% endwith %}