diff --git a/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css b/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css index fe0c45cf6..29fea3d1b 100644 --- a/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css +++ b/app/[lang]/(live)/(public)/[contentType]/[uid]/layout.module.css @@ -1,5 +1,8 @@ .layout { + --header-height: 4.5rem; + display: grid; font-family: var(--ff-fira-sans); background-color: var(--Scandic-Brand-Warm-White); + grid-template-rows: var(--header-height) auto 1fr; } diff --git a/components/ContentType/LoyaltyPage.tsx b/components/ContentType/LoyaltyPage.tsx index 5059da0b7..d1b95c976 100644 --- a/components/ContentType/LoyaltyPage.tsx +++ b/components/ContentType/LoyaltyPage.tsx @@ -2,27 +2,34 @@ import { serverClient } from "@/lib/trpc/server" import { auth } from "@/auth" import { Blocks } from "@/components/Loyalty/Blocks" -import Sidebar from "@/components/Loyalty/Sidebar" +import * as LoyaltySidebar from "@/components/Loyalty/Sidebar" import MaxWidth from "@/components/MaxWidth" +import Sidebar from "@/components/MyPages/Sidebar" import Breadcrumbs from "../MyPages/Breadcrumbs" import styles from "./loyaltyPage.module.css" -export default async function LoyaltyPage() { +import { LangParams } from "@/types/params" + +export default async function LoyaltyPage({ lang }: LangParams) { const loyaltyPage = await serverClient().contentstack.loyaltyPage.get() const session = await auth() return ( -
- {session && } - {loyaltyPage.sidebar.length ? ( - - ) : null} + <> + {session ? : null} +
+ {session ? ( + + ) : loyaltyPage.sidebar.length ? ( + + ) : null} - - {loyaltyPage.blocks ? : null} - -
+ + {loyaltyPage.blocks ? : null} + +
+ ) }