From 9949b47c83c7fffd6811c6fd617e3b4ab3fab1a0 Mon Sep 17 00:00:00 2001
From: Takashi Fujita <tgfjt.mail@gmail.com>
Date: Fri, 3 Apr 2026 17:23:23 +0900
Subject: [PATCH 1/2] fix(blog): use getSiteSettings() instead of hardcoded
 site title

Replace hardcoded "My Blog" title and tagline across blog and
blog-cloudflare templates with dynamic values from getSiteSettings(),
so that changes made in the admin Settings panel are reflected on
the site.
---
 blog-cloudflare/src/layouts/Base.astro       | 8 +++++---
 blog-cloudflare/src/pages/index.astro        | 8 ++++++--
 blog-cloudflare/src/pages/posts/[slug].astro | 6 +++++-
 blog-cloudflare/src/pages/rss.xml.ts         | 8 ++++----
 blog/src/layouts/Base.astro                  | 8 +++++---
 blog/src/pages/index.astro                   | 8 ++++++--
 blog/src/pages/posts/[slug].astro            | 6 +++++-
 blog/src/pages/rss.xml.ts                    | 8 ++++----
 8 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/blog-cloudflare/src/layouts/Base.astro b/blog-cloudflare/src/layouts/Base.astro
index b9bdde6..26cb246 100644
--- a/blog-cloudflare/src/layouts/Base.astro
+++ b/blog-cloudflare/src/layouts/Base.astro
@@ -1,5 +1,5 @@
 ---
-import { getMenu, getEmDashCollection } from "emdash";
+import { getMenu, getEmDashCollection, getSiteSettings } from "emdash";
 import {
 	WidgetArea,
 	EmDashHead,
@@ -36,7 +36,9 @@ const {
 	author,
 	content,
 } = Astro.props;
-const siteTitle = "My Blog";
+const settings = await getSiteSettings();
+const siteTitle = settings.title ?? "My Blog";
+const siteTagline = settings.tagline ?? "";
 // If title already includes site title (from getSeoMeta), use as-is
 const fullTitle = title.includes(siteTitle) ? title : `${title} — ${siteTitle}`;
 
@@ -136,7 +138,7 @@ const isLoggedIn = !!Astro.locals.user;
 				<div class="footer-grid">
 					<div class="footer-brand">
 						<a href="/" class="footer-logo">{siteTitle}</a>
-						<p class="footer-tagline">Thoughts, stories, and ideas.</p>
+						<p class="footer-tagline">{siteTagline}</p>
 					</div>
 					<div class="footer-nav">
 						<h4 class="footer-heading">Navigate</h4>
diff --git a/blog-cloudflare/src/pages/index.astro b/blog-cloudflare/src/pages/index.astro
index 4c72f48..a6935a0 100644
--- a/blog-cloudflare/src/pages/index.astro
+++ b/blog-cloudflare/src/pages/index.astro
@@ -1,10 +1,14 @@
 ---
-import { getEmDashCollection, getEntryTerms } from "emdash";
+import { getEmDashCollection, getEntryTerms, getSiteSettings } from "emdash";
 import { Image } from "emdash/ui";
 import Base from "../layouts/Base.astro";
 import PostCard from "../components/PostCard.astro";
 import { getReadingTime } from "../utils/reading-time";
 
+const settings = await getSiteSettings();
+const siteTitle = settings.title ?? "My Blog";
+const siteTagline = settings.tagline ?? "";
+
 const { entries: posts, cacheHint } = await getEmDashCollection("posts");
 
 Astro.cache.set(cacheHint);
@@ -58,7 +62,7 @@ function formatDate(date: Date | null | undefined) {
 }
 ---
 
-<Base title="My Blog" description="Welcome to my blog">
+<Base title={siteTitle} description={siteTagline}>
 	{
 		posts.length === 0 ? (
 			<section class="empty-state">
diff --git a/blog-cloudflare/src/pages/posts/[slug].astro b/blog-cloudflare/src/pages/posts/[slug].astro
index 7e9b322..d83d7ab 100644
--- a/blog-cloudflare/src/pages/posts/[slug].astro
+++ b/blog-cloudflare/src/pages/posts/[slug].astro
@@ -4,6 +4,7 @@ import {
 	getEmDashCollection,
 	getEntryTerms,
 	getSeoMeta,
+	getSiteSettings,
 } from "emdash";
 import {
 	Image,
@@ -53,9 +54,12 @@ function getImageUrl(img: unknown): string | undefined {
 }
 const featuredImageUrl = getImageUrl(post.data.featured_image);
 
+const settings = await getSiteSettings();
+const siteTitle = settings.title ?? "My Blog";
+
 // Generate SEO meta from content
 const seo = getSeoMeta(post, {
-	siteTitle: "My Blog",
+	siteTitle,
 	siteUrl: Astro.url.origin,
 	path: `/posts/${slug}`,
 	defaultOgImage: featuredImageUrl,
diff --git a/blog-cloudflare/src/pages/rss.xml.ts b/blog-cloudflare/src/pages/rss.xml.ts
index a944a74..b06197f 100644
--- a/blog-cloudflare/src/pages/rss.xml.ts
+++ b/blog-cloudflare/src/pages/rss.xml.ts
@@ -1,10 +1,10 @@
 import type { APIRoute } from "astro";
-import { getEmDashCollection } from "emdash";
-
-const siteTitle = "My Blog";
-const siteDescription = "A blog about software, design, and the occasional stray thought.";
+import { getEmDashCollection, getSiteSettings } from "emdash";
 
 export const GET: APIRoute = async ({ site, url }) => {
+	const settings = await getSiteSettings();
+	const siteTitle = settings.title ?? "My Blog";
+	const siteDescription = settings.tagline ?? "";
 	const siteUrl = site?.toString() || url.origin;
 
 	const { entries: posts } = await getEmDashCollection("posts", {
diff --git a/blog/src/layouts/Base.astro b/blog/src/layouts/Base.astro
index b9bdde6..26cb246 100644
--- a/blog/src/layouts/Base.astro
+++ b/blog/src/layouts/Base.astro
@@ -1,5 +1,5 @@
 ---
-import { getMenu, getEmDashCollection } from "emdash";
+import { getMenu, getEmDashCollection, getSiteSettings } from "emdash";
 import {
 	WidgetArea,
 	EmDashHead,
@@ -36,7 +36,9 @@ const {
 	author,
 	content,
 } = Astro.props;
-const siteTitle = "My Blog";
+const settings = await getSiteSettings();
+const siteTitle = settings.title ?? "My Blog";
+const siteTagline = settings.tagline ?? "";
 // If title already includes site title (from getSeoMeta), use as-is
 const fullTitle = title.includes(siteTitle) ? title : `${title} — ${siteTitle}`;
 
@@ -136,7 +138,7 @@ const isLoggedIn = !!Astro.locals.user;
 				<div class="footer-grid">
 					<div class="footer-brand">
 						<a href="/" class="footer-logo">{siteTitle}</a>
-						<p class="footer-tagline">Thoughts, stories, and ideas.</p>
+						<p class="footer-tagline">{siteTagline}</p>
 					</div>
 					<div class="footer-nav">
 						<h4 class="footer-heading">Navigate</h4>
diff --git a/blog/src/pages/index.astro b/blog/src/pages/index.astro
index 4c72f48..a6935a0 100644
--- a/blog/src/pages/index.astro
+++ b/blog/src/pages/index.astro
@@ -1,10 +1,14 @@
 ---
-import { getEmDashCollection, getEntryTerms } from "emdash";
+import { getEmDashCollection, getEntryTerms, getSiteSettings } from "emdash";
 import { Image } from "emdash/ui";
 import Base from "../layouts/Base.astro";
 import PostCard from "../components/PostCard.astro";
 import { getReadingTime } from "../utils/reading-time";
 
+const settings = await getSiteSettings();
+const siteTitle = settings.title ?? "My Blog";
+const siteTagline = settings.tagline ?? "";
+
 const { entries: posts, cacheHint } = await getEmDashCollection("posts");
 
 Astro.cache.set(cacheHint);
@@ -58,7 +62,7 @@ function formatDate(date: Date | null | undefined) {
 }
 ---
 
-<Base title="My Blog" description="Welcome to my blog">
+<Base title={siteTitle} description={siteTagline}>
 	{
 		posts.length === 0 ? (
 			<section class="empty-state">
diff --git a/blog/src/pages/posts/[slug].astro b/blog/src/pages/posts/[slug].astro
index 7e9b322..d83d7ab 100644
--- a/blog/src/pages/posts/[slug].astro
+++ b/blog/src/pages/posts/[slug].astro
@@ -4,6 +4,7 @@ import {
 	getEmDashCollection,
 	getEntryTerms,
 	getSeoMeta,
+	getSiteSettings,
 } from "emdash";
 import {
 	Image,
@@ -53,9 +54,12 @@ function getImageUrl(img: unknown): string | undefined {
 }
 const featuredImageUrl = getImageUrl(post.data.featured_image);
 
+const settings = await getSiteSettings();
+const siteTitle = settings.title ?? "My Blog";
+
 // Generate SEO meta from content
 const seo = getSeoMeta(post, {
-	siteTitle: "My Blog",
+	siteTitle,
 	siteUrl: Astro.url.origin,
 	path: `/posts/${slug}`,
 	defaultOgImage: featuredImageUrl,
diff --git a/blog/src/pages/rss.xml.ts b/blog/src/pages/rss.xml.ts
index a944a74..b06197f 100644
--- a/blog/src/pages/rss.xml.ts
+++ b/blog/src/pages/rss.xml.ts
@@ -1,10 +1,10 @@
 import type { APIRoute } from "astro";
-import { getEmDashCollection } from "emdash";
-
-const siteTitle = "My Blog";
-const siteDescription = "A blog about software, design, and the occasional stray thought.";
+import { getEmDashCollection, getSiteSettings } from "emdash";
 
 export const GET: APIRoute = async ({ site, url }) => {
+	const settings = await getSiteSettings();
+	const siteTitle = settings.title ?? "My Blog";
+	const siteDescription = settings.tagline ?? "";
 	const siteUrl = site?.toString() || url.origin;
 
 	const { entries: posts } = await getEmDashCollection("posts", {

From 1b839a0917a8692f408d07faa4a09409f7d46324 Mon Sep 17 00:00:00 2001
From: Takashi Fujita <tgfjt.mail@gmail.com>
Date: Fri, 3 Apr 2026 17:26:40 +0900
Subject: [PATCH 2/2] fix: use optional chaining and || for consistency with
 other templates

Match the settings?.title || "fallback" pattern used in
portfolio and marketing templates instead of settings.title ?? "fallback".
---
 blog-cloudflare/src/layouts/Base.astro       | 4 ++--
 blog-cloudflare/src/pages/index.astro        | 4 ++--
 blog-cloudflare/src/pages/posts/[slug].astro | 2 +-
 blog-cloudflare/src/pages/rss.xml.ts         | 4 ++--
 blog/src/layouts/Base.astro                  | 4 ++--
 blog/src/pages/index.astro                   | 4 ++--
 blog/src/pages/posts/[slug].astro            | 2 +-
 blog/src/pages/rss.xml.ts                    | 4 ++--
 8 files changed, 14 insertions(+), 14 deletions(-)

diff --git a/blog-cloudflare/src/layouts/Base.astro b/blog-cloudflare/src/layouts/Base.astro
index 26cb246..ee02ab7 100644
--- a/blog-cloudflare/src/layouts/Base.astro
+++ b/blog-cloudflare/src/layouts/Base.astro
@@ -37,8 +37,8 @@ const {
 	content,
 } = Astro.props;
 const settings = await getSiteSettings();
-const siteTitle = settings.title ?? "My Blog";
-const siteTagline = settings.tagline ?? "";
+const siteTitle = settings?.title || "My Blog";
+const siteTagline = settings?.tagline || "";
 // If title already includes site title (from getSeoMeta), use as-is
 const fullTitle = title.includes(siteTitle) ? title : `${title} — ${siteTitle}`;
 
diff --git a/blog-cloudflare/src/pages/index.astro b/blog-cloudflare/src/pages/index.astro
index a6935a0..9c16098 100644
--- a/blog-cloudflare/src/pages/index.astro
+++ b/blog-cloudflare/src/pages/index.astro
@@ -6,8 +6,8 @@ import PostCard from "../components/PostCard.astro";
 import { getReadingTime } from "../utils/reading-time";
 
 const settings = await getSiteSettings();
-const siteTitle = settings.title ?? "My Blog";
-const siteTagline = settings.tagline ?? "";
+const siteTitle = settings?.title || "My Blog";
+const siteTagline = settings?.tagline || "";
 
 const { entries: posts, cacheHint } = await getEmDashCollection("posts");
 
diff --git a/blog-cloudflare/src/pages/posts/[slug].astro b/blog-cloudflare/src/pages/posts/[slug].astro
index d83d7ab..b97a12b 100644
--- a/blog-cloudflare/src/pages/posts/[slug].astro
+++ b/blog-cloudflare/src/pages/posts/[slug].astro
@@ -55,7 +55,7 @@ function getImageUrl(img: unknown): string | undefined {
 const featuredImageUrl = getImageUrl(post.data.featured_image);
 
 const settings = await getSiteSettings();
-const siteTitle = settings.title ?? "My Blog";
+const siteTitle = settings?.title || "My Blog";
 
 // Generate SEO meta from content
 const seo = getSeoMeta(post, {
diff --git a/blog-cloudflare/src/pages/rss.xml.ts b/blog-cloudflare/src/pages/rss.xml.ts
index b06197f..549b847 100644
--- a/blog-cloudflare/src/pages/rss.xml.ts
+++ b/blog-cloudflare/src/pages/rss.xml.ts
@@ -3,8 +3,8 @@ import { getEmDashCollection, getSiteSettings } from "emdash";
 
 export const GET: APIRoute = async ({ site, url }) => {
 	const settings = await getSiteSettings();
-	const siteTitle = settings.title ?? "My Blog";
-	const siteDescription = settings.tagline ?? "";
+	const siteTitle = settings?.title || "My Blog";
+	const siteDescription = settings?.tagline || "";
 	const siteUrl = site?.toString() || url.origin;
 
 	const { entries: posts } = await getEmDashCollection("posts", {
diff --git a/blog/src/layouts/Base.astro b/blog/src/layouts/Base.astro
index 26cb246..ee02ab7 100644
--- a/blog/src/layouts/Base.astro
+++ b/blog/src/layouts/Base.astro
@@ -37,8 +37,8 @@ const {
 	content,
 } = Astro.props;
 const settings = await getSiteSettings();
-const siteTitle = settings.title ?? "My Blog";
-const siteTagline = settings.tagline ?? "";
+const siteTitle = settings?.title || "My Blog";
+const siteTagline = settings?.tagline || "";
 // If title already includes site title (from getSeoMeta), use as-is
 const fullTitle = title.includes(siteTitle) ? title : `${title} — ${siteTitle}`;
 
diff --git a/blog/src/pages/index.astro b/blog/src/pages/index.astro
index a6935a0..9c16098 100644
--- a/blog/src/pages/index.astro
+++ b/blog/src/pages/index.astro
@@ -6,8 +6,8 @@ import PostCard from "../components/PostCard.astro";
 import { getReadingTime } from "../utils/reading-time";
 
 const settings = await getSiteSettings();
-const siteTitle = settings.title ?? "My Blog";
-const siteTagline = settings.tagline ?? "";
+const siteTitle = settings?.title || "My Blog";
+const siteTagline = settings?.tagline || "";
 
 const { entries: posts, cacheHint } = await getEmDashCollection("posts");
 
diff --git a/blog/src/pages/posts/[slug].astro b/blog/src/pages/posts/[slug].astro
index d83d7ab..b97a12b 100644
--- a/blog/src/pages/posts/[slug].astro
+++ b/blog/src/pages/posts/[slug].astro
@@ -55,7 +55,7 @@ function getImageUrl(img: unknown): string | undefined {
 const featuredImageUrl = getImageUrl(post.data.featured_image);
 
 const settings = await getSiteSettings();
-const siteTitle = settings.title ?? "My Blog";
+const siteTitle = settings?.title || "My Blog";
 
 // Generate SEO meta from content
 const seo = getSeoMeta(post, {
diff --git a/blog/src/pages/rss.xml.ts b/blog/src/pages/rss.xml.ts
index b06197f..549b847 100644
--- a/blog/src/pages/rss.xml.ts
+++ b/blog/src/pages/rss.xml.ts
@@ -3,8 +3,8 @@ import { getEmDashCollection, getSiteSettings } from "emdash";
 
 export const GET: APIRoute = async ({ site, url }) => {
 	const settings = await getSiteSettings();
-	const siteTitle = settings.title ?? "My Blog";
-	const siteDescription = settings.tagline ?? "";
+	const siteTitle = settings?.title || "My Blog";
+	const siteDescription = settings?.tagline || "";
 	const siteUrl = site?.toString() || url.origin;
 
 	const { entries: posts } = await getEmDashCollection("posts", {