diff --git a/apps/partner-sas/app/[lang]/layout.tsx b/apps/partner-sas/app/[lang]/layout.tsx index b6fc29b9a..7a55048a0 100644 --- a/apps/partner-sas/app/[lang]/layout.tsx +++ b/apps/partner-sas/app/[lang]/layout.tsx @@ -11,7 +11,10 @@ import { getMessages } from "@/i18n" import ClientIntlProvider from "@/i18n/Provider" import { setLang } from "@/i18n/serverContext" -import { trackBookingSearchClick } from "../utils/tracking" +import { + trackAccordionItemOpen, + trackBookingSearchClick, +} from "../utils/tracking" import type { Metadata } from "next" @@ -53,6 +56,7 @@ export default async function RootLayout(props: RootLayoutProps) {
diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/index.tsx index 2a183f7b2..428ebdf37 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/index.tsx @@ -1,11 +1,11 @@ +import AdditionalAmenities from "@scandic-hotels/booking-flow/components/AdditionalAmenities" +import BreakfastAccordionItem from "@scandic-hotels/booking-flow/components/SidePeekAccordions/BreakfastAccordionItem" +import CheckInCheckOutAccordionItem from "@scandic-hotels/booking-flow/components/SidePeekAccordions/CheckInCheckOutAccordionItem" +import ParkingAccordionItem from "@scandic-hotels/booking-flow/components/SidePeekAccordions/ParkingAccordionItem" import Accordion from "@scandic-hotels/design-system/Accordion" import SidePeek from "@scandic-hotels/design-system/SidePeek" import AccessibilityAccordionItem from "@/components/SidePeeks/AmenitiesSidepeekContent/Accordions/Accessibility" -import BreakfastAccordionItem from "@/components/SidePeeks/AmenitiesSidepeekContent/Accordions/Breakfast" -import CheckInCheckOutAccordionItem from "@/components/SidePeeks/AmenitiesSidepeekContent/Accordions/CheckInCheckOut" -import ParkingAccordionItem from "@/components/SidePeeks/AmenitiesSidepeekContent/Accordions/Parking" -import AdditionalAmenities from "@/components/SidePeeks/AmenitiesSidepeekContent/AdditionalAmenities" import { getIntl } from "@/i18n" import { appendSlugToPathname } from "@/utils/appendSlugToPathname" diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/RoomFacilities/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/RoomFacilities/index.tsx index 4ad21a9e6..b67b3a021 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/RoomFacilities/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/RoomFacilities/index.tsx @@ -4,9 +4,9 @@ import { cx } from "class-variance-authority" import { useRef, useState } from "react" import { useIntl } from "react-intl" +import { FacilityIcon } from "@scandic-hotels/design-system/Icons/FacilityIcon" import { Typography } from "@scandic-hotels/design-system/Typography" -import { FacilityIcon } from "@/components/SidePeeks/RoomSidePeek/facilityIcon" import ShowMoreButton from "@/components/TempDesignSystem/ShowMoreButton" import styles from "./roomFacilities.module.css" diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/RoomTypes/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/RoomTypes/index.tsx index c766a1741..21d6621de 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/RoomTypes/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Room/RoomTypes/index.tsx @@ -1,7 +1,7 @@ import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import { Typography } from "@scandic-hotels/design-system/Typography" -import { getBedIconName } from "@/components/SidePeeks/RoomSidePeek/bedIcon" +import { getBedIconName } from "@/components/utils" import { getIntl } from "@/i18n" import { getBedDescriptionText } from "../utils" diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/index.tsx index 092391d08..476af26b7 100644 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/index.tsx +++ b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/index.tsx @@ -15,7 +15,7 @@ export default function SidePeeks({ hotelId, children }: SidePeeksProps) { const searchParams = useSearchParams() function handleOpen(sidePeek: string) { - trackOpenSidePeekEvent(sidePeek, hotelId) + trackOpenSidePeekEvent({ name: sidePeek, hotelId }) } function handleClose() { diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/RoomDetailsSidePeek/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/RoomDetailsSidePeek/index.tsx index ffd23c0ab..a0722f2d3 100644 --- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/RoomDetailsSidePeek/index.tsx +++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Rooms/Room/RoomDetailsSidePeek/index.tsx @@ -3,13 +3,13 @@ import { DialogTrigger } from "react-aria-components" import { useIntl } from "react-intl" +import { RoomSidePeekContent } from "@scandic-hotels/booking-flow/components/RoomSidePeekContent" import { Button } from "@scandic-hotels/design-system/Button" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import { getBookedHotelRoom } from "@scandic-hotels/trpc/routers/booking/helpers" import { useBookingConfirmationStore } from "@/stores/booking-confirmation" -import { RoomSidePeekContent } from "@/components/SidePeeks/RoomSidePeek/RoomSidePeekContent" import SidePeekSelfControlled from "@/components/TempDesignSystem/SidePeekSelfControlled" interface RoomDetailsSidePeekProps { diff --git a/apps/scandic-web/components/HotelReservation/EnterDetails/BedType/index.tsx b/apps/scandic-web/components/HotelReservation/EnterDetails/BedType/index.tsx index b851e66bf..affd352df 100644 --- a/apps/scandic-web/components/HotelReservation/EnterDetails/BedType/index.tsx +++ b/apps/scandic-web/components/HotelReservation/EnterDetails/BedType/index.tsx @@ -4,9 +4,9 @@ import { zodResolver } from "@hookform/resolvers/zod" import { useCallback, useEffect, useState } from "react" import { FormProvider, useForm } from "react-hook-form" +import { BED_TYPE_ICONS } from "@scandic-hotels/booking-flow/bedTypeIcons" import RadioCard from "@scandic-hotels/design-system/Form/RadioCard" -import { BED_TYPE_ICONS } from "@/constants/booking" import { useEnterDetailsStore } from "@/stores/enter-details" import { useRoomContext } from "@/contexts/Details/Room" diff --git a/apps/scandic-web/components/HotelReservation/EnterDetails/Header/ToggleSidePeek.tsx b/apps/scandic-web/components/HotelReservation/EnterDetails/Header/ToggleSidePeek.tsx index ba48deaa4..3ae42e7d0 100644 --- a/apps/scandic-web/components/HotelReservation/EnterDetails/Header/ToggleSidePeek.tsx +++ b/apps/scandic-web/components/HotelReservation/EnterDetails/Header/ToggleSidePeek.tsx @@ -2,12 +2,14 @@ import { useIntl } from "react-intl" +import useSidePeekStore, { + SidePeekEnum, +} from "@scandic-hotels/booking-flow/stores/sidepeek" import { Button } from "@scandic-hotels/design-system/Button" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" -import useSidePeekStore from "@/stores/sidepeek" +import { trackOpenSidePeekEvent } from "@/utils/tracking" -import { SidePeekEnum } from "@/types/components/hotelReservation/sidePeek" import type { ToggleSidePeekProps } from "@/types/components/hotelReservation/toggleSidePeekProps" export default function ToggleSidePeek({ hotelId }: ToggleSidePeekProps) { @@ -16,7 +18,14 @@ export default function ToggleSidePeek({ hotelId }: ToggleSidePeekProps) { return (