Merge branch 'develop' into feature/tracking

types/components/blocks/table.ts

@@ -0,0 +1,5 @@
+import type { TableData } from "@/types/trpc/routers/contentstack/blocks"
+
+export interface TableBlockProps {
+  data: TableData
+}

types/components/hotelReservation/selectRate/flexibilityOption.ts

@@ -1,8 +1,8 @@
+import { Product, RateDefinition } from "@/server/routers/hotels/output"
+
 export type FlexibilityOptionProps = {
+  product: Product | undefined
   name: string
   value: string
   paymentTerm: string
-  standardPrice: number
-  memberPrice: number
-  currency: string
 }

types/components/hotelReservation/selectRate/roomCard.ts

@@ -1,8 +1,9 @@
-import { Rate } from "@/server/routers/hotels/output"
+import {
+  RateDefinition,
+  RoomConfiguration,
+} from "@/server/routers/hotels/output"
 
 export type RoomCardProps = {
-  room: Rate
-  nrOfNights: number
-  nrOfAdults: number
-  breakfastIncluded: boolean
+  roomConfiguration: RoomConfiguration
+  rateDefinitions: RateDefinition[]
 }

types/components/hotelReservation/selectRate/roomSelection.ts

@@ -1,7 +1,5 @@
-import { Rate } from "@/server/routers/hotels/output"
+import { RoomsAvailability } from "@/server/routers/hotels/output"
 
 export interface RoomSelectionProps {
-  rates: Rate[]
-  nrOfAdults: number
-  nrOfNights: number
+  roomConfigurations: RoomsAvailability
 }

types/enums/blocks.ts

@@ -4,6 +4,7 @@ export namespace BlocksEnums {
     Content = "Content",
     DynamicContent = "DynamicContent",
     Shortcuts = "Shortcuts",
+    Table = "Table",
     TextCols = "TextCols",
     TextContent = "TextContent",
     UspGrid = "UspGrid",

types/enums/contentPage.ts

@@ -7,6 +7,7 @@ export namespace ContentPageEnum {
       Shortcuts = "ContentPageBlocksShortcuts",
       TextCols = "ContentPageBlocksTextCols",
       UspGrid = "ContentPageBlocksUspGrid",
+      Table = "ContentPageBlocksTable",
     }
 
     export const enum sidebar {

types/trpc/routers/contentstack/blocks.ts

@@ -4,6 +4,7 @@ import { cardsGridSchema } from "@/server/routers/contentstack/schemas/blocks/ca
 import { contentSchema } from "@/server/routers/contentstack/schemas/blocks/content"
 import { dynamicContentSchema } from "@/server/routers/contentstack/schemas/blocks/dynamicContent"
 import { shortcutsSchema } from "@/server/routers/contentstack/schemas/blocks/shortcuts"
+import { tableSchema } from "@/server/routers/contentstack/schemas/blocks/table"
 import { textColsSchema } from "@/server/routers/contentstack/schemas/blocks/textCols"
 import { uspGridSchema } from "@/server/routers/contentstack/schemas/blocks/uspGrid"
 
@@ -12,5 +13,7 @@ export interface Content extends z.output<typeof contentSchema> {}
 export interface DynamicContent extends z.output<typeof dynamicContentSchema> {}
 export interface Shortcuts extends z.output<typeof shortcutsSchema> {}
 export type Shortcut = Shortcuts["shortcuts"]
+export interface TableBlock extends z.output<typeof tableSchema> {}
+export type TableData = TableBlock["table"]
 export interface TextCols extends z.output<typeof textColsSchema> {}
 export interface UspGrid extends z.output<typeof uspGridSchema> {}