Merge pull request #173 from stuartmaxwell:updates

Updates

config/settings.py

@@ -32,7 +32,7 @@
     DB_PORT=(str, ""),
     WHITENOISE_STATIC=(bool, False),
     ADMIN_URL=(str, "admin"),
-    BLOG_TITLE=(str, "stuartm.nz"),
+    SITE_TITLE=(str, "stuartm.nz"),
     POST_PREFIX=(str, "{{ year }}/{{ month }}"),
     MASTODON_ACCESS_TOKEN=(str, ""),
     RESEND_API_KEY=(str, ""),
@@ -269,7 +269,7 @@
 
 # DJPress settings
 DJPRESS_SETTINGS = {
-    "BLOG_TITLE": env("BLOG_TITLE"),
+    "SITE_TITLE": env("SITE_TITLE"),
     "POST_PREFIX": env("POST_PREFIX"),
     "THEME": "stuartmnz",
     "MARKDOWN_RENDERER": "config.markdown_renderer.mistune_renderer",

config/settings_testing.py

@@ -15,3 +15,9 @@
 ]
 
 CACHES = {"default": {"BACKEND": "django.core.cache.backends.locmem.LocMemCache"}}
+
+# DJPress settings
+DJPRESS_SETTINGS = {
+    "POST_PREFIX": "{{ year }}/{{ month }}",
+    "PLUGINS": [],
+}

docker-compose-stage.yml

@@ -25,7 +25,7 @@ services:
       - "SENTRY_ENVIRONMENT=${SENTRY_ENVIRONMENT}"
       - "SENTRY_DSN=${SENTRY_DSN}"
       - "SENTRY_TRACES_SAMPLE_RATE=${SENTRY_TRACES_SAMPLE_RATE}"
-      - "BLOG_TITLE=${BLOG_TITLE}"
+      - "SITE_TITLE=${SITE_TITLE}"
       - "POST_PREFIX=${POST_PREFIX}"
       - "POST_PERMALINK=${POST_PERMALINK}"
       - "ARCHIVES_PATH_ENABLED=${ARCHIVES_PATH_ENABLED}"

env.template

@@ -19,7 +19,7 @@ ADMIN_URL=
 SENTRY_ENVIRONMENT=
 SENTRY_DSN=
 SENTRY_TRACES_SAMPLE_RATE=
-BLOG_TITLE=
+SITE_TITLE=
 POST_PREFIX=
 AWS_ACCESS_KEY_ID=
 AWS_SECRET_ACCESS_KEY=

pyproject.toml

@@ -1,13 +1,13 @@
 [project]
 name = "stuartm-nz"
-version = "0.14.0"
+version = "0.15.0"
 description = "stuartm.nz"
 readme = "README.md"
 requires-python = ">=3.13"
 dependencies = [
   "django-environ>=0.11.2",
   "django~=5.1.0",
-  "djpress~=0.14.0",
+  "djpress~=0.15.0",
   "whitenoise>=6.7.0",
   "gunicorn>=23.0.0",
   "rich>=13.8.1",

templates/base.html

@@ -1,7 +1,7 @@
 {% extends '_base.html' %}
 {% load djpress_tags static %}
 
-{% block title %}{% blog_page_title post_text="| " %}{% blog_title %}{% endblock %}
+{% block title %}{% page_title post_text="| " %}{% site_title %}{% endblock %}
 
 {% block css %}
   <link href="{% static "css/pico.jade.min.css" %}" rel="stylesheet">

templates/snippets/navbar.html

@@ -2,7 +2,7 @@
 
 <nav class="container">
   <ul>
-    <li class="brand"><strong>{% blog_title_link link_class="secondary" %}</strong></li>
+    <li class="brand"><strong>{% site_title_link link_class="secondary" %}</strong></li>
   </ul>
 
   {% comment %} Pages menu {% endcomment %}

tests/test_views.py

@@ -34,9 +34,13 @@ def test_archives(client, test_post1) -> None:
 @pytest.mark.django_db
 def test_single_post(client, test_post1) -> None:
     """Test single post view."""
+    url = f"/{test_post1.date.year}/{test_post1.date.month:02}/test-post1/"
+    response: HttpResponse = client.get(url)
+    assert response.status_code == 200
+    assert "Test Post1" in str(response.content)
+
     test_post1.date = timezone.make_aware(timezone.datetime(2024, 6, 1))
     test_post1.save()
-
     url = "/2024/06/test-post1/"
     response: HttpResponse = client.get(url)
     assert response.status_code == 200