From de978b43a44367b9841ed35e75b6b38e4c8edbc3 Mon Sep 17 00:00:00 2001
From: Joshua Goins <josh@redstrate.com>
Date: Tue, 27 Dec 2022 21:59:30 -0500
Subject: [PATCH] Fix CSP

---
 themes/red/assets/js/site.js             |   8 ++
 themes/red/layouts/_default/art.html     |  16 +--
 themes/red/layouts/_default/arttag.html  |  17 +--
 themes/red/layouts/_default/gallery.html | 146 +++++++++++------------
 themes/red/layouts/_default/listart.html |   1 -
 5 files changed, 89 insertions(+), 99 deletions(-)
 create mode 100644 themes/red/assets/js/site.js

diff --git a/themes/red/assets/js/site.js b/themes/red/assets/js/site.js
new file mode 100644
index 0000000..99996ad
--- /dev/null
+++ b/themes/red/assets/js/site.js
@@ -0,0 +1,8 @@
+imagesLoaded(document.querySelector('.grid'), function(instance) {
+    new Masonry('.grid', {
+        itemSelector: '.grid-item',
+        columnWidth: 300,
+        fitWidth: true,
+        gutter: 10
+    });
+});
diff --git a/themes/red/layouts/_default/art.html b/themes/red/layouts/_default/art.html
index 857f603..f26c336 100644
--- a/themes/red/layouts/_default/art.html
+++ b/themes/red/layouts/_default/art.html
@@ -108,15 +108,9 @@
     <a href="{{ .URL }}">Next</a>
     {{ end }}
 
-    <script>
-    imagesLoaded(document.querySelector('.grid'), function(instance) {
-        new Masonry('.grid', {
-            itemSelector: '.grid-item',
-            columnWidth: 300,
-            fitWidth: true,
-            gutter: 10
-        });
-    });
-    </script>
-
+    {{ $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/_default/arttag.html b/themes/red/layouts/_default/arttag.html
index 2e24ef1..e75059f 100644
--- a/themes/red/layouts/_default/arttag.html
+++ b/themes/red/layouts/_default/arttag.html
@@ -40,16 +40,9 @@
         </div>
     {{ template "_internal/pagination.html" . }}
 
-    <script>
-    imagesLoaded( document.querySelector('.grid'), function( instance ) {
-    console.log('all images are loaded');
-    var msnry = new Masonry( '.grid', {
-        itemSelector: '.grid-item',
-        columnWidth: 200,
-        fitWidth: true,
-        gutter: 10
-    });
-    });
-    </script>
-
+    {{ $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/_default/gallery.html b/themes/red/layouts/_default/gallery.html
index 2e06abe..35a263b 100644
--- a/themes/red/layouts/_default/gallery.html
+++ b/themes/red/layouts/_default/gallery.html
@@ -3,93 +3,89 @@
 
     {{ .Content }}
 
-    {{ if in .File.Dir "art" }}
+    {{ $selected_year := $.Param "selectedyear" }}
+    {{ $art := (index site.Data ($.Param "json")) }}
+    {{ $pixiv_icon := resources.Get "pixiv.webp" }}
+    {{ $newgrounds_icon := resources.Get "newgrounds.webp" }}
 
-    {{ else }}
-        {{ $selected_year := $.Param "selectedyear" }}
-        {{ $art := (index site.Data ($.Param "json")) }}
-        {{ $pixiv_icon := resources.Get "pixiv.webp" }}
-        {{ $newgrounds_icon := resources.Get "newgrounds.webp" }}
+    <details>
+    <summary>Table of Contents</summary>
+    <ul>
+    {{ range $art.categories }}
+        {{ $without_space :=  replaceRE "(\\s)" "" .name }}
+        <li><a href="#{{ $without_space }}">{{ .name }}</a></li>
+    {{ end }}
+    </ul>
+    </details>
 
-        <details>
-        <summary>Table of Contents</summary>
-        <ul>
-        {{ range $art.categories }}
-            {{ $without_space :=  replaceRE "(\\s)" "" .name }}
-            <li><a href="#{{ $without_space }}">{{ .name }}</a></li>
+    {{ range $art.categories }}
+        {{ $should_include := false }}
+
+        {{ range sort .years "year" "desc" }}
+            {{ if eq (int .year) (int $selected_year) }}
+                {{ $should_include = true }}
+            {{ end }}
         {{ end }}
-        </ul>
-        </details>
-
-        {{ range $art.categories }}
-            {{ $should_include := false }}
 
+        {{ if $should_include }}
+            {{ $without_space :=  replaceRE "(\\s)" "" .name }}
+            <h3 id="{{ $without_space }}">{{ .name }}</h3>
             {{ range sort .years "year" "desc" }}
                 {{ if eq (int .year) (int $selected_year) }}
-                    {{ $should_include = true }}
-                {{ end }}
-            {{ end }}
+                    {{ $year := .year }}
 
-            {{ if $should_include }}
-                {{ $without_space :=  replaceRE "(\\s)" "" .name }}
-                <h3 id="{{ $without_space }}">{{ .name }}</h3>
-                {{ range sort .years "year" "desc" }}
-                    {{ if eq (int .year) (int $selected_year) }}
-                        {{ $year := .year }}
+                    <div class="gallery-con">
+                    {{ range .pieces }}
+                        <figure class="gallery-fig">
+                            {{ $full := resources.Get (printf "%s/%s" ($.Param "json") .filename) }}
+                            {{ if $full }}
 
-                        <div class="gallery-con">
-                        {{ 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 }}
 
-                                {{ $filename_without_ext := strings.TrimSuffix (path.Ext .filename) .filename }}
+                            {{ $month := 1 }}
 
-                                {{ $month := 1 }}
-
-                                {{ if .date }}
-                                    {{ $split := split .date "-" }}
-                                    {{ $month = index $split 0 }}
-                                {{ 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>
+                            {{ if .date }}
+                                {{ $split := split .date "-" }}
+                                {{ $month = index $split 0 }}
                             {{ end }}
 
-                        </div>
-                    {{ 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 }}
diff --git a/themes/red/layouts/_default/listart.html b/themes/red/layouts/_default/listart.html
index 3229f46..1bfdf4d 100644
--- a/themes/red/layouts/_default/listart.html
+++ b/themes/red/layouts/_default/listart.html
@@ -6,5 +6,4 @@
         <li><a href="{{ "/tags/" | relLangURL }}{{ $name | urlize }}">{{ $name }}</a></li>
     {{ end }}
     </ul>
-
 {{ end }}