diff --git a/apps/scandic-web/components/ContentType/DestinationPage/SidebarContentWrapper/index.tsx b/apps/scandic-web/components/ContentType/DestinationPage/SidebarContentWrapper/index.tsx index 3ec242121..3c9fff5fc 100644 --- a/apps/scandic-web/components/ContentType/DestinationPage/SidebarContentWrapper/index.tsx +++ b/apps/scandic-web/components/ContentType/DestinationPage/SidebarContentWrapper/index.tsx @@ -34,7 +34,7 @@ export default function SidebarContentWrapper({ return (
- + <Title level="h1" as="h2"> {getHeadingText(intl, location, allFilters, activeFilters[0])} {children} diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingList/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingList/index.tsx deleted file mode 100644 index 9bc1a30cf..000000000 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingList/index.tsx +++ /dev/null @@ -1,64 +0,0 @@ -import Body from "@/components/TempDesignSystem/Text/Body" -import { getIntl } from "@/i18n" - -import styles from "./parkingList.module.css" - -import type { ParkingListProps } from "@/types/components/hotelPage/sidepeek/parking" - -export default async function ParkingList({ - numberOfChargingSpaces, - canMakeReservation, - numberOfParkingSpots, - distanceToHotel, - address, -}: ParkingListProps) { - const intl = await getIntl() - - const canMakeReservationYesMsg = intl.formatMessage({ - id: "Parking can be reserved in advance: Yes", - }) - const canMakeReservationNoMsg = intl.formatMessage({ - id: "Parking can be reserved in advance: No", - }) - - return ( - - - - ) -} diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingList/parkingList.module.css b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingList/parkingList.module.css deleted file mode 100644 index 6e837a4fd..000000000 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingList/parkingList.module.css +++ /dev/null @@ -1,11 +0,0 @@ -.listStyling { - list-style-type: none; -} - -.listStyling > li::before { - content: url("/_static/icons/heart.svg"); - position: relative; - height: 8px; - top: 3px; - margin-right: var(--Spacing-x1); -} diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingPrices/index.tsx b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingPrices/index.tsx deleted file mode 100644 index d01e6f5b1..000000000 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingPrices/index.tsx +++ /dev/null @@ -1,75 +0,0 @@ -import Body from "@/components/TempDesignSystem/Text/Body" -import { getIntl } from "@/i18n" -import { formatPrice } from "@/utils/numberFormatting" - -import styles from "./parkingPrices.module.css" - -import { - type ParkingPricesProps, - Periods, -} from "@/types/components/hotelPage/sidepeek/parking" - -export default async function ParkingPrices({ - currency = "", - freeParking, - pricing, -}: ParkingPricesProps) { - const intl = await getIntl() - const day = intl.formatMessage({ id: "Price per day" }) - const night = intl.formatMessage({ id: "Price per night" }) - const allDay = intl.formatMessage({ id: "Price per 24 hours" }) - - function getPeriod(period?: string) { - switch (period) { - case Periods.day: - return day - case Periods.night: - return night - case Periods.allDay: - return allDay - default: - return period - } - } - - const filteredPeriods = pricing?.filter((filter) => filter.period !== "Hour") - - return ( -
- {filteredPeriods?.map((parking) => ( -
-
- - {getPeriod(parking.period)} - - - {parking.amount - ? freeParking - ? intl.formatMessage({ id: "Free parking" }) - : formatPrice(intl, parking.amount, currency) - : intl.formatMessage({ id: "N/A" })} - -
- {parking.startTime && - parking.endTime && - parking.period !== Periods.allDay && ( -
- - {intl.formatMessage({ id: "From" })} - - - {intl.formatMessage( - { id: "{parkingStartTime}-{parkingEndTime}" }, - { - parkingStartTime: parking.startTime, - parkingEndTime: parking.endTime, - } - )} - -
- )} -
- ))} -
- ) -} diff --git a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingPrices/parkingPrices.module.css b/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingPrices/parkingPrices.module.css deleted file mode 100644 index 436e883ec..000000000 --- a/apps/scandic-web/components/ContentType/HotelPage/SidePeeks/Amenities/AccordionAmenities/Parking/ParkingPrices/parkingPrices.module.css +++ /dev/null @@ -1,13 +0,0 @@ -.wrapper { - display: grid; - row-gap: var(--Spacing-x1); -} - -.period { - display: flex; - gap: var(--Spacing-x5); -} - -.information { - flex: 1; -} diff --git a/apps/scandic-web/components/ParkingInformation/ParkingPrices/index.tsx b/apps/scandic-web/components/ParkingInformation/ParkingPrices/index.tsx index 0302efdb0..3945d2e27 100644 --- a/apps/scandic-web/components/ParkingInformation/ParkingPrices/index.tsx +++ b/apps/scandic-web/components/ParkingInformation/ParkingPrices/index.tsx @@ -2,6 +2,8 @@ import Body from "@/components/TempDesignSystem/Text/Body" import { getIntl } from "@/i18n" import { formatPrice } from "@/utils/numberFormatting" +import { getPeriod } from "./utils" + import styles from "./parkingPrices.module.css" import { @@ -15,55 +17,41 @@ export default async function ParkingPrices({ pricing, }: ParkingPricesProps) { const intl = await getIntl() - const day = intl.formatMessage({ id: "Price per day" }) - const night = intl.formatMessage({ id: "Price per night" }) - const allDay = intl.formatMessage({ id: "Price per 24 hours" }) - function getPeriod(period?: string) { - switch (period) { - case Periods.day: - return day - case Periods.night: - return night - case Periods.allDay: - return allDay - default: - return period - } - } - - const filteredPeriods = pricing?.filter((filter) => filter.period !== "Hour") - - return ( -
- {filteredPeriods?.map((parking) => ( + return freeParking ? ( + + {intl.formatMessage({ id: "Free parking" })} + + ) : ( +
+ {pricing?.map((parking) => (
- - {getPeriod(parking.period)} + +
{getPeriod(intl, parking.period)}
- - {parking.amount - ? freeParking - ? intl.formatMessage({ id: "Free parking" }) - : formatPrice(intl, parking.amount, currency) - : intl.formatMessage({ id: "N/A" })} + +
+ {parking.amount + ? formatPrice(intl, parking.amount, currency) + : intl.formatMessage({ id: "At a cost" })} +
{parking.startTime && parking.endTime && parking.period !== Periods.allDay && (
- - {intl.formatMessage({ id: "From" })} + +
{intl.formatMessage({ id: "From" })}
- - {`${parking.startTime}-${parking.endTime}`} + +
{`${parking.startTime}-${parking.endTime}`}
)}
))} -
+ ) } diff --git a/apps/scandic-web/components/ParkingInformation/ParkingPrices/parkingPrices.module.css b/apps/scandic-web/components/ParkingInformation/ParkingPrices/parkingPrices.module.css index 436e883ec..36e539f35 100644 --- a/apps/scandic-web/components/ParkingInformation/ParkingPrices/parkingPrices.module.css +++ b/apps/scandic-web/components/ParkingInformation/ParkingPrices/parkingPrices.module.css @@ -1,6 +1,7 @@ .wrapper { display: grid; row-gap: var(--Spacing-x1); + margin: 0; } .period { @@ -9,5 +10,6 @@ } .information { + margin: 0; flex: 1; } diff --git a/apps/scandic-web/components/ParkingInformation/ParkingPrices/utils.ts b/apps/scandic-web/components/ParkingInformation/ParkingPrices/utils.ts new file mode 100644 index 000000000..5706b2b17 --- /dev/null +++ b/apps/scandic-web/components/ParkingInformation/ParkingPrices/utils.ts @@ -0,0 +1,18 @@ +import type { IntlShape } from "react-intl" + +import { Periods } from "@/types/components/hotelPage/sidepeek/parking" + +export function getPeriod(intl: IntlShape, period?: string) { + switch (period) { + case Periods.hour: + return intl.formatMessage({ id: "Price per hour" }) + case Periods.day: + return intl.formatMessage({ id: "Price per day" }) + case Periods.night: + return intl.formatMessage({ id: "Price per night" }) + case Periods.allDay: + return intl.formatMessage({ id: "Price per 24 hours" }) + default: + return period + } +} diff --git a/apps/scandic-web/types/components/hotelPage/sidepeek/parking.ts b/apps/scandic-web/types/components/hotelPage/sidepeek/parking.ts index 6e515a70c..6e7bf5a00 100644 --- a/apps/scandic-web/types/components/hotelPage/sidepeek/parking.ts +++ b/apps/scandic-web/types/components/hotelPage/sidepeek/parking.ts @@ -2,6 +2,7 @@ import type { Hotel, Parking } from "@/types/hotel" export enum Periods { allDay = "AllDay", + hour = "Hour", day = "Day", night = "Night", }