Merge pull request #21 from stuartmaxwell/dev

stuartmaxwell · May 1, 2024 · 5c15faf · 5c15faf
2 parents 5f8893a + 06ae064
commit 5c15faf
Show file tree

Hide file tree

Showing 10 changed files with 117 additions and 20 deletions.
diff --git a/config/settings.py b/config/settings.py
@@ -236,3 +236,4 @@
 CACHE_CATEGORIES: bool = True
 CACHE_RECENT_PUBLISHED_POSTS: bool = False
 RECENT_PUBLISHED_POSTS_COUNT: int = 20
+BLOG_TITLE = "stuartm.nz"
diff --git a/djpress/templates/djpress/index.html b/djpress/templates/djpress/index.html
@@ -1,32 +1,89 @@
-{% extends '_base.html' %}
 {% load djpress_tags %}
 
-{% block title %}Home{% endblock %}
+<!DOCTYPE html>
+<html lang="en">
+  <head>
+    <meta charset="UTF-8">
+    <meta name="viewport" content="width=device-width, initial-scale=1.0">
+    <title>{% get_blog_title %}</title>
+  </head>
+  <body>
+    <header>
+      <h1><a href="{% url "djpress:index" %}">{% get_blog_title %}</a></h1>
+    </header>
 
-{% block content %}
+    <main>
 
-  {% if slug %}
-  {% comment %} If there's a slug, we only display a single post. {% endcomment %}
+      {% if slug %}
+    {% comment %} If there's a slug, we only display a single post. {% endcomment %}
 
-    {% get_single_published_content slug as post %}
+        {% get_single_published_content slug as post %}
 
-    {% include "djpress/snippets/content_detail.html" %}
+        <article>
+          <header>
+            <h1>{{ post.title }}</h1>
+            <p>By <span rel="author">{{ post.author.first_name }}</span></p>
+            <p><time datetime="2023-05-01">{{ post.date }}</time></p>
+          </header>
+          <section>
+            {{ post.content_markdown|safe }}
+          </section>
+          <footer>
+            <p>Categories:</p>
+            <ul>
+              {% for category in post.categories.all %}
+                <li><a href="{% url 'djpress:category_posts' category.slug %}">{{ category.name }}</a></li>
+              {% endfor %}
+            </ul>
+          </footer>
+        </article>
 
-  {% else %}
-  {% comment %} If there's no slug, we loop through recent published content. {% endcomment %}
+      {% else %}
+    {% comment %} If there's no slug, we loop through recent published content. {% endcomment %}
 
-    {% get_recent_published_content as posts %}
+        {% get_recent_published_content as posts %}
 
-    {% for post in posts %}
+        {% for post in posts %}
 
-      {% include "djpress/snippets/content_summary.html" %}
+          <article>
+            <header>
+              <h1><a href="{% url 'djpress:content_detail' post.slug %}">{{ post.title }}</a></h1>
+              <p>By <span rel="author">{{ post.author.first_name }}</span></p>
+              <p><time datetime="2023-05-01">{{ post.date }}</time></p>
+            </header>
+            <section>
+              {{ post.truncated_content_markdown|safe }}
 
-    {% empty %}
+              {% if post.is_truncated %}
+                <p><a href="{% url 'djpress:content_detail' post.slug %}">Read more</a></p>
+              {% endif %}
+            </section>
+            <footer>
+              <p>Categories:</p>
+              <ul>
+                {% for category in post.categories.all %}
+                  <li><a href="{% url 'djpress:category_posts' category.slug %}">{{ category.name }}</a></li>
+                {% endfor %}
+              </ul>
+            </footer>
+          </article>
 
-      <p>No posts available.</p>
+        {% empty %}
 
-    {% endfor %}
+          <p>No posts available.</p>
 
-  {% endif %}
+        {% endfor %}
 
-{% endblock %}
+      {% endif %}
+
+    </main>
+
+    <footer>
+      <p>Powered by
+        <a href="https://www.djangoproject.com/" title="The web framework for perfectionists with deadlines">Django</a>
+        and
+        <a href="#">DJPress</a>
+      </p>
+    </footer>
+  </body>
+</html>
diff --git a/djpress/templatetags/djpress_tags.py b/djpress/templatetags/djpress_tags.py
@@ -3,6 +3,7 @@
 from django import template
 from django.db import models
 
+from config.settings import BLOG_TITLE
 from djpress.models import Category, Content
 
 register = template.Library()
@@ -24,3 +25,9 @@ def get_recent_published_content() -> models.QuerySet[Category] | None:
 def get_single_published_content(slug: str) -> Content | None:
     """Return a single published post by slug."""
     return Content.post_objects.get_published_post_by_slug(slug)
+
+
+@register.simple_tag
+def get_blog_title() -> str:
+    """Return the blog title."""
+    return BLOG_TITLE
diff --git a/templates/_base.html → templates/base.html b/templates/_base.html → templates/base.html
@@ -13,7 +13,7 @@
     <script async src="https://u.amanzi.nz/script.js" data-website-id="d5f479d8-65fb-4f80-9823-5fe5ca2e17aa"></script>
   </head>
   <body>
-    {% include "snippets/navbar.html" %}
+    {% include "djpress/snippets/navbar.html" %}
     <div class="container my-4">
       {% block content %}
       {% endblock %}

diff --git a/...ess/templates/djpress/category_posts.html → templates/djpress/category_posts.html b/...ess/templates/djpress/category_posts.html → templates/djpress/category_posts.html
@@ -1,4 +1,4 @@
-{% extends '_base.html' %}
+{% extends 'base.html' %}
 
 {% block title %}{{ category.name }}{% endblock %}
 

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

diff --git a/...ates/djpress/snippets/content_detail.html → ...ates/djpress/snippets/content_detail.html b/...ates/djpress/snippets/content_detail.html → ...ates/djpress/snippets/content_detail.html
diff --git a/...tes/djpress/snippets/content_summary.html → ...tes/djpress/snippets/content_summary.html b/...tes/djpress/snippets/content_summary.html → ...tes/djpress/snippets/content_summary.html
diff --git a/templates/snippets/navbar.html → templates/djpress/snippets/navbar.html b/templates/snippets/navbar.html → templates/djpress/snippets/navbar.html