diff --git a/config/pages/404/conf.toml b/config/pages/404/conf.toml deleted file mode 100755 index 8cf21be..0000000 --- a/config/pages/404/conf.toml +++ /dev/null @@ -1,21 +0,0 @@ -[main] - -[[main.block]] -format = "html" -content_file = "config/global/elements/head.html" - -[[main.block]] -format = "html" -content_file = "config/pages/404/head.html" - -[[main.block]] -format = "html" -content_file = "config/global/elements/navbar.html" - -[[main.block]] -format = "md" -content_file = "config/pages/404/404.md" - -[[main.block]] -format = "html" -content_file = "config/global/elements/footer.html" diff --git a/config/pages/contact/conf.toml b/config/pages/contact/conf.toml deleted file mode 100755 index bc1180e..0000000 --- a/config/pages/contact/conf.toml +++ /dev/null @@ -1,21 +0,0 @@ -[main] - -[[main.block]] -format = "html" -content_file = "config/global/elements/head.html" - -[[main.block]] -format = "html" -content_file = "config/pages/contact/head.html" - -[[main.block]] -format = "html" -content_file = "config/global/elements/navbar.html" - -[[main.block]] -format = "md" -content_file = "config/pages/contact/contact.md" - -[[main.block]] -format = "html" -content_file = "config/global/elements/footer.html" diff --git a/config/pages/index/conf.toml b/config/pages/index/conf.toml deleted file mode 100755 index 4c28ef4..0000000 --- a/config/pages/index/conf.toml +++ /dev/null @@ -1,21 +0,0 @@ -[main] - -[[main.block]] -format = "html" -content_file = "config/global/elements/head.html" - -[[main.block]] -format = "html" -content_file = "config/pages/index/head.html" - -[[main.block]] -format = "html" -content_file = "config/global/elements/navbar.html" - -[[main.block]] -format = "md" -content_file = "config/pages/index/index.md" - -[[main.block]] -format = "html" -content_file = "config/global/elements/footer.html" diff --git a/config/pages/portfolio/conf.toml b/config/pages/portfolio/conf.toml deleted file mode 100755 index a13d4db..0000000 --- a/config/pages/portfolio/conf.toml +++ /dev/null @@ -1,21 +0,0 @@ -[main] - -[[main.block]] -format = "html" -content_file = "config/global/elements/head.html" - -[[main.block]] -format = "html" -content_file = "config/pages/portfolio/head.html" - -[[main.block]] -format = "html" -content_file = "config/global/elements/navbar.html" - -[[main.block]] -format = "html" -content_file = "config/pages/portfolio/portfolio.html" - -[[main.block]] -format = "html" -content_file = "config/global/elements/footer.html" diff --git a/config/pages/posts/conf.toml b/config/pages/posts/conf.toml deleted file mode 100755 index ba5546f..0000000 --- a/config/pages/posts/conf.toml +++ /dev/null @@ -1,21 +0,0 @@ -[main] - -[[main.block]] -format = "html" -content_file = "config/global/elements/head.html" - -[[main.block]] -format = "html" -content_file = "config/pages/posts/head.html" - -[[main.block]] -format = "html" -content_file = "config/global/elements/navbar.html" - -[[main.block]] -format = "html" -content_file = "config/pages/posts/posts.html" - -[[main.block]] -format = "html" -content_file = "config/global/elements/footer.html" diff --git a/config/pages/services/conf.toml b/config/pages/services/conf.toml deleted file mode 100755 index 868ed33..0000000 --- a/config/pages/services/conf.toml +++ /dev/null @@ -1,21 +0,0 @@ -[main] - -[[main.block]] -format = "html" -content_file = "config/global/elements/head.html" - -[[main.block]] -format = "html" -content_file = "config/pages/services/head.html" - -[[main.block]] -format = "html" -content_file = "config/global/elements/navbar.html" - -[[main.block]] -format = "md" -content_file = "config/pages/services/services.md" - -[[main.block]] -format = "html" -content_file = "config/global/elements/footer.html" diff --git a/config/pages/support/conf.toml b/config/pages/support/conf.toml deleted file mode 100755 index 54bfc38..0000000 --- a/config/pages/support/conf.toml +++ /dev/null @@ -1,21 +0,0 @@ -[main] - -[[main.block]] -format = "html" -content_file = "config/global/elements/head.html" - -[[main.block]] -format = "html" -content_file = "config/pages/support/head.html" - -[[main.block]] -format = "html" -content_file = "config/global/elements/navbar.html" - -[[main.block]] -format = "md" -content_file = "config/pages/support/support.md" - -[[main.block]] -format = "html" -content_file = "config/global/elements/footer.html" diff --git a/docs/posts/feed.xml b/docs/posts/feed.xml index 55a8248..53d498a 100644 --- a/docs/posts/feed.xml +++ b/docs/posts/feed.xml @@ -1,5 +1,5 @@ -Vale.Rockshttps://vale.rocks2024-07-02T07:52:11.126000752+00:00Adduce© Declan ChidlowA collection of unhinged (yet not completely insane) ramblings.I-Got-A-Flipper-Zero.html1970-01-01T00:00:00+00:00<!DOCTYPE html> +Vale.Rockshttps://vale.rocks2024-07-02T07:57:42.325026260+00:00Adduce© Declan ChidlowA collection of unhinged (yet not completely insane) ramblings.I-Got-A-Flipper-Zero.html1970-01-01T00:00:00+00:00<!DOCTYPE html> <html lang="en"> <head> <meta charset="UTF-8"> diff --git a/gen.sh b/gen.sh index 7f8d596..9df1340 100755 --- a/gen.sh +++ b/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/ diff --git a/config/global/assets/blog/I_Got_A_Flipper_Zero/flipper_zero_picture.png b/input/global/assets/blog/I_Got_A_Flipper_Zero/flipper_zero_picture.png similarity index 100% rename from config/global/assets/blog/I_Got_A_Flipper_Zero/flipper_zero_picture.png rename to input/global/assets/blog/I_Got_A_Flipper_Zero/flipper_zero_picture.png diff --git a/config/global/assets/blog/JPEG_XL_And_Googles_War_Against_It/jxl_support.jxl b/input/global/assets/blog/JPEG_XL_And_Googles_War_Against_It/jxl_support.jxl similarity index 100% rename from config/global/assets/blog/JPEG_XL_And_Googles_War_Against_It/jxl_support.jxl rename to input/global/assets/blog/JPEG_XL_And_Googles_War_Against_It/jxl_support.jxl diff --git a/config/global/assets/blog/JPEG_XL_And_Googles_War_Against_It/no_jxl_support.png b/input/global/assets/blog/JPEG_XL_And_Googles_War_Against_It/no_jxl_support.png similarity index 100% rename from config/global/assets/blog/JPEG_XL_And_Googles_War_Against_It/no_jxl_support.png rename to input/global/assets/blog/JPEG_XL_And_Googles_War_Against_It/no_jxl_support.png diff --git a/config/global/assets/icons/ActivityPub.svg b/input/global/assets/icons/ActivityPub.svg similarity index 100% rename from config/global/assets/icons/ActivityPub.svg rename to input/global/assets/icons/ActivityPub.svg diff --git a/config/global/assets/icons/Bluesky.svg b/input/global/assets/icons/Bluesky.svg similarity index 100% rename from config/global/assets/icons/Bluesky.svg rename to input/global/assets/icons/Bluesky.svg diff --git a/config/global/assets/icons/GitHub.svg b/input/global/assets/icons/GitHub.svg similarity index 100% rename from config/global/assets/icons/GitHub.svg rename to input/global/assets/icons/GitHub.svg diff --git a/config/global/assets/icons/LinkedIn.svg b/input/global/assets/icons/LinkedIn.svg similarity index 100% rename from config/global/assets/icons/LinkedIn.svg rename to input/global/assets/icons/LinkedIn.svg diff --git a/config/global/assets/icons/RSS.svg b/input/global/assets/icons/RSS.svg similarity index 100% rename from config/global/assets/icons/RSS.svg rename to input/global/assets/icons/RSS.svg diff --git a/config/global/assets/icons/Unsplash.svg b/input/global/assets/icons/Unsplash.svg similarity index 100% rename from config/global/assets/icons/Unsplash.svg rename to input/global/assets/icons/Unsplash.svg diff --git a/config/global/assets/icons/close.svg b/input/global/assets/icons/close.svg similarity index 100% rename from config/global/assets/icons/close.svg rename to input/global/assets/icons/close.svg diff --git a/config/global/assets/typefaces/Fira_Code/FiraCode-VariableFont_wght.ttf b/input/global/assets/typefaces/Fira_Code/FiraCode-VariableFont_wght.ttf similarity index 100% rename from config/global/assets/typefaces/Fira_Code/FiraCode-VariableFont_wght.ttf rename to input/global/assets/typefaces/Fira_Code/FiraCode-VariableFont_wght.ttf diff --git a/config/global/assets/typefaces/Fira_Code/OFL.txt b/input/global/assets/typefaces/Fira_Code/OFL.txt similarity index 100% rename from config/global/assets/typefaces/Fira_Code/OFL.txt rename to input/global/assets/typefaces/Fira_Code/OFL.txt diff --git a/config/global/assets/typefaces/Lexend/Lexend-VariableFont_wght.ttf b/input/global/assets/typefaces/Lexend/Lexend-VariableFont_wght.ttf similarity index 100% rename from config/global/assets/typefaces/Lexend/Lexend-VariableFont_wght.ttf rename to input/global/assets/typefaces/Lexend/Lexend-VariableFont_wght.ttf diff --git a/config/global/assets/typefaces/Lexend/OFL.txt b/input/global/assets/typefaces/Lexend/OFL.txt similarity index 100% rename from config/global/assets/typefaces/Lexend/OFL.txt rename to input/global/assets/typefaces/Lexend/OFL.txt diff --git a/config/global/assets/typefaces/Material_Symbols_Sharp/LICENSE.txt b/input/global/assets/typefaces/Material_Symbols_Sharp/LICENSE.txt similarity index 100% rename from config/global/assets/typefaces/Material_Symbols_Sharp/LICENSE.txt rename to input/global/assets/typefaces/Material_Symbols_Sharp/LICENSE.txt diff --git a/config/global/assets/typefaces/Material_Symbols_Sharp/MaterialSymbolsSharp-Regular.ttf b/input/global/assets/typefaces/Material_Symbols_Sharp/MaterialSymbolsSharp-Regular.ttf similarity index 100% rename from config/global/assets/typefaces/Material_Symbols_Sharp/MaterialSymbolsSharp-Regular.ttf rename to input/global/assets/typefaces/Material_Symbols_Sharp/MaterialSymbolsSharp-Regular.ttf diff --git a/config/global/elements/bloghead.html b/input/global/elements/bloghead.html similarity index 100% rename from config/global/elements/bloghead.html rename to input/global/elements/bloghead.html diff --git a/config/global/elements/footer.html b/input/global/elements/footer.html similarity index 100% rename from config/global/elements/footer.html rename to input/global/elements/footer.html diff --git a/config/global/elements/head.html b/input/global/elements/head.html similarity index 100% rename from config/global/elements/head.html rename to input/global/elements/head.html diff --git a/config/global/elements/navbar.html b/input/global/elements/navbar.html similarity index 100% rename from config/global/elements/navbar.html rename to input/global/elements/navbar.html diff --git a/config/global/scripts/figureview.js b/input/global/scripts/figureview.js similarity index 100% rename from config/global/scripts/figureview.js rename to input/global/scripts/figureview.js diff --git a/config/global/scripts/postsrefine.js b/input/global/scripts/postsrefine.js similarity index 100% rename from config/global/scripts/postsrefine.js rename to input/global/scripts/postsrefine.js diff --git a/config/global/scripts/puddle.js b/input/global/scripts/puddle.js similarity index 100% rename from config/global/scripts/puddle.js rename to input/global/scripts/puddle.js diff --git a/config/global/scripts/scrollfade.js b/input/global/scripts/scrollfade.js similarity index 100% rename from config/global/scripts/scrollfade.js rename to input/global/scripts/scrollfade.js diff --git a/config/global/scripts/syntax-highlighting.js b/input/global/scripts/syntax-highlighting.js similarity index 100% rename from config/global/scripts/syntax-highlighting.js rename to input/global/scripts/syntax-highlighting.js diff --git a/config/global/styles/animations/fade_in_up.css b/input/global/styles/animations/fade_in_up.css similarity index 100% rename from config/global/styles/animations/fade_in_up.css rename to input/global/styles/animations/fade_in_up.css diff --git a/config/global/styles/base/body.css b/input/global/styles/base/body.css similarity index 100% rename from config/global/styles/base/body.css rename to input/global/styles/base/body.css diff --git a/config/global/styles/base/reset.css b/input/global/styles/base/reset.css similarity index 100% rename from config/global/styles/base/reset.css rename to input/global/styles/base/reset.css diff --git a/config/global/styles/components/article_header.css b/input/global/styles/components/article_header.css similarity index 100% rename from config/global/styles/components/article_header.css rename to input/global/styles/components/article_header.css diff --git a/config/global/styles/components/figures.css b/input/global/styles/components/figures.css similarity index 100% rename from config/global/styles/components/figures.css rename to input/global/styles/components/figures.css diff --git a/config/global/styles/components/footer.css b/input/global/styles/components/footer.css similarity index 100% rename from config/global/styles/components/footer.css rename to input/global/styles/components/footer.css diff --git a/config/global/styles/components/input.css b/input/global/styles/components/input.css similarity index 100% rename from config/global/styles/components/input.css rename to input/global/styles/components/input.css diff --git a/config/global/styles/components/navbar.css b/input/global/styles/components/navbar.css similarity index 100% rename from config/global/styles/components/navbar.css rename to input/global/styles/components/navbar.css diff --git a/config/global/styles/components/section.css b/input/global/styles/components/section.css similarity index 100% rename from config/global/styles/components/section.css rename to input/global/styles/components/section.css diff --git a/config/global/styles/components/seperator.css b/input/global/styles/components/seperator.css similarity index 100% rename from config/global/styles/components/seperator.css rename to input/global/styles/components/seperator.css diff --git a/config/global/styles/pages/index.css b/input/global/styles/pages/index.css similarity index 100% rename from config/global/styles/pages/index.css rename to input/global/styles/pages/index.css diff --git a/config/global/styles/pages/portfolio.css b/input/global/styles/pages/portfolio.css similarity index 100% rename from config/global/styles/pages/portfolio.css rename to input/global/styles/pages/portfolio.css diff --git a/config/global/styles/pages/posts.css b/input/global/styles/pages/posts.css similarity index 100% rename from config/global/styles/pages/posts.css rename to input/global/styles/pages/posts.css diff --git a/config/global/styles/pages/services.css b/input/global/styles/pages/services.css similarity index 100% rename from config/global/styles/pages/services.css rename to input/global/styles/pages/services.css diff --git a/config/global/styles/pages/support.css b/input/global/styles/pages/support.css similarity index 100% rename from config/global/styles/pages/support.css rename to input/global/styles/pages/support.css diff --git a/config/global/styles/style.css b/input/global/styles/style.css similarity index 100% rename from config/global/styles/style.css rename to input/global/styles/style.css diff --git a/config/global/styles/type/alerts.css b/input/global/styles/type/alerts.css similarity index 100% rename from config/global/styles/type/alerts.css rename to input/global/styles/type/alerts.css diff --git a/config/global/styles/type/code.css b/input/global/styles/type/code.css similarity index 100% rename from config/global/styles/type/code.css rename to input/global/styles/type/code.css diff --git a/config/global/styles/type/faces.css b/input/global/styles/type/faces.css similarity index 100% rename from config/global/styles/type/faces.css rename to input/global/styles/type/faces.css diff --git a/config/global/styles/type/headers.css b/input/global/styles/type/headers.css similarity index 100% rename from config/global/styles/type/headers.css rename to input/global/styles/type/headers.css diff --git a/config/global/styles/type/links.css b/input/global/styles/type/links.css similarity index 100% rename from config/global/styles/type/links.css rename to input/global/styles/type/links.css diff --git a/config/global/styles/type/type.css b/input/global/styles/type/type.css similarity index 100% rename from config/global/styles/type/type.css rename to input/global/styles/type/type.css diff --git a/config/global/styles/variables/colours.css b/input/global/styles/variables/colours.css similarity index 100% rename from config/global/styles/variables/colours.css rename to input/global/styles/variables/colours.css diff --git a/config/pages/404/404.md b/input/pages/404/404.md similarity index 100% rename from config/pages/404/404.md rename to input/pages/404/404.md diff --git a/input/pages/404/conf.toml b/input/pages/404/conf.toml new file mode 100755 index 0000000..c21d0da --- /dev/null +++ b/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" diff --git a/config/pages/404/head.html b/input/pages/404/head.html similarity index 100% rename from config/pages/404/head.html rename to input/pages/404/head.html diff --git a/input/pages/contact/conf.toml b/input/pages/contact/conf.toml new file mode 100755 index 0000000..0be9f77 --- /dev/null +++ b/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" diff --git a/config/pages/contact/contact.md b/input/pages/contact/contact.md similarity index 100% rename from config/pages/contact/contact.md rename to input/pages/contact/contact.md diff --git a/config/pages/contact/head.html b/input/pages/contact/head.html similarity index 100% rename from config/pages/contact/head.html rename to input/pages/contact/head.html diff --git a/input/pages/index/conf.toml b/input/pages/index/conf.toml new file mode 100755 index 0000000..3def5c7 --- /dev/null +++ b/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" diff --git a/config/pages/index/head.html b/input/pages/index/head.html similarity index 100% rename from config/pages/index/head.html rename to input/pages/index/head.html diff --git a/config/pages/index/index.md b/input/pages/index/index.md similarity index 100% rename from config/pages/index/index.md rename to input/pages/index/index.md diff --git a/input/pages/portfolio/conf.toml b/input/pages/portfolio/conf.toml new file mode 100755 index 0000000..3666216 --- /dev/null +++ b/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" diff --git a/config/pages/portfolio/head.html b/input/pages/portfolio/head.html similarity index 100% rename from config/pages/portfolio/head.html rename to input/pages/portfolio/head.html diff --git a/config/pages/portfolio/portfolio.html b/input/pages/portfolio/portfolio.html similarity index 100% rename from config/pages/portfolio/portfolio.html rename to input/pages/portfolio/portfolio.html diff --git a/input/pages/posts/conf.toml b/input/pages/posts/conf.toml new file mode 100755 index 0000000..c90b7e9 --- /dev/null +++ b/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" diff --git a/config/pages/posts/head.html b/input/pages/posts/head.html similarity index 100% rename from config/pages/posts/head.html rename to input/pages/posts/head.html diff --git a/config/pages/posts/posts.html b/input/pages/posts/posts.html similarity index 100% rename from config/pages/posts/posts.html rename to input/pages/posts/posts.html diff --git a/input/pages/services/conf.toml b/input/pages/services/conf.toml new file mode 100755 index 0000000..4b7c62a --- /dev/null +++ b/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" diff --git a/config/pages/services/head.html b/input/pages/services/head.html similarity index 100% rename from config/pages/services/head.html rename to input/pages/services/head.html diff --git a/config/pages/services/services.md b/input/pages/services/services.md similarity index 100% rename from config/pages/services/services.md rename to input/pages/services/services.md diff --git a/input/pages/support/conf.toml b/input/pages/support/conf.toml new file mode 100755 index 0000000..89bf645 --- /dev/null +++ b/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" diff --git a/config/pages/support/head.html b/input/pages/support/head.html similarity index 100% rename from config/pages/support/head.html rename to input/pages/support/head.html diff --git a/config/pages/support/support.md b/input/pages/support/support.md similarity index 100% rename from config/pages/support/support.md rename to input/pages/support/support.md diff --git a/portfolio/conf.toml b/input/portfolio/conf.toml similarity index 79% rename from portfolio/conf.toml rename to input/portfolio/conf.toml index d52c380..3a196c2 100755 --- a/portfolio/conf.toml +++ b/input/portfolio/conf.toml @@ -2,7 +2,7 @@ [[main.block]] format = "html" -content_file = "../config/global/elements/head.html" +content_file = "../global/elements/head.html" [[main.block]] format = "html" @@ -14,7 +14,7 @@ content = "" [[main.block]] format = "html" -content_file = "../config/global/elements/navbar.html" +content_file = "../global/elements/navbar.html" [[main.block]] format = "html" @@ -29,4 +29,4 @@ format = "document" [[main.block]] format = "html" -content_file = "../config/global/elements/footer.html" +content_file = "../global/elements/footer.html" diff --git a/portfolio/documents/CapChord.md b/input/portfolio/documents/CapChord.md similarity index 100% rename from portfolio/documents/CapChord.md rename to input/portfolio/documents/CapChord.md diff --git a/portfolio/documents/Meat-Typeface.md b/input/portfolio/documents/Meat-Typeface.md similarity index 100% rename from portfolio/documents/Meat-Typeface.md rename to input/portfolio/documents/Meat-Typeface.md diff --git a/portfolio/documents/Mutant-Remix.md b/input/portfolio/documents/Mutant-Remix.md similarity index 100% rename from portfolio/documents/Mutant-Remix.md rename to input/portfolio/documents/Mutant-Remix.md diff --git a/portfolio/documents/Pam-Carters-Scriptural-Poetry.md b/input/portfolio/documents/Pam-Carters-Scriptural-Poetry.md similarity index 100% rename from portfolio/documents/Pam-Carters-Scriptural-Poetry.md rename to input/portfolio/documents/Pam-Carters-Scriptural-Poetry.md diff --git a/portfolio/documents/Photography.md b/input/portfolio/documents/Photography.md similarity index 100% rename from portfolio/documents/Photography.md rename to input/portfolio/documents/Photography.md diff --git a/portfolio/export/CapChord.html b/input/portfolio/export/CapChord.html similarity index 100% rename from portfolio/export/CapChord.html rename to input/portfolio/export/CapChord.html diff --git a/portfolio/export/Meat-Typeface.html b/input/portfolio/export/Meat-Typeface.html similarity index 100% rename from portfolio/export/Meat-Typeface.html rename to input/portfolio/export/Meat-Typeface.html diff --git a/portfolio/export/Mutant-Remix.html b/input/portfolio/export/Mutant-Remix.html similarity index 100% rename from portfolio/export/Mutant-Remix.html rename to input/portfolio/export/Mutant-Remix.html diff --git a/portfolio/export/Pam-Carters-Scriptural-Poetry.html b/input/portfolio/export/Pam-Carters-Scriptural-Poetry.html similarity index 100% rename from portfolio/export/Pam-Carters-Scriptural-Poetry.html rename to input/portfolio/export/Pam-Carters-Scriptural-Poetry.html diff --git a/portfolio/export/Photography.html b/input/portfolio/export/Photography.html similarity index 100% rename from portfolio/export/Photography.html rename to input/portfolio/export/Photography.html diff --git a/posts/conf.toml b/input/posts/conf.toml similarity index 79% rename from posts/conf.toml rename to input/posts/conf.toml index 9fbd8d8..ed08f34 100755 --- a/posts/conf.toml +++ b/input/posts/conf.toml @@ -11,11 +11,11 @@ lang = "en-AU" [[main.block]] format = "html" -content_file = "../config/global/elements/head.html" +content_file = "../global/elements/head.html" [[main.block]] format = "html" -content_file = "../config/global/elements/bloghead.html" +content_file = "../global/elements/bloghead.html" [[main.block]] format = "html" @@ -27,7 +27,7 @@ content = "" [[main.block]] format = "html" -content_file = "../config/global/elements/navbar.html" +content_file = "../global/elements/navbar.html" [[main.block]] format = "html" @@ -42,4 +42,4 @@ format = "document" [[main.block]] format = "html" -content_file = "../config/global/elements/footer.html" +content_file = "../global/elements/footer.html" diff --git a/posts/documents/A-Year-With-The-Framework-Laptop-13.md b/input/posts/documents/A-Year-With-The-Framework-Laptop-13.md similarity index 100% rename from posts/documents/A-Year-With-The-Framework-Laptop-13.md rename to input/posts/documents/A-Year-With-The-Framework-Laptop-13.md diff --git a/posts/documents/Cybersecurity-Superstition.md b/input/posts/documents/Cybersecurity-Superstition.md similarity index 100% rename from posts/documents/Cybersecurity-Superstition.md rename to input/posts/documents/Cybersecurity-Superstition.md diff --git a/posts/documents/Everything-Is-Chrome.md b/input/posts/documents/Everything-Is-Chrome.md similarity index 100% rename from posts/documents/Everything-Is-Chrome.md rename to input/posts/documents/Everything-Is-Chrome.md diff --git a/posts/documents/Halo-My-Thoughts.md b/input/posts/documents/Halo-My-Thoughts.md similarity index 100% rename from posts/documents/Halo-My-Thoughts.md rename to input/posts/documents/Halo-My-Thoughts.md diff --git a/posts/documents/I-Got-A-Flipper-Zero.md b/input/posts/documents/I-Got-A-Flipper-Zero.md similarity index 100% rename from posts/documents/I-Got-A-Flipper-Zero.md rename to input/posts/documents/I-Got-A-Flipper-Zero.md diff --git a/posts/documents/I-Hate-My-Nokia.md b/input/posts/documents/I-Hate-My-Nokia.md similarity index 100% rename from posts/documents/I-Hate-My-Nokia.md rename to input/posts/documents/I-Hate-My-Nokia.md diff --git a/posts/documents/JPEG-XL-And-Googles-War-Against-It.md b/input/posts/documents/JPEG-XL-And-Googles-War-Against-It.md similarity index 100% rename from posts/documents/JPEG-XL-And-Googles-War-Against-It.md rename to input/posts/documents/JPEG-XL-And-Googles-War-Against-It.md diff --git a/posts/documents/LibreOffice-Setup.md b/input/posts/documents/LibreOffice-Setup.md similarity index 100% rename from posts/documents/LibreOffice-Setup.md rename to input/posts/documents/LibreOffice-Setup.md diff --git a/posts/documents/Making-Windows-Usable.md b/input/posts/documents/Making-Windows-Usable.md similarity index 100% rename from posts/documents/Making-Windows-Usable.md rename to input/posts/documents/Making-Windows-Usable.md diff --git a/posts/documents/Minecraft-Nostalgia-And-Growing-Up.md b/input/posts/documents/Minecraft-Nostalgia-And-Growing-Up.md similarity index 100% rename from posts/documents/Minecraft-Nostalgia-And-Growing-Up.md rename to input/posts/documents/Minecraft-Nostalgia-And-Growing-Up.md diff --git a/posts/documents/My-Code-Formatting-Guidelines.md b/input/posts/documents/My-Code-Formatting-Guidelines.md similarity index 100% rename from posts/documents/My-Code-Formatting-Guidelines.md rename to input/posts/documents/My-Code-Formatting-Guidelines.md diff --git a/posts/documents/Prematurely-Pulling-The-Plug-On-3G.md b/input/posts/documents/Prematurely-Pulling-The-Plug-On-3G.md similarity index 100% rename from posts/documents/Prematurely-Pulling-The-Plug-On-3G.md rename to input/posts/documents/Prematurely-Pulling-The-Plug-On-3G.md diff --git a/posts/documents/School-Internet.md b/input/posts/documents/School-Internet.md similarity index 100% rename from posts/documents/School-Internet.md rename to input/posts/documents/School-Internet.md diff --git a/posts/documents/Welcome.md b/input/posts/documents/Welcome.md similarity index 100% rename from posts/documents/Welcome.md rename to input/posts/documents/Welcome.md diff --git a/posts/export/A-Year-With-The-Framework-Laptop-13.html b/input/posts/export/A-Year-With-The-Framework-Laptop-13.html similarity index 100% rename from posts/export/A-Year-With-The-Framework-Laptop-13.html rename to input/posts/export/A-Year-With-The-Framework-Laptop-13.html diff --git a/posts/export/Cybersecurity-Superstition.html b/input/posts/export/Cybersecurity-Superstition.html similarity index 100% rename from posts/export/Cybersecurity-Superstition.html rename to input/posts/export/Cybersecurity-Superstition.html diff --git a/posts/export/Everything-Is-Chrome.html b/input/posts/export/Everything-Is-Chrome.html similarity index 100% rename from posts/export/Everything-Is-Chrome.html rename to input/posts/export/Everything-Is-Chrome.html diff --git a/posts/export/Halo-My-Thoughts.html b/input/posts/export/Halo-My-Thoughts.html similarity index 100% rename from posts/export/Halo-My-Thoughts.html rename to input/posts/export/Halo-My-Thoughts.html diff --git a/posts/export/I-Got-A-Flipper-Zero.html b/input/posts/export/I-Got-A-Flipper-Zero.html similarity index 100% rename from posts/export/I-Got-A-Flipper-Zero.html rename to input/posts/export/I-Got-A-Flipper-Zero.html diff --git a/posts/export/I-Hate-My-Nokia.html b/input/posts/export/I-Hate-My-Nokia.html similarity index 100% rename from posts/export/I-Hate-My-Nokia.html rename to input/posts/export/I-Hate-My-Nokia.html diff --git a/posts/export/JPEG-XL-And-Googles-War-Against-It.html b/input/posts/export/JPEG-XL-And-Googles-War-Against-It.html similarity index 100% rename from posts/export/JPEG-XL-And-Googles-War-Against-It.html rename to input/posts/export/JPEG-XL-And-Googles-War-Against-It.html diff --git a/posts/export/LibreOffice-Setup.html b/input/posts/export/LibreOffice-Setup.html similarity index 100% rename from posts/export/LibreOffice-Setup.html rename to input/posts/export/LibreOffice-Setup.html diff --git a/posts/export/Making-Windows-Usable.html b/input/posts/export/Making-Windows-Usable.html similarity index 100% rename from posts/export/Making-Windows-Usable.html rename to input/posts/export/Making-Windows-Usable.html diff --git a/posts/export/Minecraft-Nostalgia-And-Growing-Up.html b/input/posts/export/Minecraft-Nostalgia-And-Growing-Up.html similarity index 100% rename from posts/export/Minecraft-Nostalgia-And-Growing-Up.html rename to input/posts/export/Minecraft-Nostalgia-And-Growing-Up.html diff --git a/posts/export/My-Code-Formatting-Guidelines.html b/input/posts/export/My-Code-Formatting-Guidelines.html similarity index 100% rename from posts/export/My-Code-Formatting-Guidelines.html rename to input/posts/export/My-Code-Formatting-Guidelines.html diff --git a/posts/export/Prematurely-Pulling-The-Plug-On-3G.html b/input/posts/export/Prematurely-Pulling-The-Plug-On-3G.html similarity index 100% rename from posts/export/Prematurely-Pulling-The-Plug-On-3G.html rename to input/posts/export/Prematurely-Pulling-The-Plug-On-3G.html diff --git a/posts/export/School-Internet.html b/input/posts/export/School-Internet.html similarity index 100% rename from posts/export/School-Internet.html rename to input/posts/export/School-Internet.html diff --git a/posts/export/Welcome.html b/input/posts/export/Welcome.html similarity index 100% rename from posts/export/Welcome.html rename to input/posts/export/Welcome.html diff --git a/posts/export/feed.xml b/input/posts/export/feed.xml similarity index 99% rename from posts/export/feed.xml rename to input/posts/export/feed.xml index 55a8248..53d498a 100644 --- a/posts/export/feed.xml +++ b/input/posts/export/feed.xml @@ -1,5 +1,5 @@ -Vale.Rockshttps://vale.rocks2024-07-02T07:52:11.126000752+00:00Adduce© Declan ChidlowA collection of unhinged (yet not completely insane) ramblings.I-Got-A-Flipper-Zero.html1970-01-01T00:00:00+00:00<!DOCTYPE html> +Vale.Rockshttps://vale.rocks2024-07-02T07:57:42.325026260+00:00Adduce© Declan ChidlowA collection of unhinged (yet not completely insane) ramblings.I-Got-A-Flipper-Zero.html1970-01-01T00:00:00+00:00<!DOCTYPE html> <html lang="en"> <head> <meta charset="UTF-8">