diff --git a/assets/art/guest-juritta1.webp b/assets/art/guest-juritta1.webp new file mode 100644 index 0000000..2fbb18c Binary files /dev/null and b/assets/art/guest-juritta1.webp differ diff --git a/assets/art/guest-juritta2.webp b/assets/art/guest-juritta2.webp new file mode 100644 index 0000000..e071ab0 Binary files /dev/null and b/assets/art/guest-juritta2.webp differ diff --git a/assets/art/guest-swordswoman1.webp b/assets/art/guest-swordswoman1.webp new file mode 100644 index 0000000..1613e9c Binary files /dev/null and b/assets/art/guest-swordswoman1.webp differ diff --git a/assets/art/guest-swordswoman2.webp b/assets/art/guest-swordswoman2.webp new file mode 100644 index 0000000..fd2ff1d Binary files /dev/null and b/assets/art/guest-swordswoman2.webp differ diff --git a/content/art/_index.md b/content/art/_index.md index bfc8682..559fd66 100644 --- a/content/art/_index.md +++ b/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 diff --git a/content/art/guest/_index.md b/content/art/guest/_index.md new file mode 100644 index 0000000..542ae3e --- /dev/null +++ b/content/art/guest/_index.md @@ -0,0 +1,4 @@ +--- +title: Guest Art +layout: guestart +--- diff --git a/content/art/guest/guest-juritta1.md b/content/art/guest/guest-juritta1.md new file mode 100644 index 0000000..eec509e --- /dev/null +++ b/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 diff --git a/content/art/guest/guest-juritta2.md b/content/art/guest/guest-juritta2.md new file mode 100644 index 0000000..e3a298a --- /dev/null +++ b/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 diff --git a/content/art/guest/guest-swordswoman1.md b/content/art/guest/guest-swordswoman1.md new file mode 100644 index 0000000..4fd30ee --- /dev/null +++ b/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 diff --git a/content/art/guest/guest-swordswoman2.md b/content/art/guest/guest-swordswoman2.md new file mode 100644 index 0000000..4cd6f3f --- /dev/null +++ b/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 diff --git a/data/art-config.json b/data/art-config.json index 50dbcc7..a90c595 100644 --- a/data/art-config.json +++ b/data/art-config.json @@ -4,6 +4,6 @@ "sketchmarch2", "gamingforone" ], - "new-banner": "", + "new-banner": "A new section has been added, Guest Art!", "commissions": true } diff --git a/data/recent-changes.json b/data/recent-changes.json index 99f9a31..c23e8a4 100644 --- a/data/recent-changes.json +++ b/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!" diff --git a/guestart/guest-juritta1.json b/guestart/guest-juritta1.json new file mode 100644 index 0000000..fa85ed7 --- /dev/null +++ b/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" +} diff --git a/guestart/guest-juritta2.json b/guestart/guest-juritta2.json new file mode 100644 index 0000000..5aaf7ef --- /dev/null +++ b/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" +} diff --git a/guestart/guest-swordswoman1.json b/guestart/guest-swordswoman1.json new file mode 100644 index 0000000..d54cf22 --- /dev/null +++ b/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" +} + diff --git a/guestart/guest-swordswoman2.json b/guestart/guest-swordswoman2.json new file mode 100644 index 0000000..304f376 --- /dev/null +++ b/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" +} + diff --git a/resources/_gen/images/guest-juritta1_hu9609f00b610f88ce483856bb42d12d89_104348_400x0_resize_q90_h3_box_2.webp b/resources/_gen/images/guest-juritta1_hu9609f00b610f88ce483856bb42d12d89_104348_400x0_resize_q90_h3_box_2.webp new file mode 100644 index 0000000..a5efec6 Binary files /dev/null and b/resources/_gen/images/guest-juritta1_hu9609f00b610f88ce483856bb42d12d89_104348_400x0_resize_q90_h3_box_2.webp differ diff --git a/resources/_gen/images/guest-juritta2_hu42301ebb3596302f007b7edea423d12b_111306_400x0_resize_q90_h3_box_2.webp b/resources/_gen/images/guest-juritta2_hu42301ebb3596302f007b7edea423d12b_111306_400x0_resize_q90_h3_box_2.webp new file mode 100644 index 0000000..1d6b8a4 Binary files /dev/null and b/resources/_gen/images/guest-juritta2_hu42301ebb3596302f007b7edea423d12b_111306_400x0_resize_q90_h3_box_2.webp differ diff --git a/resources/_gen/images/guest-swordswoman1_hu928eb7871b57d0d47dc23ae65b2d6a8f_124214_400x0_resize_q90_h3_box_2.webp b/resources/_gen/images/guest-swordswoman1_hu928eb7871b57d0d47dc23ae65b2d6a8f_124214_400x0_resize_q90_h3_box_2.webp new file mode 100644 index 0000000..effa29f Binary files /dev/null and b/resources/_gen/images/guest-swordswoman1_hu928eb7871b57d0d47dc23ae65b2d6a8f_124214_400x0_resize_q90_h3_box_2.webp differ diff --git a/resources/_gen/images/guest-swordswoman2_hue85a91f91f1604f79bd538c333397e40_34768_400x0_resize_q90_h3_box_2.webp b/resources/_gen/images/guest-swordswoman2_hue85a91f91f1604f79bd538c333397e40_34768_400x0_resize_q90_h3_box_2.webp new file mode 100644 index 0000000..f86f80b Binary files /dev/null and b/resources/_gen/images/guest-swordswoman2_hue85a91f91f1604f79bd538c333397e40_34768_400x0_resize_q90_h3_box_2.webp differ diff --git a/scripts/gen_art.py b/scripts/gen_art.py index 156558b..0f06199 100644 --- a/scripts/gen_art.py +++ b/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) diff --git a/themes/red/assets/js/gallery.js b/themes/red/assets/js/gallery.js index 7eb81e9..b86d597 100644 --- a/themes/red/assets/js/gallery.js +++ b/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' + }); +}); diff --git a/themes/red/layouts/_default/art-detail.html b/themes/red/layouts/_default/art-detail.html index 0e4d51b..e67545d 100644 --- a/themes/red/layouts/_default/art-detail.html +++ b/themes/red/layouts/_default/art-detail.html @@ -55,6 +55,15 @@ {{ end }} + {{ with .Params.artist }} + + Artist + + {{ . }} + + + {{ end }} + {{ with .Params.program }} Program diff --git a/themes/red/layouts/_default/art.html b/themes/red/layouts/_default/art.html index 47201c8..ae6c181 100644 --- a/themes/red/layouts/_default/art.html +++ b/themes/red/layouts/_default/art.html @@ -36,6 +36,7 @@ Characters Tags Stats + Guest Art {{ if $.Params.commissions }} Commissions diff --git a/themes/red/layouts/_default/guestart.html b/themes/red/layouts/_default/guestart.html new file mode 100644 index 0000000..3e29eab --- /dev/null +++ b/themes/red/layouts/_default/guestart.html @@ -0,0 +1,14 @@ +{{ define "main" }} +

{{ .Title }}

+
+ + {{ $paginator := .Paginate (where .RegularPagesRecursive "Type" "art") }} + + {{ if eq $paginator.PageNumber 1}} +

This is a collection of guest art made by other artists. The artist is listed in the details page of the artwork!

+ +

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 contact me.

+ {{ end }} + + {{ partial "art-gallery" . }} +{{ end }} diff --git a/themes/red/layouts/partials/art-gallery.html b/themes/red/layouts/partials/art-gallery.html index d043604..486a757 100644 --- a/themes/red/layouts/partials/art-gallery.html +++ b/themes/red/layouts/partials/art-gallery.html @@ -1,14 +1,35 @@ {{ $paginator := .Paginate (where .RegularPagesRecursive "Type" "art") }} +{{ $guest := false }}
{{ range $paginator.Pages }} + {{ if in .File.Dir "art/guest" }} + {{ $guest = true }} + {{ else }} {{ partial "render-art" . }} + {{ end }} {{ end }}
+{{ if $guest }} +

Guest Art

+
+
+
+
+ + {{ range $paginator.Pages }} + {{ if in .File.Dir "art/guest" }} + {{ partial "render-art" . }} + {{ end }} + {{ end }} +
+ +{{ end }} +
{{ with $paginator.Prev }}