Merge branch 'master' into feature/tracking

types/components/blocks/surprises.ts

@@ -1,14 +1,35 @@
-import {
-  Reward,
-  SurpriseReward,
-} from "@/server/routers/contentstack/reward/output"
+import { Reward } from "@/server/routers/contentstack/reward/output"
 
 export interface Surprise extends Reward {
-  endsAt: SurpriseReward["endsAt"]
-  id: SurpriseReward["id"]
+  coupons: { couponCode?: string; expiresAt?: string }[]
+  id?: string
 }
 
 export interface SurprisesProps {
   surprises: Surprise[]
   membershipNumber?: string
 }
+
+export interface NavigationProps {
+  selectedSurprise: number
+  totalSurprises: number
+  showSurprise: (direction: number) => void
+}
+
+export interface CardProps extends React.PropsWithChildren {
+  title?: string
+}
+
+export interface InitialProps {
+  totalSurprises: number
+  onOpen: VoidFunction
+}
+
+export interface SlideProps {
+  surprise: Surprise
+  membershipNumber?: string
+}
+
+export interface HeaderProps extends React.PropsWithChildren {
+  onClose: VoidFunction
+}

types/components/hotelPage/sidepeek/aboutTheHotel.ts

@@ -0,0 +1,10 @@
+import type { Hotel, HotelAddress, HotelLocation } from "@/types/hotel"
+
+export type AboutTheHotelSidePeekProps = {
+  hotelAddress: HotelAddress
+  coordinates: HotelLocation
+  contact: Hotel["contactInformation"]
+  socials: Hotel["socialMedia"]
+  ecoLabels: Hotel["hotelFacts"]["ecoLabels"]
+  descriptions: Hotel["hotelContent"]["texts"]
+}

types/components/hotelPage/sidepeek/contactInformation.ts

@@ -0,0 +1,6 @@
+import type { AboutTheHotelSidePeekProps } from "./aboutTheHotel"
+
+export type ContactInformationProps = Omit<
+  AboutTheHotelSidePeekProps,
+  "descriptions"
+>

types/components/hotelReservation/enterDetails/bookingData.ts

@@ -7,6 +7,7 @@ interface Room {
   adults: number
   roomTypeCode: string
   rateCode: string
+  counterRateCode: string
   children?: Child[]
   packages?: RoomPackageCodeEnum[]
 }
@@ -18,14 +19,24 @@ export interface BookingData {
 }
 
 type Price = {
-  price: number
+  amount: number
   currency: string
 }
 
 export type RoomsData = {
   roomType: string
-  localPrice: Price
-  euroPrice: Price | undefined
+  prices: {
+    public: {
+      local: Price
+      euro: Price | undefined
+    }
+    member:
+      | {
+          local: Price
+          euro: Price | undefined
+        }
+      | undefined
+  }
   adults: number
   children?: Child[]
   rateDetails?: string[]

types/components/hotelReservation/selectHotel/hotelFilters.ts

@@ -15,6 +15,7 @@ export type Filter = {
   public: boolean
   sortOrder: number
   filter?: string
+  icon: string
 }
 
 export type HotelFilterModalProps = {

types/components/hotelReservation/selectHotel/map.ts

@@ -22,6 +22,7 @@ export interface SelectHotelMapProps {
   mapId: string
   hotels: HotelData[]
   filterList: CategorizedFilters
+  cityCoordinates: Coordinates
 }
 
 type ImageSizes = z.infer<typeof imageSizesSchema>

types/components/hotelReservation/selectRate/flexibilityOption.ts

@@ -23,7 +23,10 @@ export type FlexibilityOptionProps = {
   roomTypeCode: RoomConfiguration["roomTypeCode"]
   features: RoomConfiguration["features"]
   petRoomPackage: RoomPackage | undefined
-  handleSelectRate: (rate: Rate) => void
+  handleSelectRate: (rateCode: {
+    publicRateCode: string
+    roomTypeCode: string
+  }) => void
 }
 
 export interface PriceListProps {

types/components/hotelReservation/selectRate/hotelInfoCardProps.ts

@@ -1,6 +0,0 @@
-import type { HotelData } from "@/types/hotel"
-
-export type HotelInfoCardProps = {
-  hotelData: HotelData | null
-  noAvailability: boolean
-}

types/components/hotelReservation/selectRate/roomCard.ts

@@ -19,7 +19,10 @@ export type RoomCardProps = {
   roomCategories: RoomData[]
   selectedPackages: RoomPackageCodes[]
   packages: RoomPackageData | undefined
-  handleSelectRate: (rate: Rate) => void
+  handleSelectRate: (rateCode: {
+    publicRateCode: string
+    roomTypeCode: string
+  }) => void
 }
 
 type RoomPackagePriceSchema = z.output<typeof packagePriceSchema>

types/components/hotelReservation/selectRate/roomSelection.ts

@@ -10,7 +10,10 @@ export interface RoomSelectionProps {
   user: SafeUser
   availablePackages: RoomPackageData | undefined
   selectedPackages: RoomPackageCodes[]
-  setRateSummary: (rateSummary: Rate) => void
+  setRateCode: (rateCode: {
+    publicRateCode: string
+    roomTypeCode: string
+  }) => void
   rateSummary: Rate | null
 }
 

types/components/hotelReservation/selectRate/section.ts

@@ -1,4 +1,4 @@
-import { CreditCard } from "@/types/user"
+import { CreditCard, SafeUser } from "@/types/user"
 
 export interface SectionProps {
   nextPath: string
@@ -28,6 +28,7 @@ export interface BreakfastSelectionProps extends SectionProps {
 export interface DetailsProps extends SectionProps {}
 
 export interface PaymentProps {
+  user: SafeUser
   roomPrice: { publicPrice: number; memberPrice: number | undefined }
   otherPaymentOptions: string[]
   savedCreditCards: CreditCard[] | null

types/components/hotelReservation/selectRate/selectRate.ts

@@ -11,7 +11,7 @@ interface Room {
   adults: number
   roomtype: string
   ratecode: string
-  counterratecode?: string
+  counterratecode: string
   child?: Child[]
   packages?: string
 }

types/components/metadata/index.ts

@@ -1,5 +0,0 @@
-import { z } from "zod"
-
-import { getMetaDataSchema } from "@/server/routers/contentstack/schemas/metadata"
-
-export interface MetaData extends z.infer<typeof getMetaDataSchema> {}