From 009716b94b91975aa2ebf4a4a6793bae94f226c0 Mon Sep 17 00:00:00 2001
From: Will Faught <willfaught@users.noreply.github.com>
Date: Tue, 28 May 2024 22:09:50 -0700
Subject: [PATCH] Convert categories, series, tags to taxonomies

---
 layouts/partials/paige/metadata.html | 34 ++++++----------------------
 layouts/partials/paige/page.html     | 34 ++++++----------------------
 2 files changed, 14 insertions(+), 54 deletions(-)

diff --git a/layouts/partials/paige/metadata.html b/layouts/partials/paige/metadata.html
index 5183f4ba..ec6668e9 100644
--- a/layouts/partials/paige/metadata.html
+++ b/layouts/partials/paige/metadata.html
@@ -1,15 +1,15 @@
 {{ $page := . }}
 
 {{ $authors := partial "paige/authors.html" $page }}
-{{ $categories := $page.Params.categories | default slice | uniq }}
+{{ $categories := $page.GetTerms "categories" }}
 {{ $commiturl := "" }}
 {{ $date := $page.PublishDate }}
 {{ $dateformat := $page.Param "paige.date.format" | default ":date_long" }}
 {{ $description := $page.Description | markdownify }}
 {{ $link := $page.Params.link }}
 {{ $readingtime := $page.ReadingTime }}
-{{ $series := $page.Params.series | default slice | uniq }}
-{{ $tags := $page.Params.tags | default slice | uniq }}
+{{ $series := $page.GetTerms "series" }}
+{{ $tags := $page.GetTerms "tags" }}
 {{ $title := $page.Title | markdownify }}
 
 {{ if and ($page.Param "paige.git.commit_url") $page.GitInfo }}
@@ -29,40 +29,20 @@
         <div class="mb-3">
             {{ if or $categories $tags }}
                 <p class="mb-0 text-center text-secondary" id="paige-keywords">
-                    {{ $terms := slice }}
-
-                    {{ range $categories }}
-                        {{ $terms = $terms | append (dict "name" . "url" (printf "categories/%v/" . | relLangURL | string)) }}
-                    {{ end }}
-
-                    {{ range $tags }}
-                        {{ $terms = $terms | append (dict "name" . "url" (printf "tags/%v/" . | relLangURL | string)) }}
-                    {{ end }}
-
-                    {{ range $i, $term := sort $terms "name" -}}
+                    {{ range $i, $term := sort (append $categories $tags) "LinkTitle" -}}
                         {{- if gt $i 0 }}, {{ end -}}
 
-                        {{- $title := $term.name -}}
-
-                        {{- with (site.GetPage $term.url).Title -}}
-                            {{- $title = . -}}
-                        {{- end -}}
-
-                        <a class="link-secondary" href="{{ .url | safeURL }}">{{ $title }}</a>
+                        <a class="link-secondary" href="{{ .RelPermalink | safeURL }}">{{ .Title }}</a>
                     {{- end }}
                 </p>
             {{ end }}
 
             {{ with $series }}
                 <p class="mb-0 text-center text-secondary" id="paige-series">
-                    {{ range $i, $name := . -}}
+                    {{ range $i, $series := . -}}
                         {{- if gt $i 0 }}, {{ end -}}
 
-                        {{- with site.GetPage (print "series/" $name) -}}
-                            <a class="link-secondary" href="{{ .RelPermalink }}">{{ .Title | default $name }}</a>
-                        {{- else -}}
-                            {{- $name -}}
-                        {{- end -}}
+                        <a class="link-secondary" href="{{ .RelPermalink }}">{{ .Title }}</a>
                     {{- end }}
                 </p>
             {{ end }}
diff --git a/layouts/partials/paige/page.html b/layouts/partials/paige/page.html
index d3da9581..b56e7467 100644
--- a/layouts/partials/paige/page.html
+++ b/layouts/partials/paige/page.html
@@ -1,7 +1,7 @@
 {{ $page := . }}
 
 {{ $authors := partial "paige/authors.html" $page }}
-{{ $categories := $page.Params.categories | default slice | uniq }}
+{{ $categories := $page.GetTerms "categories" }}
 {{ $commiturl := "" }}
 {{ $date := $page.PublishDate }}
 {{ $dateformat := $page.Param "paige.date.format" | default ":date_long" }}
@@ -13,9 +13,9 @@
 {{ $modified := and $page.PublishDate $page.Lastmod (lt $page.PublishDate $page.Lastmod) }}
 {{ $pinned := $page.Params.paige.pin }}
 {{ $readingtime := $page.ReadingTime }}
-{{ $series := $page.Params.series }}
+{{ $series := $page.GetTerms "series" }}
 {{ $summary := $page.Summary | markdownify | plainify | htmlUnescape }}
-{{ $tags := $page.Params.tags | default slice | uniq }}
+{{ $tags := $page.GetTerms "tags" }}
 {{ $title := $page.Title | markdownify | plainify | htmlUnescape }}
 {{ $titlelink := $page.RelPermalink }}
 
@@ -61,40 +61,20 @@
 
     {{ if or $categories $tags }}
         <p class="mb-0 paige-keywords text-center text-secondary">
-            {{ $terms := slice }}
-
-            {{ range $categories }}
-                {{ $terms = $terms | append (dict "name" . "url" (printf "categories/%v/" . | relLangURL | string)) }}
-            {{ end }}
-
-            {{ range $tags }}
-                {{ $terms = $terms | append (dict "name" . "url" (printf "tags/%v/" . | relLangURL | string)) }}
-            {{ end }}
-
-            {{ range $i, $term := sort $terms "name" -}}
+            {{ range $i, $term := sort (append $categories $tags) "LinkTitle" -}}
                 {{- if gt $i 0 }}, {{ end -}}
 
-                {{- $title := $term.name -}}
-
-                {{- with (site.GetPage $term.url).Title -}}
-                    {{- $title = . -}}
-                {{- end -}}
-
-                <a class="link-secondary" href="{{ .url | safeURL }}">{{ $title }}</a>
+                <a class="link-secondary" href="{{ .RelPermalink | safeURL }}">{{ .Title }}</a>
             {{- end }}
         </p>
     {{ end }}
 
     {{ with $series }}
         <p class="mb-0 paige-series text-center text-secondary">
-            {{ range $i, $name := . -}}
+            {{ range $i, $series := . -}}
                 {{- if gt $i 0 }}, {{ end -}}
 
-                {{- with site.GetPage (print "series/" $name) -}}
-                    <a class="link-secondary" href="{{ .RelPermalink }}">{{ .Title | default $name }}</a>
-                {{- else -}}
-                    {{- $name -}}
-                {{- end -}}
+                <a class="link-secondary" href="{{ .RelPermalink }}">{{ .Title }}</a>
             {{- end }}
         </p>
     {{ end }}