From 9305688c94c76e47d174738254fc59798fd168e3 Mon Sep 17 00:00:00 2001 From: Adam Goldsmith Date: Fri, 9 Mar 2018 17:23:47 -0500 Subject: [PATCH] Reorganize articles with images into their own folders such that I don't have to deal with naming/organizing an images directory --- content/articles/{ => TREE}/TREE.md | 6 +++--- .../{images/2017/11 => articles/TREE}/TREE_4.jpg | Bin .../{images/2017/11 => articles/TREE}/TREE_8.jpg | Bin .../2017/11 => articles/TREE}/TREE_final.jpg | Bin .../i-drew-a-hand}/IMG_20140923_082804.jpg | Bin .../articles/{ => i-drew-a-hand}/i-drew-a-hand.md | 2 +- .../IMG_20141014_201449-e1413332655124.jpg | Bin .../IMG_20141014_201524-e1413332786872.jpg | Bin content/articles/{ => new-pebble}/new-pebble.md | 4 ++-- .../robotics-tournament-and-exam-week}/DSC00171.jpg | Bin .../robotics-tournament-and-exam-week}/DSC00314.jpg | Bin .../robotics-tournament-and-exam-week.md | 6 ++---- .../2017/11 => articles/room}/Room_A_composite.jpg | Bin .../2017/11 => articles/room}/Room_B_composite.jpg | Bin content/articles/{ => room}/room.md | 4 ++-- pelicanconf.py | 2 +- 16 files changed, 11 insertions(+), 13 deletions(-) rename content/articles/{ => TREE}/TREE.md (53%) rename content/{images/2017/11 => articles/TREE}/TREE_4.jpg (100%) rename content/{images/2017/11 => articles/TREE}/TREE_8.jpg (100%) rename content/{images/2017/11 => articles/TREE}/TREE_final.jpg (100%) rename content/{images/2014/10 => articles/i-drew-a-hand}/IMG_20140923_082804.jpg (100%) rename content/articles/{ => i-drew-a-hand}/i-drew-a-hand.md (73%) rename content/{images/2014/10 => articles/new-pebble}/IMG_20141014_201449-e1413332655124.jpg (100%) rename content/{images/2014/10 => articles/new-pebble}/IMG_20141014_201524-e1413332786872.jpg (100%) rename content/articles/{ => new-pebble}/new-pebble.md (86%) rename content/{images/2015/03 => articles/robotics-tournament-and-exam-week}/DSC00171.jpg (100%) rename content/{images/2015/03 => articles/robotics-tournament-and-exam-week}/DSC00314.jpg (100%) rename content/articles/{ => robotics-tournament-and-exam-week}/robotics-tournament-and-exam-week.md (86%) rename content/{images/2017/11 => articles/room}/Room_A_composite.jpg (100%) rename content/{images/2017/11 => articles/room}/Room_B_composite.jpg (100%) rename content/articles/{ => room}/room.md (63%) diff --git a/content/articles/TREE.md b/content/articles/TREE/TREE.md similarity index 53% rename from content/articles/TREE.md rename to content/articles/TREE/TREE.md index de27d85..ed80466 100644 --- a/content/articles/TREE.md +++ b/content/articles/TREE/TREE.md @@ -4,8 +4,8 @@ Author: adam Category: WPI Status: published -![TreeA]({filename}/images/2017/11/TREE_4.jpg) +![TreeA]({attach}TREE_4.jpg) About 3 hours of work later... -![TreeB]({filename}/images/2017/11/TREE_8.jpg) +![TreeB]({attach}TREE_8.jpg) And about 10 hours of work and rendering after that: -![TreeC]({filename}/images/2017/11/TREE_final.jpg) +![TreeC]({attach}TREE_final.jpg) diff --git a/content/images/2017/11/TREE_4.jpg b/content/articles/TREE/TREE_4.jpg similarity index 100% rename from content/images/2017/11/TREE_4.jpg rename to content/articles/TREE/TREE_4.jpg diff --git a/content/images/2017/11/TREE_8.jpg b/content/articles/TREE/TREE_8.jpg similarity index 100% rename from content/images/2017/11/TREE_8.jpg rename to content/articles/TREE/TREE_8.jpg diff --git a/content/images/2017/11/TREE_final.jpg b/content/articles/TREE/TREE_final.jpg similarity index 100% rename from content/images/2017/11/TREE_final.jpg rename to content/articles/TREE/TREE_final.jpg diff --git a/content/images/2014/10/IMG_20140923_082804.jpg b/content/articles/i-drew-a-hand/IMG_20140923_082804.jpg similarity index 100% rename from content/images/2014/10/IMG_20140923_082804.jpg rename to content/articles/i-drew-a-hand/IMG_20140923_082804.jpg diff --git a/content/articles/i-drew-a-hand.md b/content/articles/i-drew-a-hand/i-drew-a-hand.md similarity index 73% rename from content/articles/i-drew-a-hand.md rename to content/articles/i-drew-a-hand/i-drew-a-hand.md index 2890146..eb1b62f 100644 --- a/content/articles/i-drew-a-hand.md +++ b/content/articles/i-drew-a-hand/i-drew-a-hand.md @@ -8,4 +8,4 @@ Status: published I drew a hand for Drawing 1 (in the first week): -![Hand Drawing]({filename}/images/2014/10/IMG_20140923_082804.jpg) +![Hand Drawing]({attach}IMG_20140923_082804.jpg) diff --git a/content/images/2014/10/IMG_20141014_201449-e1413332655124.jpg b/content/articles/new-pebble/IMG_20141014_201449-e1413332655124.jpg similarity index 100% rename from content/images/2014/10/IMG_20141014_201449-e1413332655124.jpg rename to content/articles/new-pebble/IMG_20141014_201449-e1413332655124.jpg diff --git a/content/images/2014/10/IMG_20141014_201524-e1413332786872.jpg b/content/articles/new-pebble/IMG_20141014_201524-e1413332786872.jpg similarity index 100% rename from content/images/2014/10/IMG_20141014_201524-e1413332786872.jpg rename to content/articles/new-pebble/IMG_20141014_201524-e1413332786872.jpg diff --git a/content/articles/new-pebble.md b/content/articles/new-pebble/new-pebble.md similarity index 86% rename from content/articles/new-pebble.md rename to content/articles/new-pebble/new-pebble.md index a3b1602..73f65b2 100644 --- a/content/articles/new-pebble.md +++ b/content/articles/new-pebble/new-pebble.md @@ -8,8 +8,8 @@ Status: published I had to RMA my Kickstarter Pebble, so they shipped me a new one. Here are some pictures of the two: -![Fronts]({filename}/images/2014/10/IMG_20141014_201524-e1413332786872.jpg) -![Backs]({filename}/images/2014/10/IMG_20141014_201449-e1413332655124.jpg) +![Fronts]({attach}IMG_20141014_201524-e1413332786872.jpg) +![Backs]({attach}IMG_20141014_201449-e1413332655124.jpg) I am using [PebbleBits](http://pebblebits.com/) firmware with all firmware watchfaces as well the music and watchfaces apps disabled. With new QuickLaunch shortcuts and PebbleBits' BackLaunchBank14, I can run all of my apps without entering the menu (except alarms, notifications, and settings, which are now at the top). diff --git a/content/images/2015/03/DSC00171.jpg b/content/articles/robotics-tournament-and-exam-week/DSC00171.jpg similarity index 100% rename from content/images/2015/03/DSC00171.jpg rename to content/articles/robotics-tournament-and-exam-week/DSC00171.jpg diff --git a/content/images/2015/03/DSC00314.jpg b/content/articles/robotics-tournament-and-exam-week/DSC00314.jpg similarity index 100% rename from content/images/2015/03/DSC00314.jpg rename to content/articles/robotics-tournament-and-exam-week/DSC00314.jpg diff --git a/content/articles/robotics-tournament-and-exam-week.md b/content/articles/robotics-tournament-and-exam-week/robotics-tournament-and-exam-week.md similarity index 86% rename from content/articles/robotics-tournament-and-exam-week.md rename to content/articles/robotics-tournament-and-exam-week/robotics-tournament-and-exam-week.md index 8539fd3..a389ee7 100644 --- a/content/articles/robotics-tournament-and-exam-week.md +++ b/content/articles/robotics-tournament-and-exam-week/robotics-tournament-and-exam-week.md @@ -3,9 +3,7 @@ Date: 2015-03-01 21:33 Author: adam Category: Robotics Tags: exams, FRC, rant, Robotics -Slug: robotics-tournament-and-exam-week Status: published -Attachments: images/2015/03/DSC00171.jpg, images/2015/03/DSC00314.jpg Soooooo... Yeah. Writing things... @@ -26,7 +24,7 @@ My thoughts on the game/competition: I have a bunch of stuff written down (in [todo.txt](https://github.com/ginatrapani/todo.txt-cli/), more on this later whenever I get around to it) for what needs to be done before our next competition (in Massachusetts, after break). Since robotics season (the winter trimester) is over, I can only hope things actually get done. -Here is a picture my dad took of our robot picking things up: [![Pick Up]({filename}/images/2015/03/DSC00171.jpg)]({filename}/images/2015/03/DSC00171.jpg) -And here is one of it putting things down: [![Put Down]({filename}/images/2015/03/DSC00314.jpg)]({filename}/images/2015/03/DSC00171.jpg) +Here is a picture my dad took of our robot picking things up: ![Pick Up]({attach}DSC00171.jpg) +And here is one of it putting things down: ![Put Down]({attach}DSC00314.jpg) Anyway, so this week is exam week (since robotics is always right before exams), and I am pretty tired/apathetic. I have three exams this time, up from one last trimester, meaning I should probably study, and this post is really just a way to procrastinate on that. diff --git a/content/images/2017/11/Room_A_composite.jpg b/content/articles/room/Room_A_composite.jpg similarity index 100% rename from content/images/2017/11/Room_A_composite.jpg rename to content/articles/room/Room_A_composite.jpg diff --git a/content/images/2017/11/Room_B_composite.jpg b/content/articles/room/Room_B_composite.jpg similarity index 100% rename from content/images/2017/11/Room_B_composite.jpg rename to content/articles/room/Room_B_composite.jpg diff --git a/content/articles/room.md b/content/articles/room/room.md similarity index 63% rename from content/articles/room.md rename to content/articles/room/room.md index fdd6822..6d8cd73 100644 --- a/content/articles/room.md +++ b/content/articles/room/room.md @@ -5,5 +5,5 @@ Category: WPI Status: published So I was just up all night (in the painfully literal sense) working on rendering a 3D model I made of the Octowedge. -![Angle A]({filename}/images/2017/11/Room_A_composite.jpg) -![Angle B]({filename}/images/2017/11/Room_B_composite.jpg) +![Angle A]({attach}Room_A_composite.jpg) +![Angle B]({attach}Room_B_composite.jpg) diff --git a/pelicanconf.py b/pelicanconf.py index 93234ed..ee9344c 100644 --- a/pelicanconf.py +++ b/pelicanconf.py @@ -18,7 +18,7 @@ ARTICLE_SAVE_AS = 'posts/{date:%Y}/{date:%b}/{date:%d}/{slug}.html' PAGE_URL = 'pages/{slug}.html' PAGE_SAVE_AS = 'pages/{slug}.html' -STATIC_PATHS = ['images'] +STATIC_PATHS = ['articles'] DEFAULT_PAGINATION = 10