Merge develop

types/components/cardImage.ts

@@ -1,7 +1,8 @@
+import { FacilityCard, FacilityImage } from "./hotelPage/facilities"
+
 import type { CardProps } from "@/components/TempDesignSystem/Card/card"
-import type { FacilityCard } from "./hotelPage/facilities"
 
 export interface CardImageProps extends React.HTMLAttributes<HTMLDivElement> {
-  card: FacilityCard | undefined
-  imageCards: Pick<CardProps, "backgroundImage">[]
+  card: FacilityCard | CardProps
+  imageCards?: FacilityImage[]
 }

types/components/enterDetails/bedType.ts

@@ -0,0 +1,5 @@
+import { z } from "zod"
+
+import { bedTypeSchema } from "@/components/HotelReservation/EnterDetails/BedType/schema"
+
+export interface BedTypeSchema extends z.output<typeof bedTypeSchema> {}

types/components/enterDetails/breakfast.ts

@@ -0,0 +1,5 @@
+import { z } from "zod"
+
+import { breakfastSchema } from "@/components/HotelReservation/EnterDetails/Breakfast/schema"
+
+export interface BreakfastSchema extends z.output<typeof breakfastSchema> {}

types/components/header/myPagesMenu.ts

@@ -3,6 +3,7 @@ import { navigationQueryRouter } from "@/server/routers/contentstack/myPages/nav
 import { FriendsMembership } from "@/utils/user"
 
 import type { User } from "@/types/user"
+import type { LoyaltyLevel } from "@/server/routers/contentstack/loyaltyLevel/output"
 
 type MyPagesNavigation = Awaited<
   ReturnType<(typeof navigationQueryRouter)["get"]>
@@ -12,6 +13,7 @@ export interface MyPagesMenuProps {
   navigation: MyPagesNavigation
   user: Pick<User, "firstName" | "lastName">
   membership?: FriendsMembership | null
+  membershipLevel: LoyaltyLevel | null
 }
 
 export interface MyPagesMenuContentProps extends MyPagesMenuProps {

types/components/hotelPage/amenities.ts

@@ -0,0 +1,5 @@
+import type { Amenities } from "@/types/hotel"
+
+export type AmenitiesListProps = {
+  detailedFacilities: Amenities
+}

types/components/hotelPage/facilities.ts

@@ -1,19 +1,54 @@
+import type { Facility } from "@/types/hotel"
+import type { ActivityCard } from "@/types/trpc/routers/contentstack/hotelPage"
 import type { CardProps } from "@/components/TempDesignSystem/Card/card"
 
-interface ColumnSpanOptions {
-  columnSpan: "one" | "two" | "three"
+export type FacilitiesProps = {
+  facilities: Facility[]
+  activitiesCard?: ActivityCard
 }
 
-export type FacilityCard = CardProps & ColumnSpanOptions
-
-export type Facility = Array<FacilityCard>
-
-export type Facilities = Array<Facility>
-
-export type FacilityProps = {
-  facilities: Facilities
+export type FacilityImage = {
+  backgroundImage: CardProps["backgroundImage"]
+  theme: CardProps["theme"]
+  id: string
 }
 
+export type FacilityCard = {
+  secondaryButton: {
+    href: string
+    title: string
+    openInNewTab?: boolean
+    isExternal: boolean
+  }
+  heading: string
+  scriptedTopTitle: string
+  theme: CardProps["theme"]
+  id: string
+}
+
+export type FacilityCardType = FacilityImage | FacilityCard
+export type FacilityGrid = FacilityCardType[]
+export type Facilities = FacilityGrid[]
+
 export type CardGridProps = {
-  facility: Facility
+  facilitiesCardGrid: FacilityGrid
+}
+
+export enum FacilityEnum {
+  wellness = "wellness-and-exercise",
+  conference = "meetings-and-conferences",
+  restaurant = "restaurant-and-bar",
+}
+
+export enum RestaurantHeadings {
+  restaurantAndBar = "Restaurant & Bar",
+  bar = "Bar",
+  restaurant = "Restaurant",
+  breakfastRestaurant = "Breakfast restaurant",
+}
+
+export enum FacilityIds {
+  bar = 1606,
+  rooftopBar = 1014,
+  restaurant = 1383,
 }

types/components/hotelPage/tabNavigation.ts

@@ -1,4 +1,4 @@
-export enum HotelHashValues {
+export enum HotelHashValues { // Should these be translated?
   overview = "#overview",
   rooms = "#rooms-section",
   restaurant = "#restaurant-and-bar",
@@ -7,3 +7,7 @@ export enum HotelHashValues {
   activities = "#activities",
   faq = "#faq",
 }
+
+export type TabNavigationProps = {
+  restaurantTitle: string
+}

types/components/image.ts

@@ -0,0 +1,9 @@
+export type ApiImage = {
+  id: string
+  url: string
+  title: string
+  meta: {
+    alt: string
+    caption: string
+  }
+}