From c9e16283e7dcaf9430488bc86582962c3d39601b Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@pm.me>
Date: Wed, 8 Nov 2023 13:29:04 -0800
Subject: [PATCH] Cleanup layout static SEO.

---
 src/routes/+layout.svelte  | 12 +++++++++++-
 src/routes/+page.server.ts | 11 ++---------
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 0f3aa76..e22f6f0 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -32,8 +32,18 @@
 		titleTemplate: '%s | Bradley Shellnut',
 		openGraph: {
 			type: 'website',
-			titleTemplate: '%s | Bradley Shellnut',
 			locale: 'en_US',
+			images: [
+				{
+					url: `${$page.data.baseUrl}b_shell_nut_favicon.gif`,
+					alt: 'Bradley Shellnut Website Logo'
+				}
+			]
+		},
+		twitter: {
+			card: 'summary_large_image',
+			image: `${$page.data.baseUrl}b_shell_nut_favicon.gif`,
+			imageAlt: 'Bradley Shellnut Website Logo'
 		},
 		...$page.data.metaTagsChild
 	}
diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index 9893833..50dc12b 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -3,6 +3,7 @@ import type { PageServerLoad } from './lib/$types';
 import { fetchBandcampAlbums } from '$root/lib/util/fetchBandcampAlbums';
 
 export const load: PageServerLoad = async ({ fetch, setHeaders, url }) => {
+	const baseUrl = new URL(url.origin).href;
 	const metaTags: MetaTagsProps = Object.freeze({
 		title: 'Home',
 		description: "My name is Bradley Shellnut and I'm a Full Stack Software Engineer.",
@@ -11,19 +12,10 @@ export const load: PageServerLoad = async ({ fetch, setHeaders, url }) => {
 			description: "My name is Bradley Shellnut and I'm a Full Stack Software Engineer.",
 			url: new URL(url.pathname, url.origin).href,
 			siteName: 'Bradley Shellnut Personal Website',
-			images: [
-				{
-					url: `${new URL(url.origin).href}/b_shell_nut_favicon.gif`,
-					alt: 'Bradley Shellnut Website Logo'
-				}
-			]
 		},
 		twitter: {
-			card: 'summary_large_image',
 			title: 'Home',
 			description: 'Home page',
-			images: `${new URL(url.origin).href}/b_shell_nut_favicon.gif`,
-			imageAlt: 'Bradley Shellnut Website Logo'
 		},
 		url: new URL(url.pathname, url.origin).href
 	});
@@ -35,6 +27,7 @@ export const load: PageServerLoad = async ({ fetch, setHeaders, url }) => {
 		'cache-control': 'max-age=43200'
 	});
 	return {
+		baseUrl,
 		metaTagsChild: metaTags,
 		albums: albums(),
 		articlesData: (await articles()).json()