From 5da2f358e9507d6fef385c6fa053fd54c351af9f Mon Sep 17 00:00:00 2001
From: Ethan Marshall <ethan@ejv2.cc>
Date: Fri, 2 Aug 2024 00:33:05 +0100
Subject: [PATCH] Clean up and improve some layouts

Adds tags and category shows to single pages.
Adds dates to list pages.
---
 content/blog/hello-world/index.md           |  3 ++-
 themes/risotto/layouts/_default/list.html   |  2 +-
 themes/risotto/layouts/_default/single.html | 25 ++++++++++++++++++---
 themes/risotto/layouts/blog/list.html       |  2 +-
 4 files changed, 26 insertions(+), 6 deletions(-)

diff --git a/content/blog/hello-world/index.md b/content/blog/hello-world/index.md
index 8d21bff..7d1bc92 100644
--- a/content/blog/hello-world/index.md
+++ b/content/blog/hello-world/index.md
@@ -2,7 +2,8 @@
 title = 'Hello World'
 date = 2024-08-01T04:21:56+01:00
 author = 'Ethan Marshall'
-draft = false
+categories = ['tech']
+tags = ['personal', 'web']
 +++
 
 Hello, world! This is my first testing post to see if this system will work. Nothing to see here!
diff --git a/themes/risotto/layouts/_default/list.html b/themes/risotto/layouts/_default/list.html
index 6966c31..f2ec835 100644
--- a/themes/risotto/layouts/_default/list.html
+++ b/themes/risotto/layouts/_default/list.html
@@ -5,7 +5,7 @@
 
     <ul>
     {{ range .Pages }}
-        {{ .Render "li" }}
+        <li><a href="{{ .Permalink }}">{{ .Title }}</a> -- {{ .Date.Format "2 January 2006" }}</li>
     {{ end }}
     </ul>
 
diff --git a/themes/risotto/layouts/_default/single.html b/themes/risotto/layouts/_default/single.html
index 23274ed..3cbbf79 100644
--- a/themes/risotto/layouts/_default/single.html
+++ b/themes/risotto/layouts/_default/single.html
@@ -10,13 +10,32 @@
 
 {{define "aside" }}
     {{ if .Params.description }}<p>{{ .Params.description }}</p>{{ end }}
-    {{ if or (.Params.author) (.Params.date) }}
+    {{ if .Params.date }}
         <p>
-            {{ if .Params.author }}By {{ .Params.author }}{{ if .Date }}, {{ end }}{{ end }}
-            {{ if .Date }}{{ .Date.Format "2006-01-02" }}{{ end }}
+	    {{ if .Date }}<strong>First Published</strong> {{ .Date.Format "2006-01-02" }}{{ end }}
         </p>
     {{ end }}
 
+    {{if .Params.categories }}
+    	<p>
+	    <strong>Categories: [</strong>
+	    {{ range .Params.categories }}
+	        <a href="/categories/{{ . }}">{{ . }}</a>
+	    {{ end }}
+	    <strong>]</strong>
+	</p>
+    {{ end }}
+
+    {{if .Params.tags }}
+    	<p>
+	    <strong>Tags: [</strong>
+	    {{ range .Params.tags }}
+	        <a href="/tags/{{ . }}">{{ . }}</a>
+	    {{ end }}
+	    <strong>]</strong>
+	</p>
+    {{ end }}
+
     {{ if and (.Params.toc) (.TableOfContents) }}
 	    <hr>
 	    On this page:
diff --git a/themes/risotto/layouts/blog/list.html b/themes/risotto/layouts/blog/list.html
index af87fe3..9c650e5 100644
--- a/themes/risotto/layouts/blog/list.html
+++ b/themes/risotto/layouts/blog/list.html
@@ -7,7 +7,7 @@
     {{ range .Pages }}
     <article class="post">
         <header class="post__header">
-            <h1><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a> - {{ .Date.Format "2 January 2006" }}</h1>
+            <h1><a href="{{ .Permalink }}">{{ .Title | markdownify }}</a> -- {{ .Date.Format "2 January 2006" }}</h1>
         </header>
 
         <section class="post__summary">