feat(analytics): pull pm86 site-id from CMS page_config, drop env var
- +layout.server: expose pageConfig.analyticsPm86SiteId on layout data - +layout.svelte: inject analytics.pm86.de script when CMS value present - +error.svelte: light 404 page with wald-700 accent, dropped dark gradient - .env.example + deploy.yml: remove PUBLIC_ANALYTICS_PM86_SITE_ID
This commit is contained in:
+1
-2
@@ -4,8 +4,7 @@ PUBLIC_SITE_NAME=Windwiderstand
|
|||||||
PUBLIC_UMAMI_SCRIPT_URL=
|
PUBLIC_UMAMI_SCRIPT_URL=
|
||||||
PUBLIC_UMAMI_WEBSITE_ID=
|
PUBLIC_UMAMI_WEBSITE_ID=
|
||||||
|
|
||||||
# analytics.pm86.de Site-ID (Script-URL ist hartcodiert auf analytics.pm86.de)
|
# analytics.pm86.de: Site-ID kommt jetzt aus page_config.analyticsPm86SiteId (CMS).
|
||||||
PUBLIC_ANALYTICS_PM86_SITE_ID=
|
|
||||||
|
|
||||||
# Formbricks Feedback-Widget
|
# Formbricks Feedback-Widget
|
||||||
PUBLIC_FORMBRICKS_APP_URL=
|
PUBLIC_FORMBRICKS_APP_URL=
|
||||||
|
|||||||
@@ -14,7 +14,6 @@
|
|||||||
# ORIGIN https://www.windwiderstand.de
|
# ORIGIN https://www.windwiderstand.de
|
||||||
# REVALIDATE_TOKEN openssl rand -hex 32
|
# REVALIDATE_TOKEN openssl rand -hex 32
|
||||||
# PUBLIC_UMAMI_WEBSITE_ID (optional, sonst leer)
|
# PUBLIC_UMAMI_WEBSITE_ID (optional, sonst leer)
|
||||||
# PUBLIC_ANALYTICS_PM86_SITE_ID (optional, sonst leer)
|
|
||||||
|
|
||||||
name: Deploy
|
name: Deploy
|
||||||
|
|
||||||
@@ -86,7 +85,6 @@ jobs:
|
|||||||
IMAGE_CACHE_DIR=/data/image-cache
|
IMAGE_CACHE_DIR=/data/image-cache
|
||||||
PUBLIC_UMAMI_SCRIPT_URL=https://cloud.umami.is/script.js
|
PUBLIC_UMAMI_SCRIPT_URL=https://cloud.umami.is/script.js
|
||||||
PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.PUBLIC_UMAMI_WEBSITE_ID }}
|
PUBLIC_UMAMI_WEBSITE_ID=${{ secrets.PUBLIC_UMAMI_WEBSITE_ID }}
|
||||||
PUBLIC_ANALYTICS_PM86_SITE_ID=${{ secrets.PUBLIC_ANALYTICS_PM86_SITE_ID }}
|
|
||||||
ENVEOF
|
ENVEOF
|
||||||
|
|
||||||
- name: Pull and restart container
|
- name: Pull and restart container
|
||||||
|
|||||||
@@ -15,35 +15,29 @@
|
|||||||
<meta name="robots" content="noindex" />
|
<meta name="robots" content="noindex" />
|
||||||
</svelte:head>
|
</svelte:head>
|
||||||
|
|
||||||
<section class="bg-linear-to-br from-wald-700 via-wald-800 to-zinc-900 text-white">
|
<section>
|
||||||
<div class="container-custom py-20 md:py-28 text-center">
|
<div class="container-custom pt-10 text-center">
|
||||||
<div class="mx-auto inline-flex h-20 w-20 items-center justify-center rounded-full bg-white/10 backdrop-blur ring-1 ring-white/20">
|
<p class="mt-6 text-7xl md:text-8xl font-extrabold tracking-tight text-wald-700">{status}</p>
|
||||||
<Icon
|
<h1 class="mt-3 text-2xl md:text-3xl font-semibold text-zinc-900">
|
||||||
icon={isNotFound ? 'mdi:map-marker-question-outline' : 'mdi:alert-octagon-outline'}
|
|
||||||
class="h-10 w-10"
|
|
||||||
/>
|
|
||||||
</div>
|
|
||||||
<p class="mt-6 text-7xl md:text-8xl font-extrabold tracking-tight">{status}</p>
|
|
||||||
<h1 class="mt-3 text-2xl md:text-3xl font-semibold">
|
|
||||||
{isNotFound ? t('page_404_title') : `Fehler ${status}`}
|
{isNotFound ? t('page_404_title') : `Fehler ${status}`}
|
||||||
</h1>
|
</h1>
|
||||||
{#if isNotFound}
|
{#if isNotFound}
|
||||||
<p class="mx-auto mt-4 max-w-xl text-base text-white/80">{t('page_404_text')}</p>
|
<p class="mx-auto mt-4 max-w-xl text-base text-zinc-600">{t('page_404_text')}</p>
|
||||||
{:else if message}
|
{:else if message}
|
||||||
<p class="mx-auto mt-4 max-w-xl text-base text-white/80">{message}</p>
|
<p class="mx-auto mt-4 max-w-xl text-base text-zinc-600">{message}</p>
|
||||||
{/if}
|
{/if}
|
||||||
|
|
||||||
<div class="mt-8 flex flex-wrap items-center justify-center gap-3">
|
<div class="mt-8 flex flex-wrap items-center justify-center gap-3">
|
||||||
<a
|
<a
|
||||||
href="/"
|
href="/"
|
||||||
class="inline-flex items-center gap-2 rounded-sm bg-white px-5 py-2.5 text-sm font-medium text-zinc-900 hover:bg-zinc-100 no-underline"
|
class="inline-flex items-center gap-2 rounded-sm bg-wald-700 px-5 py-2.5 text-sm font-medium text-white hover:bg-wald-800 no-underline"
|
||||||
>
|
>
|
||||||
<Icon icon="mdi:home-outline" class="h-4 w-4" />
|
<Icon icon="mdi:home-outline" class="h-4 w-4" />
|
||||||
{t('page_404_back')}
|
{t('page_404_back')}
|
||||||
</a>
|
</a>
|
||||||
<a
|
<a
|
||||||
href="/posts/"
|
href="/posts/"
|
||||||
class="inline-flex items-center gap-2 rounded-sm border border-white/40 px-5 py-2.5 text-sm font-medium text-white hover:bg-white/10 no-underline"
|
class="inline-flex items-center gap-2 rounded-sm border border-zinc-300 bg-white px-5 py-2.5 text-sm font-medium text-zinc-700 hover:bg-zinc-100 no-underline"
|
||||||
>
|
>
|
||||||
<Icon icon="mdi:file-document-outline" class="h-4 w-4" />
|
<Icon icon="mdi:file-document-outline" class="h-4 w-4" />
|
||||||
Zu den Beiträgen
|
Zu den Beiträgen
|
||||||
|
|||||||
@@ -238,5 +238,7 @@ export const load: LayoutServerLoad = async ({ locals }) => {
|
|||||||
pageConfig,
|
pageConfig,
|
||||||
seoTitleTemplate: pageConfig?.seoTitle ?? null,
|
seoTitleTemplate: pageConfig?.seoTitle ?? null,
|
||||||
seoDescriptionTemplate: pageConfig?.seoDescription ?? null,
|
seoDescriptionTemplate: pageConfig?.seoDescription ?? null,
|
||||||
|
analyticsPm86SiteId:
|
||||||
|
(pageConfig as { analyticsPm86SiteId?: string } | null)?.analyticsPm86SiteId ?? null,
|
||||||
};
|
};
|
||||||
};
|
};
|
||||||
|
|||||||
@@ -126,11 +126,11 @@
|
|||||||
data-website-id={import.meta.env.PUBLIC_UMAMI_WEBSITE_ID}
|
data-website-id={import.meta.env.PUBLIC_UMAMI_WEBSITE_ID}
|
||||||
></script>
|
></script>
|
||||||
{/if}
|
{/if}
|
||||||
{#if import.meta.env.PUBLIC_ANALYTICS_PM86_SITE_ID}
|
{#if data.analyticsPm86SiteId}
|
||||||
<script
|
<script
|
||||||
defer
|
defer
|
||||||
src="https://analytics.pm86.de/api/script.js"
|
src="https://analytics.pm86.de/api/script.js"
|
||||||
data-site-id={import.meta.env.PUBLIC_ANALYTICS_PM86_SITE_ID}
|
data-site-id={data.analyticsPm86SiteId}
|
||||||
></script>
|
></script>
|
||||||
{/if}
|
{/if}
|
||||||
{#if formbricksScript}
|
{#if formbricksScript}
|
||||||
|
|||||||
Reference in New Issue
Block a user