From 7cf9fbadadc869dd98325109db438f1419b9e4cf Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Wed, 28 Dec 2022 10:24:59 -0500
Subject: [PATCH] overhaul gallery to new style

---
 themes/red/layouts/_default/gallery.html     | 56 ++++----------------
 themes/red/layouts/partials/art-gallery.html | 30 +----------
 themes/red/layouts/partials/render-art.html  | 29 ++++++++++
 3 files changed, 40 insertions(+), 75 deletions(-)
 create mode 100644 themes/red/layouts/partials/render-art.html

diff --git a/themes/red/layouts/_default/gallery.html b/themes/red/layouts/_default/gallery.html
index 35a263b..d38abe2 100644
--- a/themes/red/layouts/_default/gallery.html
+++ b/themes/red/layouts/_default/gallery.html
@@ -34,60 +34,24 @@
                 {{ if eq (int .year) (int $selected_year) }}
                     {{ $year := .year }}
 
-                    <div class="gallery-con">
+                    <div class="grid">
                     {{ range .pieces }}
-                        <figure class="gallery-fig">
-                            {{ $full := resources.Get (printf "%s/%s" ($.Param "json") .filename) }}
-                            {{ if $full }}
-
                             {{ $filename_without_ext := strings.TrimSuffix (path.Ext .filename) .filename }}
 
-                            {{ $month := 1 }}
-
-                            {{ if .date }}
-                                {{ $split := split .date "-" }}
-                                {{ $month = index $split 0 }}
+                            {{ $path := printf "/art/%s" $filename_without_ext}}
+                            {{ with $.Site.GetPage $path }}
+                                {{ partial "render-art" . }}
                             {{ end }}
-
-                            {{ $path := printf "/art/%d/%.2d/%s" (int $year) (int $month) $filename_without_ext}}
-
-                            <a href="{{ $path }}" aria-label="Click to view details">
-                                {{ if $.Params.thumbnails }}
-                                    {{ $title := .title }}
-                                    {{ with resources.Get (printf "%s-thumbs/%s" ($.Param "json") .filename) }}
-                                    <img class="gallery-img" alt="{{ $title }}" width="128" height="128" src="{{ .Permalink }}"/>
-                                    {{ else }}
-                                    <p>Thumbnail not found!</p>
-                                    {{ end }}
-                                {{ else }}
-                                    <img alt="{{ .title }}" src="{{ $full.Permalink }}"/>
-                                {{ end }}
-                            </a>
-
-                            <figcaption>
-
-                                {{ with .title }}
-                                "{{ . }}"
-                                {{ end }}
-                                {{ if .newgrounds_url }}
-                                    <a href="{{ .newgrounds_url }}" style="vertical-align: bottom"><img alt="Newgrounds Icon" style="vertical-align: bottom" width="19" height="19" src="{{ $newgrounds_icon.Permalink }}"></a>
-                                {{ end }}
-                                {{ if .pixiv_url }}
-                                    <a href="{{ .pixiv_url }}" style="vertical-align: bottom"><img alt="Pixiv Icon" style="vertical-align: bottom" width="19" height="19" src="{{ $pixiv_icon.Permalink }}"></a>
-                                {{ end }}
-                            </figcaption>
-
-                            {{ else }}
-
-                            <em>CANNOT FIND {{.filename }}</em>
-
-                            {{ end }}
-                        </figure>
                         {{ end }}
-
                     </div>
                 {{ end }}
             {{ end }}
         {{ end }}
     {{ end }}
+
+    {{ $site := resources.Get "js/site.js" }}
+    {{ if hugo.IsProduction }}
+        {{ $site = $site | minify | fingerprint | resources.PostProcess }}
+    {{ end }}
+    <script src="{{ $site.RelPermalink }}" integrity="{{ $site.Data.Integrity }}"></script>
 {{ end }}
diff --git a/themes/red/layouts/partials/art-gallery.html b/themes/red/layouts/partials/art-gallery.html
index b451e3a..fd3a33a 100644
--- a/themes/red/layouts/partials/art-gallery.html
+++ b/themes/red/layouts/partials/art-gallery.html
@@ -2,35 +2,7 @@
 
 <div class="grid">
 {{ range $paginator.Pages }}
-        {{ $full := resources.Get (printf "art/%s.webp" .Params.slug) }}
-        {{ if $full }}
-
-        {{ $filename_without_ext := .Params.slug }}
-
-        {{ $month := 1 }}
-        {{ $year := 1 }}
-
-        {{ if .Params.date }}
-            {{ $split := split .Params.date "-" }}
-            {{ $month = index $split 0 }}
-            {{ $year = index $split 3 }}
-        {{ end }}
-
-        <a href="{{ .Permalink }}">
-        {{ $path := printf "/art/%d/%.2d/%s" (int $year) (int $month) $filename_without_ext}}
-                {{ $title := .Params.title }}
-                {{ $image := (resources.Get (printf "art/%s.webp" .Params.slug)).Resize "300x" }}
-                {{ with $image }}
-                <img class="grid-item" width="{{ .Width }}" height="{{ .Height }}" alt="{{ $title }}" src="{{ .Permalink }}"/>
-                {{ else }}
-                <p>Thumbnail not found!</p>
-                {{ end }}
-        {{ else }}
-        </a>
-
-        <em>CANNOT FIND {{.Params.slug }}</em>
-
-        {{ end }}
+        {{ partial "render-art" . }}
 {{ end }}
 </div>
 
diff --git a/themes/red/layouts/partials/render-art.html b/themes/red/layouts/partials/render-art.html
new file mode 100644
index 0000000..e54bdd4
--- /dev/null
+++ b/themes/red/layouts/partials/render-art.html
@@ -0,0 +1,29 @@
+{{ $full := resources.Get (printf "art/%s.webp" .Params.slug) }}
+{{ if $full }}
+
+{{ $filename_without_ext := .Params.slug }}
+
+{{ $month := 1 }}
+{{ $year := 1 }}
+
+{{ if .Params.date }}
+        {{ $split := split .Params.date "-" }}
+        {{ $month = index $split 0 }}
+        {{ $year = index $split 3 }}
+{{ end }}
+
+<a href="{{ .Permalink }}">
+{{ $path := printf "/art/%d/%.2d/%s" (int $year) (int $month) $filename_without_ext}}
+        {{ $title := .Params.title }}
+        {{ $image := (resources.Get (printf "art/%s.webp" .Params.slug)).Resize "300x" }}
+        {{ with $image }}
+        <img class="grid-item" width="{{ .Width }}" height="{{ .Height }}" alt="{{ $title }}" src="{{ .Permalink }}"/>
+        {{ else }}
+        <p>Thumbnail not found!</p>
+        {{ end }}
+</a>
+{{ else }}
+
+<em>CANNOT FIND {{.Params.slug }}</em>
+
+{{ end }}