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

feat(BOOK-450): Added theme to hotel page only, reverting previous theme handing on the body tag

Browse Source 
Approved-by: Linus Flood
This commit is contained in:
Erik Tiekstra
2025-10-16 12:54:03 +00:00
parent 338c93dd56
commit 038211bf09
9 changed files with 45 additions and 132 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/hotel_page/[uid]/page.module.css
View File

@@ -1,3 +1,3 @@
.page {
.hotelPage {
background-color: var(--Background-Primary);
}

21
apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/hotel_page/[uid]/page.tsx
View File

@@ -1,3 +1,4 @@
import { cx } from "class-variance-authority"
import { notFound } from "next/navigation"
import { getHotel, getHotelPage } from "@/lib/trpc/memoizedRequests"
@@ -5,6 +6,7 @@ import { getHotel, getHotelPage } from "@/lib/trpc/memoizedRequests"
import HotelMapPage from "@/components/ContentType/HotelMapPage"
import HotelPage from "@/components/ContentType/HotelPage"
import HotelSubpage from "@/components/ContentType/HotelSubpage"
import { getThemeByHotel } from "@/utils/theme"
import styles from "./page.module.css"
@@ -33,13 +35,26 @@ export default async function HotelPagePage(
return notFound()
}
const hotelTheme = getThemeByHotel(
hotelPageData.hotel_page_id,
hotelData.hotel.hotelType
)
if (searchParams.subpage) {
return <HotelSubpage hotelData={hotelData} subpage={searchParams.subpage} />
return (
<div className={hotelTheme}>
<HotelSubpage hotelData={hotelData} subpage={searchParams.subpage} />
</div>
)
} else if (searchParams.view === "map") {
return <HotelMapPage hotelData={hotelData} />
return (
<div className={hotelTheme}>
<HotelMapPage hotelData={hotelData} />
</div>
)
} else {
return (
<div className={styles.page}>
<div className={cx(styles.hotelPage, hotelTheme)}>
<HotelPage hotelData={hotelData} hotelPageData={hotelPageData} />
</div>
)

10
apps/scandic-web/app/[lang]/(live)/@theme/(contentTypes)/hotel_page/[uid]/page.tsx
View File

@@ -1,10 +0,0 @@
import ThemeUpdater from "@/components/ThemeUpdater"
import { getLang } from "@/i18n/serverContext"
import { getHotelTheme } from "@/utils/theme/utils"
export default async function ThemeHotelPage() {
const lang = await getLang()
const hotelTheme = await getHotelTheme(lang)
return <ThemeUpdater theme={hotelTheme} />
}

1
apps/scandic-web/app/[lang]/(live)/@theme/[...path]/page.tsx
View File

@@ -1 +0,0 @@
export { default } from "../page"

6
apps/scandic-web/app/[lang]/(live)/@theme/page.tsx
View File

@@ -1,6 +0,0 @@
import ThemeUpdater from "@/components/ThemeUpdater"
import { DEFAULT_THEME } from "@/utils/theme/types"
export default function ThemePage() {
return <ThemeUpdater theme={DEFAULT_THEME} />
}

8
apps/scandic-web/app/[lang]/(live)/layout.tsx
View File

@@ -34,7 +34,6 @@ import { FontPreload } from "@/fonts/font-preloading"
import { getMessages } from "@/i18n"
import ClientIntlProvider from "@/i18n/Provider"
import { setLang } from "@/i18n/serverContext"
import { getThemeClass } from "@/utils/theme"
import type { LangParams, LayoutArgs } from "@/types/params"
@@ -42,17 +41,15 @@ export default async function RootLayout(
props: React.PropsWithChildren<
LayoutArgs<LangParams> & {
bookingwidget: React.ReactNode
theme: React.ReactNode
}
>
) {
const params = await props.params
const { bookingwidget, theme, children } = props
const { bookingwidget, children } = props
setLang(params.lang)
const messages = await getMessages(params.lang)
const themeClass = await getThemeClass(params.lang)
return (
<html lang={params.lang}>
@@ -67,7 +64,7 @@ export default async function RootLayout(
window.dataLayer = window.dataLayer || []
`}</Script>
</head>
<body className={themeClass}>
<body className="scandic">
<div className="root">
<SessionProvider basePath="/api/web/auth">
<ClientIntlProvider
@@ -75,7 +72,6 @@ export default async function RootLayout(
locale={params.lang}
messages={messages}
>
{theme}
<NuqsAdapter>
<TrpcProvider>
<RACRouterProvider>