From 3a8f58682d69945cd5857ec61a9b151e8e830c2f Mon Sep 17 00:00:00 2001 From: Jeffrey Date: Wed, 18 Feb 2026 14:13:25 +0100 Subject: [PATCH] fix: cookie banner design and settings --- src/app/(frontend)/layout.tsx | 57 +- src/components/CookieConsent.tsx | 113 +- src/globals/SiteSettings.ts | 39 +- src/migrations/20260218_130902.json | 22864 ++++++++++++++++++++++++++ src/migrations/20260218_130902.ts | 635 + src/migrations/index.ts | 8 +- src/payload-types.ts | 10 + 7 files changed, 23675 insertions(+), 51 deletions(-) create mode 100644 src/migrations/20260218_130902.json create mode 100644 src/migrations/20260218_130902.ts diff --git a/src/app/(frontend)/layout.tsx b/src/app/(frontend)/layout.tsx index 7a7a3b9..ea697f4 100644 --- a/src/app/(frontend)/layout.tsx +++ b/src/app/(frontend)/layout.tsx @@ -1,5 +1,4 @@ import type { Metadata } from 'next' - import { getPayload } from 'payload' import config from '@payload-config' import { AnnouncementBarComponent } from '@/components/AnnouncementBar/AnnouncementBar' @@ -7,7 +6,6 @@ import { cn } from '@/utilities/ui' import { GeistMono } from 'geist/font/mono' import { GeistSans } from 'geist/font/sans' import React from 'react' - import { AdminBar } from '@/components/AdminBar' import { Footer } from '@/Footer/Component' import { Header } from '@/Header/Component' @@ -16,20 +14,17 @@ import { InitTheme } from '@/providers/Theme/InitTheme' import { mergeOpenGraph } from '@/utilities/mergeOpenGraph' import { draftMode } from 'next/headers' import { getCachedGlobal } from '@/utilities/getGlobals' - -import './globals.css' -import { getServerSideURL } from '@/utilities/getURL' -import { PopupAnnouncementComponent } from '@/globals/PopupAnnouncement/Component' -import { HeadInjection, FooterInjection } from '@/components/HeadInjection' import { CookieConsent } from '@/components/CookieConsent' import { MatomoScript } from '@/components/MatomoScript' +import { HeadInjection, FooterInjection } from '@/components/HeadInjection' +import { PopupAnnouncementComponent } from '@/globals/PopupAnnouncement/Component' +import './globals.css' +import { getServerSideURL } from '@/utilities/getURL' async function AnnouncementBarWrapper() { const payload = await getPayload({ config }) const announcement = await payload.findGlobal({ slug: 'announcement-bar' }) - if (!announcement?.enabled) return null - return ( + @@ -81,10 +76,14 @@ export default async function RootLayout({ children }: { children: React.ReactNo {children}