Template updates

stuartmaxwell · May 1, 2024 · 1e53d40 · 1e53d40
1 parent 699887a
commit 1e53d40
Show file tree

Hide file tree

Showing 7 changed files with 60 additions and 51 deletions.
diff --git a/config/settings_testing.py b/config/settings_testing.py
@@ -3,4 +3,25 @@
 from .settings import *  # noqa: F403, F401, RUF100
 
 # Use an in-memory database for testing
-DATABASES = {"default": {"ENGINE": "django.db.backends.sqlite3", "NAME": ":memory:"}}
+DATABASES = {
+    "default": {
+        "ENGINE": "django.db.backends.sqlite3",
+        "NAME": ":memory:",
+    },
+}
+
+TEMPLATES = [
+    {
+        "BACKEND": "django.template.backends.django.DjangoTemplates",
+        "DIRS": [],
+        "APP_DIRS": True,
+        "OPTIONS": {
+            "context_processors": [
+                "django.template.context_processors.debug",
+                "django.template.context_processors.request",
+                "django.contrib.auth.context_processors.auth",
+                "django.contrib.messages.context_processors.messages",
+            ],
+        },
+    },
+]
diff --git a/djpress/templates/djpress/index.html b/djpress/templates/djpress/index.html
@@ -36,10 +36,8 @@ <h1>{{ post.title }}</h1>
           </footer>
         </article>
 
-      {% endif %}
-
       {% comment %}If we get multiple posts, then show the truncated content.{% endcomment %}
-      {% if posts %}
+      {% elif posts %}
 
         {% comment %}If we get posts for a category, then we can show the category header.{% endcomment %}
         {% if category %}
@@ -73,11 +71,11 @@ <h1><a href="{% url 'djpress:content_detail' post.slug %}">{{ post.title }}</a><
             </footer>
           </article>
 
-        {% empty %}
+        {% endfor %}
 
-          <p>No posts available.</p>
+      {% else %}
 
-        {% endfor %}
+        <p>No posts available.</p>
 
       {% endif %}
 

diff --git a/djpress/test_category_cache.py b/djpress/test_category_cache.py
@@ -17,7 +17,7 @@ def test_get_cached_categories():
     Category.objects.create(name="Category 2")
 
     # Call the get_cached_categories method
-    queryset = Category.objects.get_cached_categories()
+    queryset = Category.objects._get_cached_categories()
 
     # Assert that the queryset is cached
     cached_queryset = cache.get(CATEGORY_CACHE_KEY)
@@ -26,7 +26,7 @@ def test_get_cached_categories():
     assert len(cached_queryset) == 2
 
     # Assert that subsequent calls retrieve the queryset from cache
-    queryset2 = Category.objects.get_cached_categories()
+    queryset2 = Category.objects._get_cached_categories()
     assert list(queryset2) == list(cached_queryset)
 
 
@@ -36,7 +36,7 @@ def test_cache_invalidation_on_save():
     category = Category.objects.create(name="Category 1")
 
     # Call the get_cached_categories method
-    queryset = Category.objects.get_cached_categories()
+    queryset = Category.objects._get_cached_categories()
 
     # Assert that the queryset is cached
     cached_queryset = cache.get(CATEGORY_CACHE_KEY)
@@ -52,7 +52,7 @@ def test_cache_invalidation_on_save():
     assert cached_queryset is None
 
     # Call the get_cached_categories method again
-    queryset2 = Category.objects.get_cached_categories()
+    queryset2 = Category.objects._get_cached_categories()
 
     # Assert that the queryset is cached again with the updated data
     cached_queryset2 = cache.get(CATEGORY_CACHE_KEY)
@@ -67,7 +67,7 @@ def test_cache_invalidation_on_delete():
     category = Category.objects.create(name="Category 1")
 
     # Call the get_cached_categories method
-    queryset = Category.objects.get_cached_categories()
+    queryset = Category.objects._get_cached_categories()
 
     # Assert that the queryset is cached
     cached_queryset = cache.get(CATEGORY_CACHE_KEY)
@@ -82,7 +82,7 @@ def test_cache_invalidation_on_delete():
     assert cached_queryset is None
 
     # Call the get_cached_categories method again
-    queryset2 = Category.objects.get_cached_categories()
+    queryset2 = Category.objects._get_cached_categories()
 
     # Assert that the queryset is cached again with the updated data
     cached_queryset2 = cache.get(CATEGORY_CACHE_KEY)

diff --git a/templates/base.html b/templates/base.html
@@ -1,11 +1,12 @@
 {% load static %}
+{% load djpress_tags %}
 
 <!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8">
     <meta name="viewport" content="width=device-width, initial-scale=1.0">
-    <title>{% block title %}stuartm.nz{% endblock %}</title>
+    <title>{% spaceless %}{% block title %}{% get_blog_title %}{% endblock %}{% endspaceless %}</title>
     <link rel="alternate" type="application/rss+xml" title="Latest Posts" href="{% url 'djpress:rss_feed' %}">
     <link href="https://cdn.jsdelivr.net/npm/[email protected]/dist/css/bootstrap.min.css" rel="stylesheet">
     <link href="{% static "css/pygments/nord.min.css" %}" rel="stylesheet">

diff --git a/templates/djpress/category_posts.html b/templates/djpress/category_posts.html
diff --git a/templates/djpress/index.html b/templates/djpress/index.html
@@ -1,32 +1,46 @@
 {% extends 'base.html' %}
 {% load djpress_tags %}
 
-{% block title %}Home{% endblock %}
 
-{% block content %}
+{% block title %}
 
-  {% if slug %}
-  {% comment %} If there's a slug, we only display a single post. {% endcomment %}
+  {% if post %}
 
-    {% get_single_published_content slug as post %}
+    {{ post.title }} - {% get_blog_title %}
 
-    {% include "djpress/snippets/content_detail.html" %}
+  {% elif category %}
+
+    {{ category.name }} - {% get_blog_title %}
 
   {% else %}
-  {% comment %} If there's no slug, we loop through recent published content. {% endcomment %}
 
-    {% get_recent_published_content as posts %}
+    {% get_blog_title %}
+
+  {% endif %}
+
+{% endblock title %}
+
+
+{% block content %}
+
+  {% if post %}
+
+    {% include "djpress/snippets/content_detail.html" %}
+
+  {% elif posts %}
+
+    <h1>The posts go here.</h1>
 
     {% for post in posts %}
 
       {% include "djpress/snippets/content_summary.html" %}
 
-    {% empty %}
+    {% endfor %}
 
-      <p>No posts available.</p>
+  {% else %}
 
-    {% endfor %}
+    <p>No posts available.</p>
 
   {% endif %}
 
-{% endblock %}
+{% endblock content %}
diff --git a/templates/djpress/post.html b/templates/djpress/post.html