From 1cce3ddc8980c18c2bf023c050df936c66d444fd Mon Sep 17 00:00:00 2001 From: Loyyd Date: Thu, 11 Jun 2026 17:44:58 +0200 Subject: [PATCH] new IP --- astro.config.mjs | 1 + src/components/SiteLayout.astro | 9 ++++++--- src/pages/events.astro | 3 ++- 3 files changed, 9 insertions(+), 4 deletions(-) diff --git a/astro.config.mjs b/astro.config.mjs index 33c3ea43..b1b39a5a 100644 --- a/astro.config.mjs +++ b/astro.config.mjs @@ -1,6 +1,7 @@ import { defineConfig } from "astro/config"; export default defineConfig({ + site: "https://familyfed.ie", output: "static", outDir: "dist", build: { diff --git a/src/components/SiteLayout.astro b/src/components/SiteLayout.astro index ea40305c..b56edd27 100644 --- a/src/components/SiteLayout.astro +++ b/src/components/SiteLayout.astro @@ -14,7 +14,10 @@ const { parabolaSettings = { masonry: "0", magazine: "0", mobile: "1", fitvids: "1" }, } = Astro.props; const parabolaSettingsScript = `var parabola_settings = ${JSON.stringify(parabolaSettings)};`; -const canonicalUrl = canonical ?? pathname; +const siteOrigin = Astro.site?.origin ?? "https://familyfed.ie"; +const absoluteUrl = (value) => value ? new URL(value, siteOrigin).toString() : undefined; +const canonicalUrl = absoluteUrl(canonical ?? pathname); +const imageUrl = absoluteUrl(image); const metaTitle = title .replace(/–|–/g, "-") .replace(/‘|’|‘|’/g, "'") @@ -27,7 +30,6 @@ const metaTitle = title - {description && <meta name="description" content={description} />} {robots && <meta name="robots" content={robots} />} @@ -35,7 +37,7 @@ const metaTitle = title <meta property="og:title" content={metaTitle} /> {description && <meta property="og:description" content={description} />} {canonicalUrl && <meta property="og:url" content={canonicalUrl} />} - {image && <meta property="og:image" content={image} />} + {imageUrl && <meta property="og:image" content={imageUrl} />} <meta property="og:type" content={ogType} /> <meta name="twitter:card" content="summary_large_image" /> <link rel="icon" href="/assets/icons/familyfed-favicon.png" type="image/png" /> @@ -50,6 +52,7 @@ const metaTitle = title <script is:inline type="text/javascript" src="/js/jquery.min.js?ver=2.0.2" id="jquery-js"></script> <script is:inline type="text/javascript" id="parabola-frontend-js-extra" set:html={parabolaSettingsScript}></script> <script is:inline type="text/javascript" src="/assets/theme/parabola/js/frontend.js?ver=2.4.1" id="parabola-frontend-js"></script> + <slot name="head" /> {canonicalUrl && <link rel="canonical" href={canonicalUrl} />} </head> <body class={bodyClass}> diff --git a/src/pages/events.astro b/src/pages/events.astro index 2f2dcd5f..650e8ac2 100644 --- a/src/pages/events.astro +++ b/src/pages/events.astro @@ -257,6 +257,7 @@ import mainHtml from "../content/pages/events.html?raw"; const end = new Date(today.getFullYear() + 1, today.getMonth() + 1, 0); const events = eventsBetween(start, end); const stamp = new Date().toISOString().replace(/[-:]/g, "").replace(/\.\d{3}Z$/, "Z"); + const siteUrl = "https://familyfed.ie"; const lines = [ "BEGIN:VCALENDAR", "VERSION:2.0", @@ -275,7 +276,7 @@ import mainHtml from "../content/pages/events.html?raw"; `SUMMARY:${escapeIcs(event.title)}`, `DESCRIPTION:${escapeIcs(event.details)}`, `LOCATION:${escapeIcs(event.location)}`, - `URL:https://familyfed.bcgen.ie${event.url}`, + `URL:${siteUrl}${event.url}`, "END:VEVENT", ); }