Add guest art

content/art/_index.md

@@ -2,7 +2,7 @@
 title: Art
 layout: art
 summary: My personal art gallery.
-new_banner: 
+new_banner: A new section has been added, Guest Art!
 commissions: true
 aliases:
 - /gallery

content/art/guest/_index.md

@@ -0,0 +1,4 @@
+---
+title: Guest Art
+layout: guestart
+---

content/art/guest/guest-juritta1.md

@@ -0,0 +1,10 @@
+---
+artist: "SnickerPuffs"
+date: 2023-06-27
+layout: art-detail
+filename: /art/guest-juritta1.webp
+slug: guest-juritta1
+characters:
+- Juritta
+---
+Draw avatar above you challenge: https://knockout.chat/thread/634/15#post-1839973

content/art/guest/guest-juritta2.md

@@ -0,0 +1,10 @@
+---
+artist: "Vulpeculas"
+date: 2023-07-02
+layout: art-detail
+filename: /art/guest-juritta2.webp
+slug: guest-juritta2
+characters:
+- Juritta
+---
+Artfight Attack: https://artfight.net/attack/4145358.revenge-w-juritta-3

content/art/guest/guest-swordswoman1.md

@@ -0,0 +1,10 @@
+---
+artist: "nikkiwaffle"
+date: 2023-07-02
+layout: art-detail
+filename: /art/guest-swordswoman1.webp
+slug: guest-swordswoman1
+characters:
+- Mysterious Swordswoman
+---
+Artfight Attack: https://artfight.net/attack/4178441.awawa

content/art/guest/guest-swordswoman2.md

@@ -0,0 +1,10 @@
+---
+artist: "GrumpySeaFoam"
+date: 2023-07-02
+layout: art-detail
+filename: /art/guest-swordswoman2.webp
+slug: guest-swordswoman2
+characters:
+- Mysterious Swordswoman
+---
+Artfight Attack: https://artfight.net/attack/4178956.mysterious-swordswoman

data/art-config.json

@@ -4,6 +4,6 @@
                 "sketchmarch2",
                 "gamingforone"
         ],
-        "new-banner": "",
+        "new-banner": "A new section has been added, Guest Art!",
         "commissions": true
 }

data/recent-changes.json

@@ -1,5 +1,6 @@
 {
     "changes": [
+        "2023-07-02: Added recent Art Fight attacks, and Guest Art pages.",
         "2023-06-27: Added PS2 blog post, added Asuka thumbnail art.",
         "2023-06-26: Added a new blog post, improved tags/categories and added them to Blog & Software!",
         "2023-06-12: Added a changelog, updated some of the pages stylings. Hello!"

guestart/guest-juritta1.json

@@ -0,0 +1,8 @@
+{
+    "characters": [
+        "Juritta"
+    ],
+    "date": "2023-06-27",
+    "artist": "SnickerPuffs",
+    "description": "Draw avatar above you challenge: https://knockout.chat/thread/634/15#post-1839973"
+}

guestart/guest-juritta2.json

@@ -0,0 +1,8 @@
+{
+    "characters": [
+        "Juritta"
+    ],
+    "date": "2023-07-02",
+    "artist": "Vulpeculas",
+    "description": "Artfight Attack: https://artfight.net/attack/4145358.revenge-w-juritta-3"
+}

guestart/guest-swordswoman1.json

@@ -0,0 +1,9 @@
+{
+    "characters": [
+        "Mysterious Swordswoman"
+    ],
+    "date": "2023-07-02",
+    "artist": "nikkiwaffle",
+    "description": "Artfight Attack: https://artfight.net/attack/4178441.awawa"
+}
+

guestart/guest-swordswoman2.json

@@ -0,0 +1,9 @@
+{
+    "characters": [
+        "Mysterious Swordswoman"
+    ],
+    "date": "2023-07-02",
+    "artist": "GrumpySeaFoam",
+    "description": "Artfight Attack: https://artfight.net/attack/4178956.mysterious-swordswoman"
+}
+

scripts/gen_art.py

@@ -7,7 +7,7 @@ def write_field(f, key, value):
     f.write(key + ": " + value + "\n")
 
 
-def parse_art_json(output_directory, filename, json_file, threed = False, animation = False):
+def parse_art_json(output_directory, filename, json_file, threed = False, animation = False, guest = False):
     print(filename)
 
     json_data = json.load(json_file)
@@ -20,7 +20,11 @@ def parse_art_json(output_directory, filename, json_file, threed = False, animat
         else:
             year = int(json_data["date"])
 
-    base_directory = os.path.join(art_output_directory, str(year))
+    directory = str(year)
+    if guest:
+        directory = "guest"
+
+    base_directory = os.path.join(art_output_directory, directory)
     if not os.path.exists(base_directory):
         os.mkdir(base_directory)
 
@@ -30,6 +34,9 @@ def parse_art_json(output_directory, filename, json_file, threed = False, animat
         if "title" in json_data:
             write_field(f, 'title', "\"{}\"".format(json_data["title"]))
 
+        if "artist" in json_data:
+            write_field(f, 'artist', "\"{}\"".format(json_data["artist"]))
+
         if "date" in json_data:
             if "-" in json_data["date"]:
                 write_field(f, 'date', json_data["date"])
@@ -107,6 +114,7 @@ art_data_directory = '../art'
 threed_data_directory = '../3d'
 animation_data_directory = '../animation'
 art_output_directory = '../content/art'
+guest_art_data_directory = '../guestart'
 
 shutil.rmtree(art_output_directory)
 os.mkdir(art_output_directory)
@@ -287,3 +295,26 @@ with open(art_output_directory + '/stats/_index.md', 'w') as f:
         f.write('  num: ' + str(num) + '\n')
 
     f.write('---\n')
+
+# guest art
+os.mkdir(art_output_directory + "/guest")
+
+with open(art_output_directory + '/guest/_index.md', 'w') as f:
+    f.write('---\n')
+
+    write_field(f, 'title', 'Guest Art')
+    write_field(f, 'layout', 'guestart')
+
+    f.write('---\n')
+
+for filename in os.listdir(guest_art_data_directory):
+    f = os.path.join(guest_art_data_directory, filename)
+
+    if os.path.isfile(f):
+        filename_without_ext = os.path.splitext(filename)[0]
+
+        if filename_without_ext == ".DS_Store" or filename_without_ext == ".directory":
+            continue
+
+        with open(f, "r") as file:
+            year, characters, tags = parse_art_json(art_output_directory, filename_without_ext, file, False, False, True)

themes/red/assets/js/gallery.js

@@ -6,3 +6,12 @@ imagesLoaded(document.querySelector('.grid'), function(instance) {
         gutter: '.gutter-sizer'
     });
 });
+
+imagesLoaded(document.querySelector('.second-grid'), function(instance) {
+    new Masonry('.second-grid', {
+        itemSelector: '.grid-item',
+        columnWidth: '.grid-sizer',
+        percentPosition: true,
+        gutter: '.gutter-sizer'
+    });
+});

themes/red/layouts/_default/art-detail.html

@@ -55,6 +55,15 @@
             </tr>
         {{ end }}
 
+        {{ with .Params.artist }}
+            <tr>
+                <th>Artist</th>
+                <td>
+                    {{ . }}
+                </td>
+            </tr>
+        {{ end }}
+
         {{ with .Params.program }}
             <tr>
                 <th>Program</th>

themes/red/layouts/_default/art.html

@@ -36,6 +36,7 @@
         <a class="art-button" href="/art/characters">Characters</a>
         <a class="art-button" href="/art/tags">Tags</a>
         <a class="art-button" href="/art/stats">Stats</a>
+        <a class="art-button" href="/art/guest">Guest Art</a>
 
         {{ if $.Params.commissions }}
         <a class="art-button" href="/commission">Commissions</a>

themes/red/layouts/_default/guestart.html

@@ -0,0 +1,14 @@
+{{ define "main" }}
+    <h2>{{ .Title }}</h2>
+    <hr>
+
+    {{ $paginator := .Paginate (where .RegularPagesRecursive "Type" "art") }}
+
+    {{ if eq $paginator.PageNumber 1}}
+    <p>This is a collection of guest art made by other artists. The artist is listed in the details page of the artwork!</p>
+
+    <p>If you draw one of my characters, it will be featured on this page! If you want me to remove it for any reason (or maybe I forgot to add yours), please <a href="/contact">contact me</a>.</p>
+    {{ end }}
+
+    {{ partial "art-gallery" . }}
+{{ end }}

themes/red/layouts/partials/art-gallery.html

@@ -1,14 +1,35 @@
 {{ $paginator := .Paginate (where .RegularPagesRecursive "Type" "art") }}
+{{ $guest := false }}
 
 <div class="grid">
     <div class="grid-sizer"></div>
     <div class="gutter-sizer"></div>
 
     {{ range $paginator.Pages }}
+        {{ if in .File.Dir "art/guest" }}
+            {{ $guest = true }}
+        {{ else }}
             {{ partial "render-art" . }}
         {{ end }}
+    {{ end }}
 </div>
 
+{{ if $guest }}
+<h3>Guest Art</h3>
+<hr/>
+<div class="second-grid">
+    <div class="grid-sizer"></div>
+    <div class="gutter-sizer"></div>
+
+    {{ range $paginator.Pages }}
+        {{ if in .File.Dir "art/guest" }}
+            {{ partial "render-art" . }}
+        {{ end }}
+    {{ end }}
+</div>
+
+{{ end }}
+
 <div style="text-align: center;">
 
 {{ with $paginator.Prev }}