diff --git a/src/App.ts b/src/App.ts index 759c80e..e5c6000 100644 --- a/src/App.ts +++ b/src/App.ts @@ -30,8 +30,18 @@ class Artwork if (json.video == null) json.video = type.video; // Check image null case - let base = type.type.toLowerCase() + '/' + - json.date.split(' ').join('-') + '-' + json.title.split(' ')[0].toLowerCase() + '/'; + let base; + if (type.folder != null) + { + base = type.folder.toLowerCase() + '/' + + json.date.split(' ').join('-') + '-' + json.title.split(' ')[0].toLowerCase() + '/'; + } + else + { + base = type.type.toLowerCase() + '/' + + json.date.split(' ').join('-') + '-' + json.title.split(' ')[0].toLowerCase() + '/'; + } + if (json.file == null) json.file = base + 'public.' + json.format; if (json.thumbnail == null) json.thumbnail = base + 'thumb.' + json.format; diff --git a/src/assets/photography/2019-10-17-entrance/public.jpg b/src/assets/photography/2019-10-17-entrance/public.jpg deleted file mode 100644 index 8407983..0000000 Binary files a/src/assets/photography/2019-10-17-entrance/public.jpg and /dev/null differ diff --git a/src/assets/photography/2019-10-17-entrance/thumb.jpg b/src/assets/photography/2019-10-17-entrance/thumb.jpg deleted file mode 100644 index 5343676..0000000 Binary files a/src/assets/photography/2019-10-17-entrance/thumb.jpg and /dev/null differ diff --git a/src/assets/photography/2019-10-23-flowey/public.jpg b/src/assets/photography/2019-10-23-flowey/public.jpg deleted file mode 100644 index d1d5ddc..0000000 Binary files a/src/assets/photography/2019-10-23-flowey/public.jpg and /dev/null differ diff --git a/src/assets/photography/2019-10-23-flowey/thumb.jpg b/src/assets/photography/2019-10-23-flowey/thumb.jpg deleted file mode 100644 index c86eef3..0000000 Binary files a/src/assets/photography/2019-10-23-flowey/thumb.jpg and /dev/null differ diff --git a/src/assets/photography/2019-10-30-serial/public.jpg b/src/assets/photography/2019-10-30-serial/public.jpg deleted file mode 100644 index f6b316d..0000000 Binary files a/src/assets/photography/2019-10-30-serial/public.jpg and /dev/null differ diff --git a/src/assets/photography/2019-10-30-serial/thumb.jpg b/src/assets/photography/2019-10-30-serial/thumb.jpg deleted file mode 100644 index 8870642..0000000 Binary files a/src/assets/photography/2019-10-30-serial/thumb.jpg and /dev/null differ diff --git a/src/assets/photography/2019-11-10-view/public.jpg b/src/assets/photography/2019-11-10-view/public.jpg deleted file mode 100644 index 866a073..0000000 Binary files a/src/assets/photography/2019-11-10-view/public.jpg and /dev/null differ diff --git a/src/assets/photography/2019-11-10-view/thumb.jpg b/src/assets/photography/2019-11-10-view/thumb.jpg deleted file mode 100644 index 19b8184..0000000 Binary files a/src/assets/photography/2019-11-10-view/thumb.jpg and /dev/null differ diff --git a/src/assets/photography/2019-11-21-frozen/public.jpg b/src/assets/photography/2019-11-21-frozen/public.jpg deleted file mode 100644 index 2cfbdb2..0000000 Binary files a/src/assets/photography/2019-11-21-frozen/public.jpg and /dev/null differ diff --git a/src/assets/photography/2019-11-21-frozen/thumb.jpg b/src/assets/photography/2019-11-21-frozen/thumb.jpg deleted file mode 100644 index 3427e2c..0000000 Binary files a/src/assets/photography/2019-11-21-frozen/thumb.jpg and /dev/null differ diff --git a/src/assets/photography/2019-12-20-squirrel/public.jpg b/src/assets/photography/2019-12-20-squirrel/public.jpg deleted file mode 100644 index 2afea75..0000000 Binary files a/src/assets/photography/2019-12-20-squirrel/public.jpg and /dev/null differ diff --git a/src/assets/photography/2019-12-20-squirrel/thumb.jpg b/src/assets/photography/2019-12-20-squirrel/thumb.jpg deleted file mode 100644 index 3876562..0000000 Binary files a/src/assets/photography/2019-12-20-squirrel/thumb.jpg and /dev/null differ diff --git a/src/content/config.json b/src/content/config.json index 176307f..a1c0b3b 100644 --- a/src/content/config.json +++ b/src/content/config.json @@ -25,7 +25,8 @@ "types": [ { - "type": "Painting", + "type": "Drawing & Painting", + "folder": "painting", "posts": [ {