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

Merged in chore/upgrade-next (pull request #3124)

Browse Source 
Upgrade next@15.5.6

* chore: upgrade next@15.5.6

* chore: upgrade turborepo@2.6.1

* fix typings for scandic-web

* fix: set correct type for pages

* cleanup

* fix more route.ts typing issues

* Merge branch 'master' of bitbucket.org:scandic-swap/web into chore/upgrade-next

* explicitly import the types


Approved-by: Linus Flood
This commit is contained in:
Joakim Jäderberg
2025-11-13 07:33:56 +00:00
parent ce469bc4b4
commit dc53ab9245
64 changed files with 746 additions and 404 deletions
Download Patch File Download Diff File Expand all files Collapse all files

21
apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/map/page.tsx
View File

@@ -3,34 +3,31 @@ import { toCapitalCase } from "@scandic-hotels/common/utils/toCapitalCase"
import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
import { getLang } from "@/i18n/serverContext"
import styles from "./page.module.css"
import type { Lang } from "@scandic-hotels/common/constants/language"
import type { Metadata } from "next"
import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
export async function generateMetadata({
searchParams,
}: PageArgs<LangParams, { city: string }>): Promise<Metadata> {
const { city } = await searchParams
export async function generateMetadata(
props: PageProps<"/[lang]/hotelreservation/select-hotel/map">
): Promise<Metadata> {
const { city } = await props.searchParams
return {
title: `${toCapitalCase(city)}`,
title: `${toCapitalCase(typeof city === "string" ? city : "")}`,
}
}
export default async function SelectHotelMapPage(
props: PageArgs<LangParams, NextSearchParams>
props: PageProps<"/[lang]/hotelreservation/select-hotel/map">
) {
const searchParams = await props.searchParams
const lang = await getLang()
const params = await props.params
return (
<div className={styles.main}>
<SelectHotelMapPagePrimitive
lang={lang}
lang={params.lang as Lang}
searchParams={searchParams}
config={bookingFlowConfig}
/>

22
apps/scandic-web/app/[lang]/(live)/(public)/hotelreservation/(standard)/select-hotel/page.tsx
View File

@@ -3,27 +3,29 @@ import { toCapitalCase } from "@scandic-hotels/common/utils/toCapitalCase"
import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
import { getLang } from "@/i18n/serverContext"
import type { Lang } from "@scandic-hotels/common/constants/language"
import type { Metadata } from "next"
import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
export async function generateMetadata(
props: PageProps<"/[lang]/hotelreservation/select-hotel">
): Promise<Metadata> {
const searchParams = await props.searchParams
export async function generateMetadata({
searchParams,
}: PageArgs<LangParams, { city: string }>): Promise<Metadata> {
const { city } = await searchParams
if (typeof searchParams.city !== "string" || !searchParams.city) {
return {}
}
return {
title: `${toCapitalCase(city)}`,
title: `${toCapitalCase(searchParams.city)}`,
}
}
export default async function SelectHotelPage(
props: PageArgs<LangParams, NextSearchParams>
props: PageProps<"/[lang]/hotelreservation/select-hotel">
) {
const searchParams = await props.searchParams
const lang = await getLang()
const params = await props.params
const lang = params.lang as Lang
return (
<SelectHotelPagePrimitive