Move input files into input/ for better file management

docs/posts/feed.xml

@@ -1,5 +1,5 @@
 <?xml version="1.0"?>
-<feed xmlns="http://www.w3.org/2005/Atom" xml:base="https://vale.rocks" xml:lang="en-AU"><title>Vale.Rocks</title><id>https://vale.rocks</id><updated>2024-07-02T07:52:11.126000752+00:00</updated><generator uri="http://adduce.vale.rocks" version="0.1.6">Adduce</generator><rights>© Declan Chidlow</rights><subtitle>A collection of unhinged (yet not completely insane) ramblings.</subtitle><entry><title>I-Got-A-Flipper-Zero.html</title><id></id><updated>1970-01-01T00:00:00+00:00</updated><content>&lt;!DOCTYPE html&gt;
+<feed xmlns="http://www.w3.org/2005/Atom" xml:base="https://vale.rocks" xml:lang="en-AU"><title>Vale.Rocks</title><id>https://vale.rocks</id><updated>2024-07-02T07:57:42.325026260+00:00</updated><generator uri="http://adduce.vale.rocks" version="0.1.6">Adduce</generator><rights>© Declan Chidlow</rights><subtitle>A collection of unhinged (yet not completely insane) ramblings.</subtitle><entry><title>I-Got-A-Flipper-Zero.html</title><id></id><updated>1970-01-01T00:00:00+00:00</updated><content>&lt;!DOCTYPE html&gt;
 &lt;html lang=&quot;en&quot;&gt;
 &lt;head&gt;
 	&lt;meta charset=&quot;UTF-8&quot;&gt;

gen.sh

@@ -2,23 +2,23 @@
 
 # Generate standard pages
 pages=(
-    "config/pages/index index.html"
-    "config/pages/posts posts.html"
-    "config/pages/portfolio portfolio.html"
-    "config/pages/contact contact.html"
-    "config/pages/support support.html"
-    "config/pages/services services.html"
-	"config/pages/404 404.html"
+    "input/pages/index index.html"
+    "input/pages/posts posts.html"
+    "input/pages/portfolio portfolio.html"
+    "input/pages/contact contact.html"
+    "input/pages/support support.html"
+    "input/pages/services services.html"
+	"input/pages/404 404.html"
 )
 
-for page_config in "${pages[@]}"; do
-    page="${page_config%% *}"
-    output="${page_config#* }"
+for page_input in "${pages[@]}"; do
+    page="${page_input%% *}"
+    output="${page_input#* }"
     adduce -c "$page" -n "$output" -o docs
 done
 
 # Generate posts
-cd posts || exit
+cd input/posts || exit
 post_feeds=(
     "Welcome"
     "School-Internet"
@@ -39,11 +39,11 @@ for feed in "${post_feeds[@]}"; do
     adduce feed export "$feed"
 done
 adduce feed atom
-cp -r export/. ../docs/posts
-cd ..
+cp -r export/. ../../docs/posts
+cd ../..
 
 # Generate portfolio items
-cd portfolio || exit
+cd input/portfolio || exit
 portfolio_feeds=(
     "Mutant-Remix"
     "CapChord"
@@ -54,10 +54,10 @@ portfolio_feeds=(
 for feed in "${portfolio_feeds[@]}"; do
     adduce feed export "$feed"
 done
-cp -r export/. ../docs/portfolio
-cd ..
+cp -r export/. ../../docs/portfolio
+cd ../..
 
 # Copy global styles and assets
-cp -r config/global/assets docs/
-cp -r config/global/styles docs/
-cp -r config/global/scripts docs/
+cp -r input/global/assets docs/
+cp -r input/global/styles docs/
+cp -r input/global/scripts docs/

input/pages/404/conf.toml

@@ -0,0 +1,21 @@
+[main]
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/pages/404/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/navbar.html"
+
+[[main.block]]
+format = "md"
+content_file = "input/pages/404/404.md"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/footer.html"

input/pages/contact/conf.toml

@@ -0,0 +1,21 @@
+[main]
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/pages/contact/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/navbar.html"
+
+[[main.block]]
+format = "md"
+content_file = "input/pages/contact/contact.md"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/footer.html"

input/pages/index/conf.toml

@@ -0,0 +1,21 @@
+[main]
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/pages/index/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/navbar.html"
+
+[[main.block]]
+format = "md"
+content_file = "input/pages/index/index.md"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/footer.html"

input/pages/portfolio/conf.toml

@@ -0,0 +1,21 @@
+[main]
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/pages/portfolio/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/navbar.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/pages/portfolio/portfolio.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/footer.html"

input/pages/posts/conf.toml

@@ -0,0 +1,21 @@
+[main]
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/pages/posts/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/navbar.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/pages/posts/posts.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/footer.html"

input/pages/services/conf.toml

@@ -0,0 +1,21 @@
+[main]
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/pages/services/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/navbar.html"
+
+[[main.block]]
+format = "md"
+content_file = "input/pages/services/services.md"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/footer.html"

input/pages/support/conf.toml

@@ -0,0 +1,21 @@
+[main]
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/pages/support/head.html"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/navbar.html"
+
+[[main.block]]
+format = "md"
+content_file = "input/pages/support/support.md"
+
+[[main.block]]
+format = "html"
+content_file = "input/global/elements/footer.html"