scandic/web
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Refactor

Browse Source
This commit is contained in:
Linus Flood
2024-10-03 15:16:56 +02:00
parent b047e31990
commit e29dff1874
10 changed files with 77 additions and 87 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
app/[lang]/(live)/layout.tsx
View File

@@ -7,10 +7,13 @@ import { env } from "@/env/server"
import TrpcProvider from "@/lib/trpc/Provider"
import TokenRefresher from "@/components/Auth/TokenRefresher"
import CookieBotConsent from "@/components/CookieBot"
import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
import GTMScript from "@/components/Current/GTMScript"
import VwoScript from "@/components/Current/VwoScript"
import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
import { preloadUserTracking } from "@/components/TrackingSDK"
import RouterTracking from "@/components/TrackingSDK/RouterTracking"
import { getIntl } from "@/i18n"
import ServerIntlProvider from "@/i18n/Provider"
import { setLang } from "@/i18n/serverContext"
@@ -38,6 +41,7 @@ export default async function RootLayout({
<html lang={params.lang}>
<head>
<AdobeSDKScript />
<GTMScript />
<Script data-cookieconsent="ignore" src="/_static/js/cookie-bot.js" />
<Script
strategy="beforeInteractive"
@@ -55,12 +59,15 @@ export default async function RootLayout({
<body>
<ServerIntlProvider intl={{ defaultLocale, locale, messages }}>
<TrpcProvider>
{header}
{!env.HIDE_FOR_NEXT_RELEASE && <>{bookingwidget}</>}
{children}
{footer}
<RouterTracking>
{header}
{!env.HIDE_FOR_NEXT_RELEASE && <>{bookingwidget}</>}
{children}
{footer}
</RouterTracking>
<ToastHandler />
<TokenRefresher />
<CookieBotConsent />
</TrpcProvider>
</ServerIntlProvider>
</body>

2
app/[lang]/(live-current)/layout.tsx
View File

@@ -5,6 +5,7 @@ import Script from "next/script"
import TokenRefresher from "@/components/Auth/TokenRefresher"
import BookingWidget from "@/components/BookingWidget"
import CookieBotConsent from "@/components/CookieBot"
import AdobeScript from "@/components/Current/AdobeScript"
import Footer from "@/components/Current/Footer"
import LangPopup from "@/components/Current/LangPopup"
@@ -69,6 +70,7 @@ export default async function RootLayout({
{children}
<Footer />
<TokenRefresher />
<CookieBotConsent />
</ServerIntlProvider>
<Script id="page-tracking">{`
typeof _satellite !== "undefined" && _satellite.pageBottom();

2
app/[lang]/webview/layout.tsx
View File

@@ -6,6 +6,7 @@ import Script from "next/script"
import TrpcProvider from "@/lib/trpc/Provider"
import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
import GTMScript from "@/components/Current/GTMScript"
import { getIntl } from "@/i18n"
import ServerIntlProvider from "@/i18n/Provider"
import { setLang } from "@/i18n/serverContext"
@@ -31,6 +32,7 @@ export default async function RootLayout({
<html lang={params.lang}>
<head>
<AdobeSDKScript />
<GTMScript />
<Script id="ensure-adobeDataLayer">{`
window.adobeDataLayer = window.adobeDataLayer || []
`}</Script>