From 036b5ae2908abdd37b5a27daebda87627cf8224c Mon Sep 17 00:00:00 2001
From: Bradley Shellnut <bradleyshellnut@protonmail.com>
Date: Fri, 13 Dec 2024 11:58:30 -0800
Subject: [PATCH] Moving base page to load data on return.

---
 src/routes/+page.server.ts | 68 +++++++++++++++++++-------------------
 1 file changed, 34 insertions(+), 34 deletions(-)

diff --git a/src/routes/+page.server.ts b/src/routes/+page.server.ts
index af5bdec..7ca1d88 100644
--- a/src/routes/+page.server.ts
+++ b/src/routes/+page.server.ts
@@ -1,60 +1,60 @@
-import type { MetaTagsProps } from 'svelte-meta-tags';
-import { PUBLIC_SITE_URL } from '$env/static/public';
-import type { PageServerLoad } from './$types';
-import { fetchBandcampAlbums } from '$lib/util/fetchBandcampAlbums';
-import type { Album } from '$lib/types/album';
-import type { ArticlePageLoad } from '$lib/types/article';
+import type { MetaTagsProps } from "svelte-meta-tags";
+import { PUBLIC_SITE_URL } from "$env/static/public";
+import type { PageServerLoad } from "./$types";
+import { fetchBandcampAlbums } from "$lib/util/fetchBandcampAlbums";
+import type { Album } from "$lib/types/album";
+import type { ArticlePageLoad } from "$lib/types/article";
 
 export const load: PageServerLoad = async ({ fetch, setHeaders, url }) => {
 	let baseUrl;
-	if (url.origin.includes('prerender')) {
-		baseUrl = PUBLIC_SITE_URL || 'https://bradleyshellnut.com';
+	if (url.origin.includes("prerender")) {
+		baseUrl = PUBLIC_SITE_URL || "https://bradleyshellnut.com";
 	} else {
-		baseUrl = new URL(url.origin).href || PUBLIC_SITE_URL || 'https://bradleyshellnut.com';
+		baseUrl =
+			new URL(url.origin).href ||
+			PUBLIC_SITE_URL ||
+			"https://bradleyshellnut.com";
 	}
 	const currentPageUrl = new URL(url.pathname, url.origin).href;
 
 	const metaTags: MetaTagsProps = Object.freeze({
-		title: 'Home',
-		description: "My name is Bradley Shellnut and I'm a Full Stack Software Engineer.",
+		title: "Home",
+		description:
+			"My name is Bradley Shellnut and I'm a Full Stack Software Engineer.",
 		openGraph: {
-			title: 'Home',
-			description: "My name is Bradley Shellnut and I'm a Full Stack Software Engineer.",
+			title: "Home",
+			description:
+				"My name is Bradley Shellnut and I'm a Full Stack Software Engineer.",
 			url: currentPageUrl,
-			siteName: 'Bradley Shellnut Personal Website',
-			type: 'website',
-			locale: 'en_US',
+			siteName: "Bradley Shellnut Personal Website",
+			type: "website",
+			locale: "en_US",
 			images: [
 				{
 					url: `${baseUrl}og?header=Home | bradleyshellnut.com&page=Hi I'm Bradley Shellnut.&content=I'm a full stack software engineer currently working on Java Spring, PostgreSQL, and React / Angular JS.`,
-					alt: 'Bradley Shellnut Website Home Page',
+					alt: "Bradley Shellnut Website Home Page",
 					width: 1200,
-					height: 630
-				}
-			]
+					height: 630,
+				},
+			],
 		},
 		twitter: {
-			title: 'Home',
-			description: 'Home page',
-			card: 'summary_large_image',
+			title: "Home",
+			description: "Home page",
+			card: "summary_large_image",
 			image: `${baseUrl}og?header=Home | bradleyshellnut.com&page=Hi I'm Bradley Shellnut.&content=I'm a full stack software engineer currently working on Java Spring, PostgreSQL, and React / Angular JS.`,
-			imageAlt: 'Bradley Shellnut Website Logo'
+			imageAlt: "Bradley Shellnut Website Logo",
 		},
-		url: currentPageUrl
+		url: currentPageUrl,
 	});
 
-	const [albums, articles]: [Album[], ArticlePageLoad] = await Promise.all([
-		await fetchBandcampAlbums(),
-	  (await fetch(`/api/articles?page=1&limit=3`)).json()
-	]);
-
 	setHeaders({
-		'cache-control': 'max-age=43200'
+		"cache-control": "max-age=43200",
 	});
 	return {
 		baseUrl,
 		metaTagsChild: metaTags,
-		albums,
-		articlesData: articles
+		albums: await fetchBandcampAlbums(),
+		articlesData: await (await fetch("/api/articles?page=1&limit=3")).json(),
 	};
-};
\ No newline at end of file
+};