diff --git a/.env.local.example b/.env.local.example index 508c33acd..6d6af70cc 100644 --- a/.env.local.example +++ b/.env.local.example @@ -11,6 +11,7 @@ CURITY_CLIENT_SECRET_SERVICE="" CURITY_CLIENT_ID_USER="" CURITY_CLIENT_SECRET_USER="" CURITY_ISSUER_USER="https://testlogin.scandichotels.com" +CURITY_ISSUER_SERVICE="https://testlogin.scandichotels.com" CYPRESS_BASE_URL="http://localhost:3000" # See next.config.js for info DEPLOY_PRIME_URL="http://localhost:3000" diff --git a/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx b/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx index 6fe1f7e01..a3cff5783 100644 --- a/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx +++ b/app/[lang]/(live)/(protected)/my-pages/profile/@creditCards/page.tsx @@ -1,3 +1,4 @@ +import { env } from "@/env/server" import { serverClient } from "@/lib/trpc/server" import { CreditCard, Delete } from "@/components/Icons" @@ -18,6 +19,8 @@ export default async function CreditCardSlot({ params }: PageArgs) { const { formatMessage } = await getIntl() const creditCards = await serverClient().user.creditCards() + const { lang } = params + return (
@@ -41,7 +44,9 @@ export default async function CreditCardSlot({ params }: PageArgs) { ))} ) : null} - +
) } diff --git a/app/[lang]/(live)/(public)/hotelreservation/select-hotel/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/select-hotel/page.tsx index c28f415bb..34cb80d3d 100644 --- a/app/[lang]/(live)/(public)/hotelreservation/select-hotel/page.tsx +++ b/app/[lang]/(live)/(public)/hotelreservation/select-hotel/page.tsx @@ -1,4 +1,5 @@ import { serverClient } from "@/lib/trpc/server" +import tempHotelData from "@/server/routers/hotels/tempHotelData.json" import HotelCard from "@/components/HotelReservation/HotelCard" import HotelFilter from "@/components/HotelReservation/SelectHotel/HotelFilter" @@ -18,14 +19,12 @@ export default async function SelectHotelPage({ const intl = await getIntl() setLang(params.lang) - const { attributes } = await serverClient().hotel.getHotel({ - hotelId: "d98c7ab1-ebaa-4102-b351-758daf1ddf55", - language: getLang(), - }) - const hotels = [attributes] + // TODO: Use real endpoint. + const hotel = tempHotelData.data.attributes + const hotels = [hotel] const hotelFilters = await serverClient().hotel.getFilters({ - hotelId: "d98c7ab1-ebaa-4102-b351-758daf1ddf55", + hotelId: "879", }) const tempSearchTerm = "Stockholm" @@ -40,12 +39,7 @@ export default async function SelectHotelPage({ zoomLevel={11} mapType="roadmap" /> - + {intl.formatMessage({ id: "Show map" })} diff --git a/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.tsx b/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.tsx index 162d7dc8c..3ead0a3f0 100644 --- a/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.tsx +++ b/app/[lang]/(live)/(public)/hotelreservation/select-rate/page.tsx @@ -1,4 +1,5 @@ import { serverClient } from "@/lib/trpc/server" +import tempHotelData from "@/server/routers/hotels/tempHotelData.json" import HotelCard from "@/components/HotelReservation/HotelCard" import BedSelection from "@/components/HotelReservation/SelectRate/BedSelection" @@ -14,11 +15,9 @@ import { LangParams, PageArgs } from "@/types/params" export default async function SelectRate({ params }: PageArgs) { setLang(params.lang) - // TODO: pass the correct hotel ID - const { attributes: hotel } = await serverClient().hotel.getHotel({ - hotelId: "d98c7ab1-ebaa-4102-b351-758daf1ddf55", - language: getLang(), - }) + // TODO: Use real endpoint. + const hotel = tempHotelData.data.attributes + const rooms = await serverClient().hotel.getRates({ // TODO: pass the correct hotel ID and all other parameters that should be included in the search hotelId: "1", diff --git a/app/[lang]/(live)/layout.tsx b/app/[lang]/(live)/layout.tsx index dec5edf44..f19388e72 100644 --- a/app/[lang]/(live)/layout.tsx +++ b/app/[lang]/(live)/layout.tsx @@ -9,6 +9,7 @@ import TokenRefresher from "@/components/Auth/TokenRefresher" import AdobeSDKScript from "@/components/Current/AdobeSDKScript" import Footer from "@/components/Current/Footer" import VwoScript from "@/components/Current/VwoScript" +import { ToastHandler } from "@/components/TempDesignSystem/Toasts" import { preloadUserTracking } from "@/components/TrackingSDK" import { getIntl } from "@/i18n" import ServerIntlProvider from "@/i18n/Provider" @@ -55,6 +56,7 @@ export default async function RootLayout({ {header} {children} +