From 0263c1de6666f684c982f85af5c0bbfef3576ebe Mon Sep 17 00:00:00 2001 From: Nathan Upchurch Date: Sun, 9 Nov 2025 20:57:49 -0600 Subject: [PATCH] A bunch of stuff --- _data/blogroll.js | 7 + _data/metadata.js | 2 + _includes/footer.njk | 11 +- _includes/header.njk | 2 +- _includes/layouts/base.njk | 1 + _includes/siteSettings.njk | 20 ++ _includes/weather.njk | 172 ++++++++++++++++++ _includes/weatherController.njk | 30 +++ content/changelog.md | 4 + content/incense/index.md | 2 + ...se_Lijiali_2025-10-28 12:07:00_12:07 PM.md | 7 + ..._Yuzhi Oud_2025-11-03 11:41:00_11:41 AM.md | 7 + ...random shop_2025-11-05 14:37:00_2:37 PM.md | 7 + ...ng on_Myself_2025-11-03 9:33:00_9:33 AM.md | 7 + eleventy.config.js | 8 +- package.json | 1 + public/css/index.css | 35 +++- public/img/icons/breeze/story-editor.svg | 41 +++++ 18 files changed, 347 insertions(+), 17 deletions(-) create mode 100644 _includes/siteSettings.njk create mode 100644 _includes/weather.njk create mode 100644 _includes/weatherController.njk create mode 100644 content/now-burning/Now Burning_Butterfly Spring Incense_Lijiali_2025-10-28 12:07:00_12:07 PM.md create mode 100644 content/now-burning/Now Burning_Green Kinam, AAA_Yuzhi Oud_2025-11-03 11:41:00_11:41 AM.md create mode 100644 content/now-burning/Now Burning_Palo Santo_Some random shop_2025-11-05 14:37:00_2:37 PM.md create mode 100644 content/now-burning/Now Burning_Some weird cedar, lavender, and orris composition I've been working on_Myself_2025-11-03 9:33:00_9:33 AM.md create mode 100644 public/img/icons/breeze/story-editor.svg diff --git a/_data/blogroll.js b/_data/blogroll.js index 76e5b24..5b85f1a 100644 --- a/_data/blogroll.js +++ b/_data/blogroll.js @@ -620,6 +620,13 @@ export default { url: "https://thefoggiest.dev", description: "The personal blog of Diederick de Vries of Amsterdam.", }, + { + title: "ThinksTooMuch", + feedUrl: "https://thinkstoomuch.net/index.xml", + url: "https://thinkstoomuch.net/", + description: + "Thoughts on atheism, leftism, firearms, work, and life.", + }, ], }, { diff --git a/_data/metadata.js b/_data/metadata.js index 1cab8be..0efcfdd 100644 --- a/_data/metadata.js +++ b/_data/metadata.js @@ -1,6 +1,7 @@ export default { title: "Nathan Upchurch", logo: "/img/logo.svg", + holidayLogo: "", url: "https://nathanupchurch.com/", language: "en", description: @@ -166,6 +167,7 @@ export default { iconURL: "/img/wafrn.svg", }, ], + weatherSymbol: "🍁", webrings: [ { name: "Fediring", diff --git a/_includes/footer.njk b/_includes/footer.njk index 62debb0..092e8f2 100644 --- a/_includes/footer.njk +++ b/_includes/footer.njk @@ -1,8 +1,4 @@ diff --git a/_includes/header.njk b/_includes/header.njk index c5c8b1e..4471aa6 100644 --- a/_includes/header.njk +++ b/_includes/header.njk @@ -5,7 +5,7 @@ class="home-link"> {% if not hideNav %}{% include "nav.njk" %}{% endif %} diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk index 8cea4cc..5d4d617 100644 --- a/_includes/layouts/base.njk +++ b/_includes/layouts/base.njk @@ -16,5 +16,6 @@ {% include "footer.njk" %} + {% include "weather.njk" %} diff --git a/_includes/siteSettings.njk b/_includes/siteSettings.njk new file mode 100644 index 0000000..3038617 --- /dev/null +++ b/_includes/siteSettings.njk @@ -0,0 +1,20 @@ + + + + +
+ + +

Site Settings

+ {% include "weatherController.njk" %} + + +
diff --git a/_includes/weather.njk b/_includes/weather.njk new file mode 100644 index 0000000..7732c54 --- /dev/null +++ b/_includes/weather.njk @@ -0,0 +1,172 @@ + + + {# This include causes a symbol (text, emoji, et cetera; from metadata.weatherSymbol) to fall from the top of the viewport like snow. #} + + + + + + diff --git a/_includes/weatherController.njk b/_includes/weatherController.njk new file mode 100644 index 0000000..e497319 --- /dev/null +++ b/_includes/weatherController.njk @@ -0,0 +1,30 @@ + + +
+ + +
diff --git a/content/changelog.md b/content/changelog.md index 8f13e50..9fc5cd1 100644 --- a/content/changelog.md +++ b/content/changelog.md @@ -4,6 +4,10 @@ title: Nathan Upchurch | Changelog structuredData: none --- # Changelog +* 2025-11-9 + * Added [ThinksTooMuch](https://thinkstoomuch.net) to the [blogroll](/blogroll). + * Updated [/incense](/incense). + * Added snow / weather, and site settings button and dialog. * 2025-10-20 * Added [Moist Poetry Journal](https://moistpoetryjournal.com) to the [blogroll](/blogroll). * Removed some less active and/or abandoned blogs from the [blogroll](/blogroll). diff --git a/content/incense/index.md b/content/incense/index.md index 2bb03da..d7cd16b 100644 --- a/content/incense/index.md +++ b/content/incense/index.md @@ -55,6 +55,7 @@ Incense making is hard. While parts of the world with strong incense cultures en ### Other * [A list of archived URLs](https://web.archive.org/web/*/https://talesofincense.com/*) from a now-defunct site with some good information on Chinese incense. * [All of my writing on incense](/tags/incense/) +* [Aromasublime Learning Center](https://www.aromasublime.com/news/category/key+articles++-+learning+center)—Articles on agarwood and agarwood oil. * [incensemakers.org](https://incensemakers.org/) is an invitation-only forum for relatively experienced incense makers. It is not incredibly active, but it does have a number of useful threads visible to non-members. If you are interested in joining, your best bet is to have an existing member you know personally get in touch with [me](/me) to provide a recommendation on your behalf. * See the [incense, fragrance, and perfumery section of my blogroll](/blogroll/#incense-fragrance-and-perfumery) for a list of blogs with writing on incense and related topics. @@ -78,6 +79,7 @@ Incense making is hard. While parts of the world with strong incense cultures en * [Shoyeido Factory Works (YouTube)](https://www.youtube.com/watch?v=EQRxB4Gz-JM) * [The Frankincense Trail](https://www.imdb.com/title/tt2056414/)—Kate Humble follows the ancient frankincense trade route from Oman to Palestine. I have linked to the IMDB page, but this documentary series is well worth sailing the high seas for. * [*The Scent of Heaven: Inside Vietnam’s Incense Village* (YouTube)](https://www.youtube.com/watch?v=Wy8pDpIH31g) +* [*'The Scent of Sakai' 堺の香り - Handmade incense stick craftsman* (YouTube)](https://www.youtube.com/watch?v=-4vOPSJYvX4) * [*Turf Peat Incense* (YouTube)](https://www.youtube.com/watch?v=4F7Xvdpq-GE) ## Reputable Suppliers of Aromatics diff --git a/content/now-burning/Now Burning_Butterfly Spring Incense_Lijiali_2025-10-28 12:07:00_12:07 PM.md b/content/now-burning/Now Burning_Butterfly Spring Incense_Lijiali_2025-10-28 12:07:00_12:07 PM.md new file mode 100644 index 0000000..4516c01 --- /dev/null +++ b/content/now-burning/Now Burning_Butterfly Spring Incense_Lijiali_2025-10-28 12:07:00_12:07 PM.md @@ -0,0 +1,7 @@ +--- +title: Butterfly Spring Incense +manufacturer: Lijiali +date: 2025-10-28 12:07:00 +time: 12:07 PM +--- + diff --git a/content/now-burning/Now Burning_Green Kinam, AAA_Yuzhi Oud_2025-11-03 11:41:00_11:41 AM.md b/content/now-burning/Now Burning_Green Kinam, AAA_Yuzhi Oud_2025-11-03 11:41:00_11:41 AM.md new file mode 100644 index 0000000..027702b --- /dev/null +++ b/content/now-burning/Now Burning_Green Kinam, AAA_Yuzhi Oud_2025-11-03 11:41:00_11:41 AM.md @@ -0,0 +1,7 @@ +--- +title: Green Kinam, AAA +manufacturer: Yuzhi Oud +date: 2025-11-03 11:41:00 +time: 11:41 AM +--- + diff --git a/content/now-burning/Now Burning_Palo Santo_Some random shop_2025-11-05 14:37:00_2:37 PM.md b/content/now-burning/Now Burning_Palo Santo_Some random shop_2025-11-05 14:37:00_2:37 PM.md new file mode 100644 index 0000000..4a0848d --- /dev/null +++ b/content/now-burning/Now Burning_Palo Santo_Some random shop_2025-11-05 14:37:00_2:37 PM.md @@ -0,0 +1,7 @@ +--- +title: Palo Santo +manufacturer: Some random shop +date: 2025-11-05 14:37:00 +time: 2:37 PM +--- + diff --git a/content/now-burning/Now Burning_Some weird cedar, lavender, and orris composition I've been working on_Myself_2025-11-03 9:33:00_9:33 AM.md b/content/now-burning/Now Burning_Some weird cedar, lavender, and orris composition I've been working on_Myself_2025-11-03 9:33:00_9:33 AM.md new file mode 100644 index 0000000..a26eb4e --- /dev/null +++ b/content/now-burning/Now Burning_Some weird cedar, lavender, and orris composition I've been working on_Myself_2025-11-03 9:33:00_9:33 AM.md @@ -0,0 +1,7 @@ +--- +title: Some weird cedar, lavender, and orris composition I've been working on +manufacturer: Myself +date: 2025-11-03 9:33:00 +time: 9:33 AM +--- + diff --git a/eleventy.config.js b/eleventy.config.js index 6af4fe9..0f81622 100644 --- a/eleventy.config.js +++ b/eleventy.config.js @@ -193,10 +193,14 @@ export default async function (eleventyConfig) { ); // Passthrough - eleventyConfig .addPassthroughCopy({ "./public/": "/" }) - .addPassthroughCopy("./content/special/"); + .addPassthroughCopy("./content/special/") + .addPassthroughCopy("./node_modules/@magenta/music/es6/core.js") + .addPassthroughCopy( + "./node_modules/html-midi-player/dist/midi-player.min.js", + ) + .addPassthroughCopy("./node_modules/tone/build/Tone.js"); // Get the first `n` elements of a collection. eleventyConfig.addFilter("head", (array, n) => { diff --git a/package.json b/package.json index e1ace8f..38e449f 100644 --- a/package.json +++ b/package.json @@ -41,6 +41,7 @@ "mdfigcaption": "^0.1.1" }, "dependencies": { + "html-midi-player": "^1.6.0", "markdown-it-container": "^4.0.0", "markdown-it-footnote": "^3.0.3", "markdown-it-image-figures": "^2.1.1", diff --git a/public/css/index.css b/public/css/index.css index 5542f79..1c19b6b 100644 --- a/public/css/index.css +++ b/public/css/index.css @@ -183,7 +183,7 @@ html { input.answer { display: inline; } -input:not(.answer), +input:not(.answer):not(#weatherToggle), textarea { background-color: var(--background-color); border: var(--border-details); @@ -334,15 +334,17 @@ a { } footer { padding: var(--space-xl) 0 var(--space-m) 0; + & p { + font-size: var(--step-0); + grid-column: var(--span-grid); + margin-bottom: 0; + } + & .webring { + display: inline; + padding-right: var(--space-xs); + } } -footer .webring { - display: inline; - padding-right: var(--space-xs); -} -footer p { - font-size: var(--step-0); - grid-column: var(--span-grid); -} + h1, h2, h3 { @@ -1051,6 +1053,18 @@ article.post { margin: var(--space-2xs) auto; } } +#buttonsAndStuffContainer { + display: flex; + grid-column: var(--span-grid); + width: 100%; + & a, + img, + div { + display: inline-block; + height: var(--space-m-l); + margin-right: var(--space-3xs); + } +} .gallery-images { display: flex; flex-flow: row wrap; @@ -1188,3 +1202,6 @@ dialog { gap: var(--grid-gutter); grid-template-columns: repeat(var(--grid-columns), 1fr); } +.hidden { + display: none; +} diff --git a/public/img/icons/breeze/story-editor.svg b/public/img/icons/breeze/story-editor.svg new file mode 100644 index 0000000..b72f47a --- /dev/null +++ b/public/img/icons/breeze/story-editor.svg @@ -0,0 +1,41 @@ + + + + + + + +