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

Merge branch 'develop' into feat/SW-185-implement-footer-navigation

Browse Source 
# Conflicts:
#	app/[lang]/(live)/layout.tsx
#	components/Icons/get-icon-by-icon-name.ts
#	types/components/icon.ts
This commit is contained in:
Pontus Dreij
2024-08-21 14:21:57 +02:00
parent 9d416f593d 855713565e
commit 11c2fe8475
87 changed files with 2056 additions and 10893 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -9,6 +9,7 @@ import TokenRefresher from "@/components/Auth/TokenRefresher"
import AdobeSDKScript from "@/components/Current/AdobeSDKScript"
import VwoScript from "@/components/Current/VwoScript"
import Footer from "@/components/Footer"
import { ToastHandler } from "@/components/TempDesignSystem/Toasts"
import { preloadUserTracking } from "@/components/TrackingSDK"
import { getIntl } from "@/i18n"
import ServerIntlProvider from "@/i18n/Provider"
@@ -59,6 +60,7 @@ export default async function RootLayout({
<TrpcProvider>
{header}
{children}
<ToastHandler />
<Footer />
<TokenRefresher />
</TrpcProvider>