Merge branch 'develop' into feature/tracking

types/components/form/signupForm.ts

@@ -1,4 +1,4 @@
-export type RegisterFormProps = {
+export type SignUpFormProps = {
   link?: { href: string; text: string }
   subtitle?: string
   title: string

types/components/hotelPage/facilities.ts

@@ -34,7 +34,7 @@ export type CardGridProps = {
   facilitiesCardGrid: FacilityGrid
 }
 
-export enum FacilityEnum {
+export enum FacilityCardTypeEnum {
   wellness = "wellness-and-exercise",
   conference = "meetings-and-conferences",
   restaurant = "restaurant-and-bar",
@@ -46,9 +46,3 @@ export enum RestaurantHeadings {
   restaurant = "Restaurant",
   breakfastRestaurant = "Breakfast restaurant",
 }
-
-export enum FacilityIds {
-  bar = 1606,
-  rooftopBar = 1014,
-  restaurant = 1383,
-}

types/components/hotelReservation/selectHotel/selectHotel.ts

@@ -12,6 +12,7 @@ export interface DetailedAmenity {
 }
 
 export interface ReadMoreProps {
+  label: string
   hotelId: string
   hotel: Hotel
 }

types/components/hotelReservation/selectRate/flexibilityOption.ts

@@ -1,6 +1,10 @@
 import { z } from "zod"
 
-import { Product, productTypePriceSchema } from "@/server/routers/hotels/output"
+import {
+  Product,
+  productTypePriceSchema,
+  RoomConfiguration,
+} from "@/server/routers/hotels/output"
 
 import { Rate } from "./selectRate"
 
@@ -12,7 +16,8 @@ export type FlexibilityOptionProps = {
   value: string
   paymentTerm: string
   priceInformation?: Array<string>
-  roomType: string
+  roomType: RoomConfiguration["roomType"]
+  roomTypeCode: RoomConfiguration["roomTypeCode"]
   handleSelectRate: (rate: Rate) => void
 }
 

types/components/hotelReservation/selectRate/hotelInfoCardProps.ts

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

types/components/hotelReservation/selectRate/imageGallery.ts

@@ -0,0 +1,3 @@
+import type { GalleryImages } from "@/types/hotel"
+
+export type ImageGalleryProps = { images: GalleryImages; title: string }

types/components/hotelReservation/selectRate/section.ts

@@ -1,4 +1,4 @@
-import { Hotel } from "@/types/hotel"
+import { CreditCard } from "@/types/user"
 
 export interface SectionProps {
   nextPath: string
@@ -28,7 +28,9 @@ export interface BreakfastSelectionProps extends SectionProps {
 export interface DetailsProps extends SectionProps {}
 
 export interface PaymentProps {
-  hotel: Hotel
+  hotelId: string
+  otherPaymentOptions: string[]
+  savedCreditCards: CreditCard[] | null
 }
 
 export interface SectionPageProps {

types/components/hotelReservation/selectRate/selectRate.ts

@@ -1,13 +1,28 @@
-import { Product } from "@/server/routers/hotels/output"
+import { Product, RoomConfiguration } from "@/server/routers/hotels/output"
+
+interface Child {
+  bed: string
+  age: number
+}
+
+interface Room {
+  adults: number
+  roomcode?: string
+  ratecode?: string
+  child?: Child[]
+}
 
 export interface SelectRateSearchParams {
-  fromDate: string
-  toDate: string
   hotel: string
+  fromdate: string
+  todate: string
+  room: Room[]
+  [key: string]: string | string[] | Room[]
 }
 
 export interface Rate {
-  roomType: string
+  roomType: RoomConfiguration["roomType"]
+  roomTypeCode: RoomConfiguration["roomTypeCode"]
   priceName: string
   public: Product["productType"]["public"]
   member: Product["productType"]["member"]

types/components/icon.ts

@@ -7,8 +7,10 @@ export interface IconProps
     VariantProps<typeof iconVariants> {}
 
 export enum IconName {
+  Accesories = "Accesories",
   Accessibility = "Accessibility",
   AccountCircle = "AccountCircle",
+  Air = "Air",
   Airplane = "Airplane",
   ArrowRight = "ArrowRight",
   Bar = "Bar",
@@ -18,7 +20,6 @@ export enum IconName {
   Camera = "Camera",
   Cellphone = "Cellphone",
   Check = "Check",
-  CrossCircle = "CrossCircle",
   CheckCircle = "CheckCircle",
   ChevronDown = "ChevronDown",
   ChevronLeft = "ChevronLeft",
@@ -26,45 +27,76 @@ export enum IconName {
   ChevronRightSmall = "ChevronRightSmall",
   Close = "Close",
   CloseLarge = "CloseLarge",
-  Coffee = "Coffee",
+  CoffeeAlt = "CoffeeAlt",
   Concierge = "Concierge",
+  ConvenienceStore24h = "ConvenienceStore24h",
+  Cool = "Cool",
+  CrossCircle = "CrossCircle",
   Cultural = "Cultural",
   DoorOpen = "DoorOpen",
+  Dresser = "Dresser",
   ElectricBike = "ElectricBike",
+  ElectricCar = "ElectricCar",
   Email = "Email",
   EyeHide = "EyeHide",
   EyeShow = "EyeShow",
   Facebook = "Facebook",
+  Fan = "Fan",
   Fitness = "Fitness",
+  Footstool = "Footstool",
   Gallery = "Gallery",
+  Garage = "Garage",
   Gift = "Gift",
   Globe = "Globe",
+  Golf = "Golf",
+  Groceries = "Groceries",
+  Hanger = "Hanger",
+  HangerAlt = "HangerAlt",
+  Heat = "Heat",
   House = "House",
   Image = "Image",
   InfoCircle = "InfoCircle",
   Instagram = "Instagram",
+  Kayaking = "Kayaking",
+  Kettle = "Kettle",
+  Lamp = "Lamp",
+  LaundryMachine = "LaundryMachine",
+  LocalBar = "LocalBar",
   Location = "Location",
   Lock = "Lock",
   Map = "Map",
   Minus = "Minus",
   Museum = "Museum",
+  Nature = "Nature",
+  Nightlife = "Nightlife",
+  NoSmoking = "NoSmoking",
+  OutdoorFurniture = "OutdoorFurniture",
   Parking = "Parking",
-  Person = "Person",
   People2 = "People2",
+  Person = "Person",
   Pets = "Pets",
   Phone = "Phone",
   Plus = "Plus",
   PlusCircle = "PlusCircle",
   Restaurant = "Restaurant",
+  RoomService = "RoomService",
   Sauna = "Sauna",
   Search = "Search",
   Service = "Service",
   Shopping = "Shopping",
+  Skateboarding = "Skateboarding",
+  Smoking = "Smoking",
   Snowflake = "Snowflake",
+  Spa = "Spa",
   StarFilled = "StarFilled",
+  Street = "Street",
+  Swim = "Swim",
+  Thermostat = "Thermostat",
   Train = "Train",
   Tripadvisor = "Tripadvisor",
+  Tshirt = "Tshirt",
   TshirtWash = "TshirtWash",
-  Wifi = "Wifi",
+  TvCasting = "TvCasting",
   WarningTriangle = "WarningTriangle",
+  Wifi = "Wifi",
 }

types/components/image.ts

@@ -1,9 +1,32 @@
-export type ApiImage = {
+import type { ImageProps as NextImageProps } from "next/image"
+
+import type { ImageVaultAsset } from "./imageVault"
+
+export interface FocalPoint {
+  x: number
+  y: number
+}
+
+export interface Dimensions {
+  width: number
+  height: number
+  aspectRatio: number
+}
+
+export interface Meta {
+  alt: string | undefined | null
+  caption: string | undefined | null
+}
+
+export interface ApiImage {
   id: string
   url: string
   title: string
-  meta: {
-    alt: string
-    caption: string
-  }
+  meta: Meta
+  dimensions?: Dimensions
+  focalPoint?: FocalPoint
+}
+
+export interface ImageProps extends NextImageProps {
+  focalPoint?: FocalPoint
 }

types/components/imageVault.ts

@@ -11,6 +11,8 @@ import { z } from "zod"
 
 import { imageVaultAssetSchema } from "@/server/routers/contentstack/schemas/imageVault"
 
+import type { FocalPoint } from "./image"
+
 export type ImageVaultAssetResponse = z.infer<typeof imageVaultAssetSchema>
 
 export type ImageVaultAsset = {
@@ -23,4 +25,5 @@ export type ImageVaultAsset = {
     aspectRatio: number
   }
   meta: { alt: string | undefined | null; caption: string | undefined | null }
+  focalPoint: FocalPoint
 }