Merge branch 'master' of bitbucket.org:scandic-swap/web into fix/loading-rooms-separately

types/components/form/bookingwidget.ts

@@ -4,7 +4,7 @@ import type { Location, Locations } from "@/types/trpc/routers/hotel/locations"
 export interface BookingWidgetFormProps {
   locations: Locations
   type?: BookingWidgetType
-  setIsOpen: (isOpen: boolean) => void
+  onClose: () => void
 }
 
 export interface BookingWidgetFormContentProps {

types/components/hotelReservation/enterDetails/details.ts

@@ -6,6 +6,14 @@ import type { SafeUser } from "@/types/user"
 
 export type DetailsSchema = z.output<typeof guestDetailsSchema>
 
+type MemberPrice = { price: number; currency: string }
+
 export interface DetailsProps {
   user: SafeUser
+  memberPrice?: MemberPrice
+}
+
+export type JoinScandicFriendsCardProps = {
+  name: string
+  memberPrice?: MemberPrice
 }

types/components/hotelReservation/selectHotel/hotelFilters.ts

@@ -16,3 +16,7 @@ export type Filter = {
   sortOrder: number
   filter?: string
 }
+
+export type HotelFilterModalProps = {
+  filters: CategorizedFilters
+}

types/components/hotelReservation/selectHotel/map.ts

@@ -6,7 +6,7 @@ import {
 } from "@/server/routers/hotels/schemas/image"
 
 import { HotelData } from "./hotelCardListingProps"
-import { Filter } from "./hotelFilters"
+import { CategorizedFilters, Filter } from "./hotelFilters"
 
 import type { Coordinates } from "@/types/components/maps/coordinates"
 
@@ -21,6 +21,7 @@ export interface SelectHotelMapProps {
   hotelPins: HotelPin[]
   mapId: string
   hotels: HotelData[]
+  filterList: CategorizedFilters
 }
 
 type ImageSizes = z.infer<typeof imageSizesSchema>

types/components/maps/poiMarker.ts

@@ -2,14 +2,11 @@ import { poiVariants } from "@/components/Maps/Markers/Poi/variants"
 
 import type { VariantProps } from "class-variance-authority"
 
-import {
-  PointOfInterestCategoryNameEnum,
-  PointOfInterestGroupEnum,
-} from "@/types/hotel"
+import type { PointOfInterestGroupEnum } from "@/types/hotel"
 
 export interface PoiMarkerProps extends VariantProps<typeof poiVariants> {
   group: PointOfInterestGroupEnum
-  categoryName?: PointOfInterestCategoryNameEnum
+  categoryName?: string
   size?: number
   className?: string
 }

types/components/tracking.ts

@@ -80,3 +80,4 @@ export type TrackingPosition =
   | "hamburger menu"
   | "join scandic friends sidebar"
   | "sign up verification"
+  | "enter details"

types/hotel.ts

@@ -26,26 +26,6 @@ export type GalleryImage = z.infer<typeof imageSchema>
 
 export type PointOfInterest = z.output<typeof pointOfInterestSchema>
 
-export enum PointOfInterestCategoryNameEnum {
-  AIRPORT = "Airport",
-  AMUSEMENT_PARK = "Amusement park",
-  BUS_TERMINAL = "Bus terminal",
-  FAIR = "Fair",
-  HOSPITAL = "Hospital",
-  HOTEL = "Hotel",
-  MARKETING_CITY = "Marketing city",
-  MUSEUM = "Museum",
-  NEARBY_COMPANIES = "Nearby companies",
-  PARKING_GARAGE = "Parking / Garage",
-  RESTAURANT = "Restaurant",
-  SHOPPING = "Shopping",
-  SPORTS = "Sports",
-  THEATRE = "Theatre",
-  TOURIST = "Tourist",
-  TRANSPORTATIONS = "Transportations",
-  ZOO = "Zoo",
-}
-
 export enum PointOfInterestGroupEnum {
   PUBLIC_TRANSPORT = "Public transport",
   ATTRACTIONS = "Attractions",

types/providers/steps.ts

@@ -6,5 +6,6 @@ export interface StepsProviderProps extends React.PropsWithChildren {
   bedTypes: BedTypeSelection[]
   breakfastPackages: BreakfastPackage[] | null
   isMember: boolean
+  searchParams: string
   step: StepEnum
 }