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

4
apps/scandic-web/app/[lang]/(live)/@bookingwidget/(contentTypes)/destination_city_page/[uid]/page.tsx
View File

@@ -6,10 +6,8 @@ import { getDestinationCityPage } from "@/lib/trpc/memoizedRequests"
import { getLang } from "@/i18n/serverContext"
import type { NextSearchParams, PageArgs } from "@/types/params"
export default async function BookingWidgetDestinationCityPage(
props: PageArgs<object, NextSearchParams>
props: PageProps<"/[lang]/destination_city_page/[uid]">
) {
const searchParams = await props.searchParams

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

@@ -4,17 +4,16 @@ import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/uti
import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
import { getHotel, getHotelPage } from "@/lib/trpc/memoizedRequests"
import { getLang } from "@/i18n/serverContext"
import type { NextSearchParams, PageArgs } from "@/types/params"
import type { Lang } from "@scandic-hotels/common/constants/language"
export default async function BookingWidgetHotelPage(
props: PageArgs<object, NextSearchParams & { subpage?: string }>
props: PageProps<"/[lang]/hotel_page/[uid]">
) {
const searchParams = await props.searchParams
const params = await props.params
const lang = params.lang as Lang
const hotelPageData = await getHotelPage()
const lang = await getLang()
const hotelData = await getHotel({
hotelId: hotelPageData?.hotel_page_id || "",
language: lang,

9
apps/scandic-web/app/[lang]/(live)/@bookingwidget/hotelreservation/page.tsx
View File

@@ -3,18 +3,17 @@ import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/uti
import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
import { getLang } from "@/i18n/serverContext"
import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
import type { Lang } from "@scandic-hotels/common/constants/language"
export default async function BookingWidgetPage(
props: PageArgs<LangParams, NextSearchParams>
props: PageProps<"/[lang]/hotelreservation">
) {
const searchParams = await props.searchParams
const params = await props.params
const booking = parseBookingWidgetSearchParams(searchParams)
const lang = await getLang()
const lang = params.lang as Lang
return (
<BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} />

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

@@ -3,18 +3,15 @@ import { parseBookingWidgetSearchParams } from "@scandic-hotels/booking-flow/uti
import { bookingFlowConfig } from "@/constants/bookingFlowConfig"
import { getLang } from "@/i18n/serverContext"
import type { Lang } from "@scandic-hotels/common/constants/language"
import type { LangParams, NextSearchParams, PageArgs } from "@/types/params"
export default async function BookingWidgetPage(
props: PageArgs<LangParams, NextSearchParams>
) {
export default async function BookingWidgetPage(props: PageProps<"/[lang]">) {
const searchParams = await props.searchParams
const params = await props.params
const booking = parseBookingWidgetSearchParams(searchParams)
const lang = await getLang()
const lang = params.lang as Lang
return (
<BookingWidget booking={booking} lang={lang} config={bookingFlowConfig} />