From 82f47093a7c0579ff79e0af979a5eff736ecb98f Mon Sep 17 00:00:00 2001
From: Nathan Upchurch <nathan@upchur.ch>
Date: Wed, 13 May 2026 12:30:45 -0500
Subject: [PATCH] Settings refactor / add birb

---
 _includes/birb.njk                            | 17 +++++
 _includes/footer.njk                          |  2 +-
 _includes/layouts/base.njk                    |  3 +
 _includes/layouts/links.njk                   |  2 +-
 .../settings/controllers/birbController.njk   |  4 ++
 .../controllers}/weatherController.njk        |  2 +-
 .../controllers}/wooModeController.njk        |  2 +-
 _includes/settings/settingsConfig.njk         | 37 +++++++++++
 _includes/{ => settings}/siteSettings.njk     |  5 +-
 _includes/weather.njk                         | 36 ++++-------
 _includes/wooMode.njk                         | 59 ++++++-----------
 public/css/index.css                          | 33 +++++++++-
 public/js/main.js                             | 64 +++++++++++++++++++
 13 files changed, 192 insertions(+), 74 deletions(-)
 create mode 100644 _includes/birb.njk
 create mode 100644 _includes/settings/controllers/birbController.njk
 rename _includes/{ => settings/controllers}/weatherController.njk (76%)
 rename _includes/{ => settings/controllers}/wooModeController.njk (79%)
 create mode 100644 _includes/settings/settingsConfig.njk
 rename _includes/{ => settings}/siteSettings.njk (57%)
 create mode 100644 public/js/main.js

diff --git a/_includes/birb.njk b/_includes/birb.njk
new file mode 100644
index 0000000..ce1b0c0
--- /dev/null
+++ b/_includes/birb.njk
@@ -0,0 +1,17 @@
+<!-- Birb -->
+<script>
+const showBirb = () => {
+	script = document.createElement('script');
+	script.setAttribute("src", "https://cdn.jsdelivr.net/gh/IdreesInc/Pocket-Bird@main/dist/web/birb.embed.js");
+	document.body.appendChild(script);
+};
+
+const hideBirb = () => {
+	window.location.reload();
+};
+
+const noBirb = () => {
+	console.info("Settings: Not showing birb :[");
+}
+</script>
+<!-- /Birb -->
diff --git a/_includes/footer.njk b/_includes/footer.njk
index 094be6f..151b424 100644
--- a/_includes/footer.njk
+++ b/_includes/footer.njk
@@ -17,6 +17,6 @@
 		<a href="https://notbyai.fyi/">
 			<img src="/img/written-by-human-not-by-ai-white.svg" alt="Written by humans, not by AI.">
 		</a>
-		{% include "siteSettings.njk" %}
+		{% include "settings/siteSettings.njk" %}
 	</div>
 </footer>
diff --git a/_includes/layouts/base.njk b/_includes/layouts/base.njk
index 7f21bdd..ebd6a5c 100644
--- a/_includes/layouts/base.njk
+++ b/_includes/layouts/base.njk
@@ -52,6 +52,7 @@
 		<link rel="stylesheet" href="/pagefind/pagefind-ui.css">
 		<link rel="stylesheet" type="text/css" href="/css/search.css" />
 		{% endif %}
+		<script src="/js/main.js"></script>
 		<!-- Mochi webmentions -->
 		<link rel="webmention" href="https://mochi-webmentions.meadow.cafe/webmention/mochi@upchur.ch/1/receive" />
 		<!-- Indieweb profile links -->
@@ -85,8 +86,10 @@
 			</section>
 			{% endif %}
 		</main>
+		{% include "birb.njk" %}
 		{% include "footer.njk" %}
 		{% include "weather.njk" %}
 		{% include "wooMode.njk" %}
+		{% include "settings/settingsConfig.njk" %}
 	</body>
 </html>
diff --git a/_includes/layouts/links.njk b/_includes/layouts/links.njk
index 4116062..90b8c31 100644
--- a/_includes/layouts/links.njk
+++ b/_includes/layouts/links.njk
@@ -4,7 +4,7 @@ layout: layouts/linksPage.njk
 <div class="links-container h-card" data-pagefind-body>
 	<img class="profilePic u-photo" src="{{ metadata.author.profilePic }}">
 	<h1 class="socialTitle p-name">Nathan Upchurch</h1>
-	<p class="page-block nodropcap">Beside what I do to earn a crust, among other things, I’m an incense maker and enthusiast, a classical trombonist, vegan cook, writer, mediocre photographer, and a fan of, advocate for, and occasional contributor to free and open source software. Here’s where you can find me on the internet:</p>
+	<p class="page-block nodropcap">Here’s where you can find me on the internet:</p>
 	<div class="socialLinks">
 		{% for link in metadata.socialLinks %}
 		<a class="link-button u-url" {% if link.customAttribute %} {{ link.customAttribute | safe }} {% endif %} href="{{ link.linkURL }}">
diff --git a/_includes/settings/controllers/birbController.njk b/_includes/settings/controllers/birbController.njk
new file mode 100644
index 0000000..ce6fdf7
--- /dev/null
+++ b/_includes/settings/controllers/birbController.njk
@@ -0,0 +1,4 @@
+<form class="siteSettingsToggle" id="birbController">
+	<input type="checkbox" id="birbToggle" {% if metadata.weatherOnByDefault %}checked{% endif %} />
+	<label for="birbToggle">Pet bird (Will refresh page when turned off)</label>
+</form>
diff --git a/_includes/weatherController.njk b/_includes/settings/controllers/weatherController.njk
similarity index 76%
rename from _includes/weatherController.njk
rename to _includes/settings/controllers/weatherController.njk
index 99598eb..17b85cc 100644
--- a/_includes/weatherController.njk
+++ b/_includes/settings/controllers/weatherController.njk
@@ -1,4 +1,4 @@
 <form class="siteSettingsToggle" id="weatherController">
 	<input type="checkbox" id="weatherToggle" {% if metadata.weatherOnByDefault %}checked{% endif %} />
-	<label for="weatherToggle">Show weather?</label>
+	<label for="weatherToggle">Weather</label>
 </form>
diff --git a/_includes/wooModeController.njk b/_includes/settings/controllers/wooModeController.njk
similarity index 79%
rename from _includes/wooModeController.njk
rename to _includes/settings/controllers/wooModeController.njk
index c906e79..d6fdde1 100644
--- a/_includes/wooModeController.njk
+++ b/_includes/settings/controllers/wooModeController.njk
@@ -1,4 +1,4 @@
 <form class="siteSettingsToggle" id="wooModeController">
 	<input type="checkbox" id="wooToggle" {% if metadata.wooModeOnByDefault %}checked{% endif %} />
-	<label for="wooToggle">Woo mode?</label>
+	<label for="wooToggle">Woo mode</label>
 </form>
diff --git a/_includes/settings/settingsConfig.njk b/_includes/settings/settingsConfig.njk
new file mode 100644
index 0000000..8604377
--- /dev/null
+++ b/_includes/settings/settingsConfig.njk
@@ -0,0 +1,37 @@
+<!-- Site Settings -->
+<script>
+	const weatherSettings = {
+		handleOnToggle: turnOnWeather,
+		handleOnDefault: turnOnWeather,
+		handleOffToggle: turnOffWeather,
+		handleOffDefault: turnOffWeather,
+		settingToggle: "weatherToggle",
+		preferenceName: "weather",
+		defaultSetting: {{ metadata.weatherOnByDefault }},
+		forcedOn: false,
+	};
+	const wooModeSettings = {
+		handleOnToggle: deployWoo,
+		handleOnDefault: wooSensibleDefault,
+		handleOffToggle: withdrawWoo,
+		handleOffDefault: withdrawWoo,
+		settingToggle: "wooToggle",
+		preferenceName: "wooMode",
+		defaultSetting: {% if forcedWoo %}true{% else %}false{% endif %},
+		forcedOn: {% if forcedWoo %}true{% else %}false{% endif %},
+	};
+	const petBirbSettings = {
+		handleOnToggle: showBirb,
+		handleOnDefault: showBirb,
+		handleOffToggle: hideBirb,
+		handleOffDefault: noBirb,
+		settingToggle: "birbToggle",
+		preferenceName: "petBirb",
+		defaultSetting: false,
+		forcedOn: false,
+	};
+	settingHandler(weatherSettings);
+	settingHandler(wooModeSettings);
+	settingHandler(petBirbSettings);
+</script>
+<!-- /Site Settings -->
diff --git a/_includes/siteSettings.njk b/_includes/settings/siteSettings.njk
similarity index 57%
rename from _includes/siteSettings.njk
rename to _includes/settings/siteSettings.njk
index f18433f..345fc0a 100644
--- a/_includes/siteSettings.njk
+++ b/_includes/settings/siteSettings.njk
@@ -2,8 +2,9 @@
 	<button onclick="siteSettings.showModal();">Site Settings</button>
 	<dialog id="siteSettings">
 		<h2>Site Settings</h2>
-		{% include "weatherController.njk" %}
-		{% include "wooModeController.njk" %}
+		{% include "settings/controllers/birbController.njk" %}
+		{% include "settings/controllers/weatherController.njk" %}
+		{% include "settings/controllers/wooModeController.njk" %}
 		<button id="settingsDone" onclick="siteSettings.close();">Done</button>
 	</dialog>
 </div>
diff --git a/_includes/weather.njk b/_includes/weather.njk
index 1f6d8b1..6dfef79 100644
--- a/_includes/weather.njk
+++ b/_includes/weather.njk
@@ -1,7 +1,7 @@
 <!-- weather -->
 		<!-- Based on https://codepen.io/codeconvey/pen/xRzQay -->
 		{# This include causes a symbol (text, emoji, et cetera; from metadata.weatherSymbol) to fall from the top of the viewport like snow. #}
-		<div class="fallingObjects" id="weather" aria-hidden="true">
+		<div class="fallingObjects hidden" id="weather" aria-hidden="true">
 			<div class="fallingObject">
 				<div>{{ metadata.weatherSymbol }}</div>
 			</div>
@@ -34,29 +34,15 @@
 			</div>
 		</div>
 
-		<script>
-			const weather = document.getElementById("weather");
-			const weatherToggle = document.getElementById("weatherToggle");
-			const weatherPreference = localStorage.getItem("weather");
+<script>
+	const turnOnWeather = (containerId) => {
+		const container = document.getElementById(containerId);
+		weather.classList.remove("hidden");
+	}
 
-			// Initial weather preference check on page load
-			if ({% if metadata.weatherOnByDefault == false %}!weatherPreference || {% endif %}weatherPreference == 0) {
-				weather.classList.add("hidden");
-				weatherToggle.checked = false;
-			} else {
-				weather.classList.remove("hidden");
-				weatherToggle.checked = true;
-			};
-
-			// Handle weather setting toggle
-			weatherToggle.addEventListener('change', function() {
-				if (this.checked) {
-					localStorage.setItem("weather", 1);
-					weather.classList.remove("hidden");
-				} else {
-					localStorage.setItem("weather", 0);
-					weather.classList.add("hidden");
-				};
-			});
-		</script>
+	const turnOffWeather = (containerId) => {
+		const container = document.getElementById(containerId);
+		weather.classList.add("hidden");
+	}
+</script>
 <!-- /weather -->
diff --git a/_includes/wooMode.njk b/_includes/wooMode.njk
index f56f630..dc4478e 100644
--- a/_includes/wooMode.njk
+++ b/_includes/wooMode.njk
@@ -2,7 +2,7 @@
 <!-- Based on https://codepen.io/tommyho/pen/JjgoZLK -->
 {# This include replaces the page background with a crazy rainbow animated shader #}
 
-<canvas id="shaderCanvas"></canvas>
+<canvas class="hidden" id="shaderCanvas"></canvas>
 <script src="/js/three.min.js"></script>
 <script>
 	let scene, camera, renderer, uniforms, material, mesh;
@@ -171,52 +171,31 @@
 		uniforms.time.value = timestamp * 0.001;
 		renderer.render(scene, camera);
 	}
-</script>
 
-<script>
 	const wooCanvas = document.getElementById("shaderCanvas");
-	const wooToggle = document.getElementById("wooToggle");
-	const wooPreference = localStorage.getItem("wooMode");
-	let forcedWoo = false;
 
-	// Initial preference check on page load
-	if ({% if metadata.wooModeOnByDefault == false %}!wooPreference || {% endif %}wooPreference == 0) {
-		forcedWoo ? null : wooCanvas.classList.add("hidden");
-		wooToggle.checked = false;
-	} else {
+	// Function for when wooMode is toggled on
+	const deployWoo = () => {
+		let wooAudio = new Audio("/audio/30995__unclesigmund__woo-2.mp3");
+		wooAudio.volume = 0.4;
+		wooAudio.play();
+
 		wooCanvas.classList.remove("hidden");
-		wooToggle.checked = true;
 		initWoo();
 		animate(0);
-	};
+	}
 
-	// Handle setting toggle
-	wooToggle.addEventListener('change', function() {
-		if (this.checked) {
-			localStorage.setItem("wooMode", 1);
-
-			let wooAudio = new Audio("/audio/30995__unclesigmund__woo-2.mp3");
-			wooAudio.volume = 0.4;
-			wooAudio.play();
-
-			wooCanvas.classList.remove("hidden");
-			initWoo();
-			animate(0);
-		} else {
-			localStorage.setItem("wooMode", 0);
-			forcedWoo ? null : wooCanvas.classList.add("hidden");
-		};
-	});
-
-	{% if forcedWoo %}
-	// Handle forced woo
-	forcedWoo = true;
-	console.log("Forcing woo mode: woo!");
-	wooCanvas.classList.remove("hidden");
-	initWoo();
-	animate(0);
-	{% endif %}
+	// Function for when wooMode is enabled by default
+	const wooSensibleDefault = () => {
+		wooCanvas.classList.remove("hidden");
+		initWoo();
+		animate(0);
+	}
 
+	// Function for when wooMode is toggled off
+	const withdrawWoo = () => {
+		wooCanvas.classList.add("hidden");
+	}
 
 </script>
-<!-- /weather -->
+<!-- /Woo Mode -->
diff --git a/public/css/index.css b/public/css/index.css
index 01d4bdc..f6e5119 100644
--- a/public/css/index.css
+++ b/public/css/index.css
@@ -23,7 +23,8 @@
 	--color-gray-90: #333333;
 
 	--card-color: rgba(250, 250, 250, 1);
-	--contrast-color: #027860;
+	--contrast-color: rgb(2, 120, 96);
+	--contrast-color-translucent: rgba(2, 120, 96, 0.5);
 	--background-color: #faf5f5;
 	--rss-orange: rgb(255, 152, 0);
 	--text-color: var(--color-gray-90);
@@ -98,7 +99,7 @@
 	--border-radius: 0.3rem;
 
 	/* Transitions */
-	--transition-normal: all 0.3s;
+	--transition-normal: all 0.3s allow-discrete;
 
 	/* Links */
 	--link-decoration-thickness: 0.06rem;
@@ -119,7 +120,8 @@
 		--color-gray-20: #253848;
 		--color-gray-90: #dad8d8;
 		--card-color: #333333;
-		--contrast-color: #04c49e;
+		--contrast-color: rgb(4, 196, 158);
+		--contrast-color-translucent: rgba(4, 196, 158, 0.5);
 
 		/* --text-color is assigned to --color-gray-_ above */
 		--text-color-link: var(--text-color);
@@ -576,6 +578,31 @@ sup {
 }
 
 /* Site Settings */
+#siteSettings {
+	border: 1.5px solid var(--color-gray-20);
+	border-radius: var(--border-radius);
+	background-color: var(--card-color);
+	transition: var(--transition-normal);
+	&::backdrop {
+		backdrop-filter: blur(3px);
+		background-color: var(--contrast-color-translucent);
+		transition: var(--transition-normal);
+	}
+	&[open] {
+		opacity: 1;
+		transition: var(--transition-normal);
+		@starting-style {
+			opacity: 0;
+		}
+	}
+	&[open]::backdrop {
+		opacity: 1;
+		@starting-style {
+			opacity: 0;
+		}
+	}
+} /* TODO: figure out why exit animation doesn't work */
+
 #siteSettingsContainer {
 	& button:not(#settingsDone) {
 		margin-top: 0;
diff --git a/public/js/main.js b/public/js/main.js
new file mode 100644
index 0000000..6abcac2
--- /dev/null
+++ b/public/js/main.js
@@ -0,0 +1,64 @@
+/*
+ * Function to handle settings toggles and the effects they control
+ * handleOnToggle: Function to be called if user turns the setting on
+ * handleOnDefault: Function to be called if the setting is on by default
+ * handleOffToggle: Function to be called if user turns the setting off
+ * handleOffDefault: Function to be called if the setting is off by default
+ * settingToggle: String - ID of the user-facing toggle element to control the effect
+ * preferenceName: String - Name to be used to record the user's setting preference in local storage'
+ * defaultSetting: Boolean
+ * forcedOn: Boolean - whether to ignore the user preference if defaultSetting = true
+ */
+
+const settingHandler = (settingsObject) => {
+	const toggle = document.getElementById(settingsObject.settingToggle);
+	const preference = localStorage.getItem(settingsObject.preferenceName);
+
+	// Report settings
+	console.info(
+		`
+		Settings: ${settingsObject.preferenceName}
+		----------
+		Default: ${settingsObject.defaultSetting}
+		Forced on: ${settingsObject.forcedOn}
+		User preference: ${preference}
+		`,
+	);
+
+	// User preference is positive
+	if (preference === "1") {
+		toggle.checked = true;
+		settingsObject.forcedOn ? (toggle.disabled = true) : null;
+		settingsObject.handleOnDefault();
+	} else if (settingsObject.defaultSetting && settingsObject.forcedOn) {
+		// Default on, user preference ignored
+		toggle.checked = true;
+		toggle.disabled = true;
+		settingsObject.handleOnDefault();
+	} else if (settingsObject.defaultSetting && !preference) {
+		// Default on, no user preference
+		toggle.checked = true;
+		settingsObject.forcedOn ? (toggle.disabled = true) : null;
+		settingsObject.handleOnDefault();
+	} else {
+		toggle.checked = false;
+		settingsObject.handleOffDefault();
+	}
+
+	// Handle setting toggle
+	toggle.addEventListener("change", function () {
+		if (this.checked) {
+			console.info(
+				`Settings: User turned on ${settingsObject.preferenceName}.`,
+			);
+			localStorage.setItem(settingsObject.preferenceName, 1);
+			settingsObject.handleOnToggle();
+		} else {
+			console.info(
+				`Settings: User turned off ${settingsObject.preferenceName}.`,
+			);
+			localStorage.setItem(settingsObject.preferenceName, 0);
+			settingsObject.handleOffToggle();
+		}
+	});
+};