fix metadata

biltongza · Nov 19, 2024 · 02b316d · 02b316d
1 parent b265d83
commit 02b316d
Show file tree

Hide file tree

Showing 5 changed files with 11 additions and 18 deletions.
diff --git a/frontend/src/lib/stores.svelte.ts b/frontend/src/lib/stores.svelte.ts
@@ -1,8 +1,5 @@
-import { writable } from 'svelte/store';
-import { defaultMetadata } from './__consts';
-
 let title: string = $state<string | undefined>(undefined);
-let meta: Record<string, string> = $state(defaultMetadata);
+let meta: Record<string, string> = $state({});
 
 export function useTitle() {
   return {
@@ -23,16 +20,11 @@ export function usePageMetadata() {
     },
 
     clear() {
-      meta = defaultMetadata;
+      meta = {};
     },
 
-    push(metas: Record<string, string>) {
-      meta = {
-        ...meta,
-        ...metas
-      };
+    set(newMeta: Record<string, string>) {
+      meta = newMeta;
     }
   };
 }
-
-export const metaStore = writable<{ [key: string]: string }>(defaultMetadata);
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
@@ -2,18 +2,19 @@
   import { defaultMetadata } from '$lib/__consts';
   import Footer from '$lib/footer/footer.svelte';
   import Header from '$lib/header/header.svelte';
-  import { metaStore, useTitle } from '$lib/stores.svelte';
+  import { usePageMetadata, useTitle } from '$lib/stores.svelte';
 </script>
 
 <script lang="ts">
   let { children } = $props();
-  let title = useTitle();
+  const title = useTitle();
+  const metadata = usePageMetadata();
   let pageTitle = $derived(
     `${title.value ? title.value + ' - ' : ''}Logan Dam - Software Engineer, Photographer`
   );
 
   let metas = $derived(
-    Object.entries({ ...defaultMetadata, ...$metaStore }).map(([key, value]) => ({
+    Object.entries({ ...defaultMetadata, ...metadata.value }).map(([key, value]) => ({
       key,
       value
     }))

diff --git a/frontend/src/routes/blog/[slug]/+page.svelte b/frontend/src/routes/blog/[slug]/+page.svelte
@@ -11,7 +11,7 @@
   onMount(() => {
     title.value = post.metadata.title;
 
-    metadata.push({
+    metadata.set({
       'og:type': 'article',
       'og:title': post.metadata.title,
       'og:description': post.metadata.excerpt

diff --git a/frontend/src/routes/collections/+page.svelte b/frontend/src/routes/collections/+page.svelte
@@ -9,7 +9,7 @@
 
   onMount(() => {
     title.value = 'Collections';
-    metadata.push({
+    metadata.set({
       'twitter:card': 'summary',
       'og:type': 'article',
       'og:title': 'Collections',

diff --git a/frontend/src/routes/image/[imageId]/+page.svelte b/frontend/src/routes/image/[imageId]/+page.svelte
@@ -25,7 +25,7 @@
       heightRatio > widthRatio
         ? HighResMaxDimension
         : (heightRatio / widthRatio) * HighResMaxDimension;
-    pageMetadata.push({
+    pageMetadata.set({
       'twitter:card': 'summary_large_image',
       'og:type': 'article',
       'og:image': src,