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

feat: separate current and "new" web in route groups

Browse Source
This commit is contained in:
Christel Westerberg
2024-02-20 09:14:42 +01:00
parent 10b52112af
commit 4e4b6f1bd6
14 changed files with 268 additions and 66 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
app/[lang]/(live)/current-content-page/page.tsx → app/[lang]/(live)/content-page/page.tsx
View File

@@ -3,13 +3,13 @@ import { notFound } from "next/navigation"
import { request } from "@/lib/request"
import { GetCurrentBlockPage } from "@/lib/graphql/Query/CurrentBlockPage.graphql"
import ContentPage from "@/components/Current/ContentPage"
import ContentPageComponent from "@/components/Current/ContentPage"
import type { PageArgs, LangParams, UriParams } from "@/types/params"
import type { GetCurrentBlockPageData } from "@/types/requests/currentBlockPage"
import Tracking from "../../Tracking"
export default async function CurrentContentPage({
export default async function ContentPage({
params,
searchParams,
}: PageArgs<LangParams, UriParams>) {
@@ -43,7 +43,7 @@ export default async function CurrentContentPage({
return (
<>
<ContentPage
<ContentPageComponent
data={response.data}
uri={searchParams.uri}
lang={params.lang}

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

@@ -1,10 +1,4 @@
import "../../core.css"
import "../../scandic.css"
import Footer from "@/components/Current/Footer"
import LangPopup from "@/components/Current/LangPopup"
import Script from "next/script"
import SkipToMainContent from "@/components/SkipToMainContent"
import type { Metadata } from "next"
import type { LangParams, LayoutArgs } from "@/types/params"
@@ -33,42 +27,10 @@ export default function RootLayout({
id="Cookiebot"
src="https://consent.cookiebot.com/uc.js"
/>
{/* <Script
data-cookieconsent="ignore"
src="/Static/dist/js/head.js?85c84c9e24ae8da3e7af"
/> */}
<Script
data-cookieconsent="ignore"
src="/Static/dist/js/inline.js?00133e5a37de35c51a5d"
/>
<Script
data-cookieconsent="ignore"
src="/Static/dist/js/main.js?89d0030e1a04b3b46d0b"
/>
<Script
data-cookieconsent="ignore"
src="/Static/dist/js/ng/polyfills.js?1705409330990"
/>
<Script
data-cookieconsent="ignore"
src="/Static/dist/js/ng/runtime.js?1705409330990"
/>
<Script
data-cookieconsent="ignore"
src="/Static/dist/js/ng/main.js?1705409330990"
/>
{/* <Script
data-cookieconsent="ignore"
src="/Static/dist/js/main-ng.js?336b801d6b38eff10884"
strategy="lazyOnload"
/> */}
<AdobeScript />
</head>
<body>
<LangPopup lang={params.lang} />
<SkipToMainContent lang={params.lang} />
{children}
<Footer lang={params.lang} />
<Script id="page-tracking">{`
typeof _satellite !== "undefined" && _satellite.pageBottom();
`}</Script>