From 1364cca5ce087e89ba081c115e5c2be5d8be52f5 Mon Sep 17 00:00:00 2001 From: gil Date: Mon, 24 Jun 2024 01:33:28 -0500 Subject: [PATCH] Moving theming and other resources (css, images, etc.) to src/res and hiding in-progress pages from public site --- .eleventy.js | 10 ++++---- package.json | 4 ++-- src/404.md | 2 +- src/about.md | 1 - src/journal/finally-updating-my-website.md | 12 ++++++++++ src/journal/index.md | 22 ++++++++++++++++++ src/journal/journal.json | 3 +++ src/{ => res}/css/global.css | 0 src/{ => res}/css/global.css.map | 0 src/{ => res}/css/reset.css | 0 src/{ => res}/css/theme-default.css.map | 0 src/{ => res}/font/GPL.txt | 0 src/{ => res}/font/LinLibertine_RBIah.ttf | Bin src/{ => res}/font/LinLibertine_RBah.ttf | Bin src/{ => res}/font/LinLibertine_RIah.ttf | Bin src/{ => res}/font/LinLibertine_RZIah.ttf | Bin src/{ => res}/font/LinLibertine_RZah.ttf | Bin src/{ => res}/font/LinLibertine_Rah.ttf | Bin src/{ => res}/font/OFL-1.1.txt | 0 src/{ => res}/font/alkhemikal.ttf | Bin src/{ => res}/img/background.png | Bin src/{ => res}/img/background2.png | Bin src/{ => res}/img/gba-gil.png | Bin src/{ => res}/img/objects.png | Bin src/{ => res}/scss/_colors.scss | 0 src/{ => res}/scss/_components.scss | 0 src/{ => res}/scss/_themes.scss | 0 src/{ => res}/scss/_vars.scss | 0 src/{ => res}/scss/global.scss | 0 src/{ => res}/scss/modules/_fonts.scss | 0 .../scss/modules/_include-media.scss | 0 {src => todo sections}/blog/blog.json | 0 {src => todo sections}/blog/index.md | 0 {src => todo sections}/extra.md | 0 {src => todo sections}/lib/index.md | 0 {src => todo sections}/poems/hey-girl.md | 1 - {src => todo sections}/poems/index.md | 0 {src => todo sections}/poems/poems.json | 0 {src => todo sections}/poems/self-effacing.md | 0 39 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 src/journal/finally-updating-my-website.md create mode 100644 src/journal/index.md create mode 100644 src/journal/journal.json rename src/{ => res}/css/global.css (100%) rename src/{ => res}/css/global.css.map (100%) rename src/{ => res}/css/reset.css (100%) rename src/{ => res}/css/theme-default.css.map (100%) rename src/{ => res}/font/GPL.txt (100%) rename src/{ => res}/font/LinLibertine_RBIah.ttf (100%) rename src/{ => res}/font/LinLibertine_RBah.ttf (100%) rename src/{ => res}/font/LinLibertine_RIah.ttf (100%) rename src/{ => res}/font/LinLibertine_RZIah.ttf (100%) rename src/{ => res}/font/LinLibertine_RZah.ttf (100%) rename src/{ => res}/font/LinLibertine_Rah.ttf (100%) rename src/{ => res}/font/OFL-1.1.txt (100%) rename src/{ => res}/font/alkhemikal.ttf (100%) rename src/{ => res}/img/background.png (100%) rename src/{ => res}/img/background2.png (100%) rename src/{ => res}/img/gba-gil.png (100%) rename src/{ => res}/img/objects.png (100%) rename src/{ => res}/scss/_colors.scss (100%) rename src/{ => res}/scss/_components.scss (100%) rename src/{ => res}/scss/_themes.scss (100%) rename src/{ => res}/scss/_vars.scss (100%) rename src/{ => res}/scss/global.scss (100%) rename src/{ => res}/scss/modules/_fonts.scss (100%) rename src/{ => res}/scss/modules/_include-media.scss (100%) rename {src => todo sections}/blog/blog.json (100%) rename {src => todo sections}/blog/index.md (100%) rename {src => todo sections}/extra.md (100%) rename {src => todo sections}/lib/index.md (100%) rename {src => todo sections}/poems/hey-girl.md (98%) rename {src => todo sections}/poems/index.md (100%) rename {src => todo sections}/poems/poems.json (100%) rename {src => todo sections}/poems/self-effacing.md (100%) diff --git a/.eleventy.js b/.eleventy.js index 9304128..45d4b5d 100644 --- a/.eleventy.js +++ b/.eleventy.js @@ -8,15 +8,15 @@ module.exports = function (eleventyConfig) { return DateTime.fromJSDate(dateObj).toFormat("y'-'LL'-'dd"); }); - eleventyConfig.addPassthroughCopy("./src/css/**/*.css"); - eleventyConfig.addPassthroughCopy("./src/font"); - eleventyConfig.addPassthroughCopy("./src/img"); - eleventyConfig.addWatchTarget("./src/css"); + eleventyConfig.addPassthroughCopy({ "./src/res/css/**/*.css": "css" }); + eleventyConfig.addPassthroughCopy({ "./src/res/font": "font" }); + eleventyConfig.addPassthroughCopy({ "./src/res/img": "img" }); + eleventyConfig.addWatchTarget("./src/res/css"); return { dir: { input: "src", - output: "public", + output: "_site", }, }; }; diff --git a/package.json b/package.json index c3c7d5c..297be9c 100644 --- a/package.json +++ b/package.json @@ -4,8 +4,8 @@ "description": "", "main": "index.js", "scripts": { - "watch:sass": "sass --watch src/scss:src/css", - "build:sass": "sass src/scss:src/css", + "watch:sass": "sass --watch src/res/scss:src/res/css", + "build:sass": "sass src/res/scss:src/res/css", "watch:eleventy": "eleventy --serve", "build:eleventy": "eleventy", "start": "npm-run-all build:sass --parallel watch:*", diff --git a/src/404.md b/src/404.md index 7f8d739..25a3041 100644 --- a/src/404.md +++ b/src/404.md @@ -7,4 +7,4 @@ permalink: 404.html There's nothing here. -<- Home page +← Home page diff --git a/src/about.md b/src/about.md index 8d1ef1f..fef2469 100644 --- a/src/about.md +++ b/src/about.md @@ -1,5 +1,4 @@ --- -date: Last Modified eleventyNavigation: key: About order: 1 diff --git a/src/journal/finally-updating-my-website.md b/src/journal/finally-updating-my-website.md new file mode 100644 index 0000000..0d523da --- /dev/null +++ b/src/journal/finally-updating-my-website.md @@ -0,0 +1,12 @@ +--- +title: Finally updating my website +date: 2024-06-24T00:56:00-5 +--- + + + +# Finally updating my website + +It took a long time, but I *finally* updated my website (the one you're looking at right now). The biggest thing, for me, is that I've actually built a layout and theme I can live with. It's *extremely* basic, and there isn't a lot to it—the goal is to incrementally add more personal touches and make the site look more lived in. + +The other thing I've taken up is using [Obsidian](https://obsidian.md/) to journal. I only started a week ago so I don't know how much I'll adhere to it right now; however, I'm hoping that it'll buff my writing habits and translate into more activity here. diff --git a/src/journal/index.md b/src/journal/index.md new file mode 100644 index 0000000..7d3536a --- /dev/null +++ b/src/journal/index.md @@ -0,0 +1,22 @@ +--- +title: Journal +override:tags: [] +pagination: + data: collections.journal + size: 2 + generatePageOnEmptyData: true +eleventyNavigation: + key: Journal + order: 2 +--- + +# Journal + +Small updates from the wiz himself + + diff --git a/src/journal/journal.json b/src/journal/journal.json new file mode 100644 index 0000000..8b4f143 --- /dev/null +++ b/src/journal/journal.json @@ -0,0 +1,3 @@ +{ + "tags": "journal" +} \ No newline at end of file diff --git a/src/css/global.css b/src/res/css/global.css similarity index 100% rename from src/css/global.css rename to src/res/css/global.css diff --git a/src/css/global.css.map b/src/res/css/global.css.map similarity index 100% rename from src/css/global.css.map rename to src/res/css/global.css.map diff --git a/src/css/reset.css b/src/res/css/reset.css similarity index 100% rename from src/css/reset.css rename to src/res/css/reset.css diff --git a/src/css/theme-default.css.map b/src/res/css/theme-default.css.map similarity index 100% rename from src/css/theme-default.css.map rename to src/res/css/theme-default.css.map diff --git a/src/font/GPL.txt b/src/res/font/GPL.txt similarity index 100% rename from src/font/GPL.txt rename to src/res/font/GPL.txt diff --git a/src/font/LinLibertine_RBIah.ttf b/src/res/font/LinLibertine_RBIah.ttf similarity index 100% rename from src/font/LinLibertine_RBIah.ttf rename to src/res/font/LinLibertine_RBIah.ttf diff --git a/src/font/LinLibertine_RBah.ttf b/src/res/font/LinLibertine_RBah.ttf similarity index 100% rename from src/font/LinLibertine_RBah.ttf rename to src/res/font/LinLibertine_RBah.ttf diff --git a/src/font/LinLibertine_RIah.ttf b/src/res/font/LinLibertine_RIah.ttf similarity index 100% rename from src/font/LinLibertine_RIah.ttf rename to src/res/font/LinLibertine_RIah.ttf diff --git a/src/font/LinLibertine_RZIah.ttf b/src/res/font/LinLibertine_RZIah.ttf similarity index 100% rename from src/font/LinLibertine_RZIah.ttf rename to src/res/font/LinLibertine_RZIah.ttf diff --git a/src/font/LinLibertine_RZah.ttf b/src/res/font/LinLibertine_RZah.ttf similarity index 100% rename from src/font/LinLibertine_RZah.ttf rename to src/res/font/LinLibertine_RZah.ttf diff --git a/src/font/LinLibertine_Rah.ttf b/src/res/font/LinLibertine_Rah.ttf similarity index 100% rename from src/font/LinLibertine_Rah.ttf rename to src/res/font/LinLibertine_Rah.ttf diff --git a/src/font/OFL-1.1.txt b/src/res/font/OFL-1.1.txt similarity index 100% rename from src/font/OFL-1.1.txt rename to src/res/font/OFL-1.1.txt diff --git a/src/font/alkhemikal.ttf b/src/res/font/alkhemikal.ttf similarity index 100% rename from src/font/alkhemikal.ttf rename to src/res/font/alkhemikal.ttf diff --git a/src/img/background.png b/src/res/img/background.png similarity index 100% rename from src/img/background.png rename to src/res/img/background.png diff --git a/src/img/background2.png b/src/res/img/background2.png similarity index 100% rename from src/img/background2.png rename to src/res/img/background2.png diff --git a/src/img/gba-gil.png b/src/res/img/gba-gil.png similarity index 100% rename from src/img/gba-gil.png rename to src/res/img/gba-gil.png diff --git a/src/img/objects.png b/src/res/img/objects.png similarity index 100% rename from src/img/objects.png rename to src/res/img/objects.png diff --git a/src/scss/_colors.scss b/src/res/scss/_colors.scss similarity index 100% rename from src/scss/_colors.scss rename to src/res/scss/_colors.scss diff --git a/src/scss/_components.scss b/src/res/scss/_components.scss similarity index 100% rename from src/scss/_components.scss rename to src/res/scss/_components.scss diff --git a/src/scss/_themes.scss b/src/res/scss/_themes.scss similarity index 100% rename from src/scss/_themes.scss rename to src/res/scss/_themes.scss diff --git a/src/scss/_vars.scss b/src/res/scss/_vars.scss similarity index 100% rename from src/scss/_vars.scss rename to src/res/scss/_vars.scss diff --git a/src/scss/global.scss b/src/res/scss/global.scss similarity index 100% rename from src/scss/global.scss rename to src/res/scss/global.scss diff --git a/src/scss/modules/_fonts.scss b/src/res/scss/modules/_fonts.scss similarity index 100% rename from src/scss/modules/_fonts.scss rename to src/res/scss/modules/_fonts.scss diff --git a/src/scss/modules/_include-media.scss b/src/res/scss/modules/_include-media.scss similarity index 100% rename from src/scss/modules/_include-media.scss rename to src/res/scss/modules/_include-media.scss diff --git a/src/blog/blog.json b/todo sections/blog/blog.json similarity index 100% rename from src/blog/blog.json rename to todo sections/blog/blog.json diff --git a/src/blog/index.md b/todo sections/blog/index.md similarity index 100% rename from src/blog/index.md rename to todo sections/blog/index.md diff --git a/src/extra.md b/todo sections/extra.md similarity index 100% rename from src/extra.md rename to todo sections/extra.md diff --git a/src/lib/index.md b/todo sections/lib/index.md similarity index 100% rename from src/lib/index.md rename to todo sections/lib/index.md diff --git a/src/poems/hey-girl.md b/todo sections/poems/hey-girl.md similarity index 98% rename from src/poems/hey-girl.md rename to todo sections/poems/hey-girl.md index 69133eb..7f376b0 100644 --- a/src/poems/hey-girl.md +++ b/todo sections/poems/hey-girl.md @@ -1,7 +1,6 @@ --- title: Hey Girl date: 2023-05-31T12:00:00-5 -excerpt: test --- Hey girl, diff --git a/src/poems/index.md b/todo sections/poems/index.md similarity index 100% rename from src/poems/index.md rename to todo sections/poems/index.md diff --git a/src/poems/poems.json b/todo sections/poems/poems.json similarity index 100% rename from src/poems/poems.json rename to todo sections/poems/poems.json diff --git a/src/poems/self-effacing.md b/todo sections/poems/self-effacing.md similarity index 100% rename from src/poems/self-effacing.md rename to todo sections/poems/self-effacing.md