From 8a70d8c252a511f140674deb8f0ec4b9fc7fc7ca Mon Sep 17 00:00:00 2001
From: Logan Dam <dam.loganza@gmail.com>
Date: Tue, 19 Nov 2024 23:21:31 +0100
Subject: [PATCH] fix og:url

---
 frontend/src/lib/__consts.ts       | 10 ----------
 frontend/src/routes/+layout.svelte | 17 +++++++++++++----
 2 files changed, 13 insertions(+), 14 deletions(-)

diff --git a/frontend/src/lib/__consts.ts b/frontend/src/lib/__consts.ts
index 256610b..fedb136 100644
--- a/frontend/src/lib/__consts.ts
+++ b/frontend/src/lib/__consts.ts
@@ -1,4 +1,3 @@
-import { base } from '$app/paths';
 export const StorageBaseUrl = 'https://cdncf.ldam.co.za/portfolio';
 export const MaxDimensionNormalDensity = 320;
 export const ThumbnailHrefNormalDensity = 'thumbnail2x';
@@ -7,12 +6,3 @@ export const ThumbnailHrefHighDensity = '640';
 export const HighResHref = '2048';
 export const HighResMaxDimension = 2048;
 export const DateFormat = 'D MMM YYYY';
-
-export const defaultMetadata = {
-  'og:title': 'Logan Dam - Software Engineer, Photographer',
-  'og:type': 'website',
-  'og:description': "Logan Dam's portfolio of photography and code.",
-  'og:image': 'https://ldam.co.za/favicon-310.png',
-  'og:url': base,
-  'og:locale': 'en_ZA'
-};
diff --git a/frontend/src/routes/+layout.svelte b/frontend/src/routes/+layout.svelte
index 64af4e1..5d9783f 100644
--- a/frontend/src/routes/+layout.svelte
+++ b/frontend/src/routes/+layout.svelte
@@ -1,18 +1,27 @@
-<script module lang="ts">
-  import { defaultMetadata } from '$lib/__consts';
+<script lang="ts">
+  import { page } from '$app/stores';
   import Footer from '$lib/footer/footer.svelte';
   import Header from '$lib/header/header.svelte';
   import { usePageMetadata, useTitle } from '$lib/stores.svelte';
-</script>
 
-<script lang="ts">
   let { children } = $props();
+
   const title = useTitle();
   const metadata = usePageMetadata();
+
   let pageTitle = $derived(
     `${title.value ? title.value + ' - ' : ''}Logan Dam - Software Engineer, Photographer`
   );
 
+  let defaultMetadata = $derived({
+    'og:title': 'Logan Dam - Software Engineer, Photographer',
+    'og:type': 'website',
+    'og:description': "Logan Dam's portfolio of photography and code.",
+    'og:image': 'https://ldam.co.za/favicon-310.png',
+    'og:locale': 'en_ZA',
+    'og:url': $page.url.toString()
+  });
+
   let metas = $derived(
     Object.entries({ ...defaultMetadata, ...metadata.value }).map(([key, value]) => ({
       key,