From 97acbbd22615e9eef83dab055c01ebd305961de1 Mon Sep 17 00:00:00 2001
From: Alexander Daichendt <alexander.daichendt@tum.de>
Date: Mon, 22 Aug 2022 15:36:05 +0200
Subject: [PATCH] chore: finished migration

---
 package.json                      |  2 +-
 src/lib/components/SEO.svelte     | 25 +++++++++++++++++++++++++
 src/lib/layouts/blog.svelte       |  8 ++++++++
 src/routes/+layout.svelte         | 27 ---------------------------
 src/routes/+page.svelte           |  3 +++
 src/routes/blog/+page.svelte      |  9 ++++++---
 src/routes/blog/+page.ts          |  5 ++---
 src/routes/cat/+page.svelte       | 11 +++++++----
 src/routes/cat/+page.ts           | 12 ++++--------
 src/routes/contact/+page.svelte   |  3 +++
 src/routes/contact/+page.ts       |  3 +--
 src/routes/impressum/+page.svelte |  6 ++++++
 src/routes/impressum/+page.ts     |  3 +--
 src/routes/privacy/+page.svelte   |  6 ++++++
 src/routes/privacy/+page.ts       |  5 ++---
 yarn.lock                         | 11 +++++------
 16 files changed, 80 insertions(+), 59 deletions(-)
 create mode 100644 src/lib/components/SEO.svelte

diff --git a/package.json b/package.json
index a538968..2d26bfa 100644
--- a/package.json
+++ b/package.json
@@ -15,7 +15,7 @@
 	},
 	"devDependencies": {
 		"@sveltejs/adapter-auto": "next",
-		"@sveltejs/kit": "1.0.0-next.413",
+		"@sveltejs/kit": "^1.0.0-next.428",
 		"@typescript-eslint/eslint-plugin": "^5.27.0",
 		"@typescript-eslint/parser": "^5.27.0",
 		"autoprefixer": "^10.4.7",
diff --git a/src/lib/components/SEO.svelte b/src/lib/components/SEO.svelte
new file mode 100644
index 0000000..33454b1
--- /dev/null
+++ b/src/lib/components/SEO.svelte
@@ -0,0 +1,25 @@
+<script lang="ts">
+	import { page } from '$app/stores';
+
+	export let title = "Alex Daichendt's website";
+	export let keywords: string[] = [];
+	export let description: string;
+	let seo = $page.data?.seo;
+
+	if (seo) {
+		title = seo.title ? `${seo.title} - Alex Daichendt` : "Alex Daichendt's website";
+		description = seo.description;
+		keywords = seo.keywords;
+	}
+</script>
+
+<svelte:head
+	><title>{title}</title>
+	{#if description}
+		<meta name="description" content={description} />
+	{/if}
+	<meta name="author" content="Alexander Daichendt" />
+	{#if keywords}
+		<meta name="keywords" content={keywords.join(',')} />
+	{/if}
+</svelte:head>
diff --git a/src/lib/layouts/blog.svelte b/src/lib/layouts/blog.svelte
index ebe8a4c..026afaa 100644
--- a/src/lib/layouts/blog.svelte
+++ b/src/lib/layouts/blog.svelte
@@ -12,6 +12,12 @@
 	import Icon from 'mdi-svelte';
 	import Divider from '$components/Divider.svelte';
 	import '$lib/utils/one-dark.css';
+	import SEO from '$components/SEO.svelte';
+
+	// svelte-ignore unused-export-let
+	export let data;
+	// svelte-ignore unused-export-let
+	export let errors;
 
 	export let title;
 	// svelte-ignore unused-export-let
@@ -24,6 +30,8 @@
 	export let hidden = false;
 </script>
 
+<SEO {title} {description} {keywords} />
+
 <h1>{title}</h1>
 <aside role="note">
 	{#if updated}
diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte
index 5f6f374..f6b1f9f 100644
--- a/src/routes/+layout.svelte
+++ b/src/routes/+layout.svelte
@@ -1,37 +1,10 @@
 <script lang="ts">
-	import { page } from '$app/stores';
 	import MoveUpButton from '$components/MoveUpButton.svelte';
 	import Footer from '$lib/components/Footer.svelte';
 	import Header from '$lib/components/Header.svelte';
 	import '@fontsource/ubuntu-mono/400.css';
-
-	// svelte-ignore unused-export-let
-	export let data;
-
-	let seo = $page.data?.seo;
-
-	let wrappedTitle = "Alex Daichendt's website";
-	let description = '';
-	let keywords: string[] = [];
-
-	if (seo) {
-		wrappedTitle = seo.title ? `${seo.title} - Alex Daichendt` : "Alex Daichendt's website";
-		description = seo.description;
-		keywords = seo.keywords;
-	}
 </script>
 
-<svelte:head
-	><title>{wrappedTitle}</title>
-	{#if description}
-		<meta name="description" content={description} />
-	{/if}
-	<meta name="author" content="Alexander Daichendt" />
-	{#if keywords}
-		<meta name="keywords" content={keywords.join(',')} />
-	{/if}
-</svelte:head>
-
 <div class="container upper">
 	<Header />
 	<div class="content">
diff --git a/src/routes/+page.svelte b/src/routes/+page.svelte
index 39ae885..01b4423 100644
--- a/src/routes/+page.svelte
+++ b/src/routes/+page.svelte
@@ -1,4 +1,5 @@
 <script lang="ts">
+	import SEO from '$components/SEO.svelte';
 	import ListItem from '$components/ListItem.svelte';
 	import Link from '$components/Link.svelte';
 	import type { Skill } from '$lib/utils/types';
@@ -53,6 +54,8 @@
 	];
 </script>
 
+<SEO />
+
 <h1>Hi, my name is Alex!</h1>
 
 <p>I am a software engineer, Linux enthusiast and a friend of automation.</p>
diff --git a/src/routes/blog/+page.svelte b/src/routes/blog/+page.svelte
index 50dadd1..a74ba41 100644
--- a/src/routes/blog/+page.svelte
+++ b/src/routes/blog/+page.svelte
@@ -1,12 +1,15 @@
 <script lang="ts">
-	import type { BlogPostMeta } from '$lib/utils/types';
+	import SEO from '$components/SEO.svelte';
 	import Link from '$components/Link.svelte';
 	import ListItem from '$components/ListItem.svelte';
+	import type { PageData } from './$types';
 
-	export let data;
-	const posts: BlogPostMeta[] = data.posts;
+	export let data: PageData;
+	$: posts = data.posts;
 </script>
 
+<SEO />
+
 <h1>Blog Posts</h1>
 
 <p>Sometimes I document some of the things I do.</p>
diff --git a/src/routes/blog/+page.ts b/src/routes/blog/+page.ts
index 05dc5e6..d4ee1b4 100644
--- a/src/routes/blog/+page.ts
+++ b/src/routes/blog/+page.ts
@@ -1,7 +1,6 @@
-import type { LoadEvent } from '@sveltejs/kit';
 import type { PageLoad } from './$types';
 
-export async function load({ data }: LoadEvent): PageLoad {
+export const load: PageLoad = ({ data }) => {
 	return {
 		posts: data.posts,
 		seo: {
@@ -10,4 +9,4 @@ export async function load({ data }: LoadEvent): PageLoad {
 				'My blogposts, where I occasionally document things, that I think are not accessible or badly documented.',
 		},
 	};
-}
+};
diff --git a/src/routes/cat/+page.svelte b/src/routes/cat/+page.svelte
index ee36089..c93f8d5 100644
--- a/src/routes/cat/+page.svelte
+++ b/src/routes/cat/+page.svelte
@@ -1,13 +1,16 @@
 <script lang="ts">
-	throw new Error("@migration task: Add data prop (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292707)");
-
+	import type { PageData } from './$types';
 	import Image from '$lib/components/CatImage.svelte';
-	import type { ImageMetadata } from '$lib/utils/types';
 	import Link from '$lib/components/Link.svelte';
+	import SEO from '$components/SEO.svelte';
 
-	export let cats: { images: ImageMetadata[] }[];
+	export let data: PageData;
+
+	$: cats = data.cats;
 </script>
 
+<SEO />
+
 <section class="masonry">
 	{#each cats as cat}
 		<figure>
diff --git a/src/routes/cat/+page.ts b/src/routes/cat/+page.ts
index f8dd021..286f65d 100644
--- a/src/routes/cat/+page.ts
+++ b/src/routes/cat/+page.ts
@@ -1,13 +1,9 @@
-import type { LoadEvent, LoadOutput } from '@sveltejs/kit';
+import type { PageLoad } from './$types';
 
-export async function load({ fetch }: LoadEvent): PageLoadOutput {
+export const load: PageLoad = async ({ fetch }) => {
 	const response = await fetch('https://cats.daichendt.one/list');
 	const asJson = await response.json();
-	throw new Error("@migration task: Migrate this return statement (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292693)");
 	return {
-		status: response.status,
-		props: {
-			cats: response.ok && asJson,
-		},
+		cats: response.ok && asJson,
 	};
-}
+};
diff --git a/src/routes/contact/+page.svelte b/src/routes/contact/+page.svelte
index eb56cfb..e741d1e 100644
--- a/src/routes/contact/+page.svelte
+++ b/src/routes/contact/+page.svelte
@@ -1,4 +1,5 @@
 <script>
+	import SEO from '$components/SEO.svelte';
 	import { mdiEmailEditOutline, mdiKey } from '@mdi/js';
 	import { mdiGithub } from '@mdi/js';
 	import Icon from 'mdi-svelte';
@@ -7,6 +8,8 @@
 	import ListItem from '$components/ListItem.svelte';
 </script>
 
+<SEO />
+
 <h1>Contact Information</h1>
 
 <ul>
diff --git a/src/routes/contact/+page.ts b/src/routes/contact/+page.ts
index 5ed74bc..f0a6803 100644
--- a/src/routes/contact/+page.ts
+++ b/src/routes/contact/+page.ts
@@ -1,7 +1,6 @@
 export async function load() {
-	throw new Error("@migration task: Migrate this return statement (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292693)");
 	return {
-		stuff: {
+		seo: {
 			title: 'Contact',
 			description: 'All the communication channels for contacting Alex Daichendt ',
 		},
diff --git a/src/routes/impressum/+page.svelte b/src/routes/impressum/+page.svelte
index 4072502..ca86484 100644
--- a/src/routes/impressum/+page.svelte
+++ b/src/routes/impressum/+page.svelte
@@ -1,3 +1,9 @@
+<script>
+	import SEO from '$components/SEO.svelte';
+</script>
+
+<SEO />
+
 <h1>Impressum</h1>
 
 <p>Information according to §5 TMG:</p>
diff --git a/src/routes/impressum/+page.ts b/src/routes/impressum/+page.ts
index 99a2fe6..1370548 100644
--- a/src/routes/impressum/+page.ts
+++ b/src/routes/impressum/+page.ts
@@ -1,7 +1,6 @@
 export async function load() {
-	throw new Error("@migration task: Migrate this return statement (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292693)");
 	return {
-		stuff: {
+		seo: {
 			title: 'Impressum',
 			description: 'The impressum I have to include for Germany.',
 		},
diff --git a/src/routes/privacy/+page.svelte b/src/routes/privacy/+page.svelte
index 241a541..d50a6f7 100644
--- a/src/routes/privacy/+page.svelte
+++ b/src/routes/privacy/+page.svelte
@@ -1,3 +1,9 @@
+<script>
+	import SEO from '$components/SEO.svelte';
+</script>
+
+<SEO />
+
 <h1>Privacy Policy for AlexDaichendt</h1>
 
 <p>
diff --git a/src/routes/privacy/+page.ts b/src/routes/privacy/+page.ts
index 69fd595..e9fbfb4 100644
--- a/src/routes/privacy/+page.ts
+++ b/src/routes/privacy/+page.ts
@@ -1,10 +1,9 @@
 export async function load() {
-	throw new Error("@migration task: Migrate this return statement (https://github.com/sveltejs/kit/discussions/5774#discussioncomment-3292693)");
 	return {
-		stuff: {
+		seo: {
 			title: 'Privacy',
 			description:
-				'The privacy policy I have to include even though I don"t collect any data or use shady services.',
+				'The privacy policy I have to include even though I do not collect any data or use shady services.',
 		},
 	};
 }
diff --git a/yarn.lock b/yarn.lock
index 4dba984..7a1a8aa 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -159,13 +159,12 @@
     "@vercel/nft" "^0.20.0"
     esbuild "^0.14.48"
 
-"@sveltejs/kit@1.0.0-next.413":
-  version "1.0.0-next.413"
-  resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.413.tgz#f79e4a0d582621aaf9016e37826b180f9f3be0aa"
-  integrity sha512-6rboaf0LuMEOmW+wyyAmBJ7q8/TyRxJ3ESc8t/k9l0NGXoQ2l61IzHKuHxcxjriKczZFdGFuB97j8wQ/PlLyHA==
+"@sveltejs/kit@^1.0.0-next.428":
+  version "1.0.0-next.428"
+  resolved "https://registry.yarnpkg.com/@sveltejs/kit/-/kit-1.0.0-next.428.tgz#8ca0c4a96d67763e9b2d2e27a2c6eada41d62b6b"
+  integrity sha512-CVp7zltQ+3VOII1s7KuvgvGEFwD0PSqts9R3q4eaj0CNoC3gpdzcbEZayyQwXX/3lI1HdSNSF8gxbX0TRUoFuA==
   dependencies:
     "@sveltejs/vite-plugin-svelte" "^1.0.1"
-    chokidar "^3.5.3"
     cookie "^0.5.0"
     devalue "^2.0.1"
     kleur "^4.1.4"
@@ -528,7 +527,7 @@ character-entities@^2.0.0:
   resolved "https://registry.yarnpkg.com/character-entities/-/character-entities-2.0.2.tgz#2d09c2e72cd9523076ccb21157dff66ad43fcc22"
   integrity sha512-shx7oQ0Awen/BRIdkjkvz54PnEEI/EjwXDSIZp86/KKdbafHh1Df/RYGBhn4hbe2+uKC9FnT5UCEdyPz3ai9hQ==
 
-chokidar@^3.4.1, chokidar@^3.5.3:
+chokidar@^3.4.1:
   version "3.5.3"
   resolved "https://registry.yarnpkg.com/chokidar/-/chokidar-3.5.3.tgz#1cf37c8707b932bd1af1ae22c0432e2acd1903bd"
   integrity sha512-Dr3sfKRP6oTcjf2JmUmFJfeVMvXBdegxB0iVQ5eb2V10uFJUCAS8OByZdVAyVb8xXNz3GjjTgj9kLWsZTqE6kw==