diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/index.tsx index 3786a2d86..8578e0b06 100644 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/index.tsx +++ b/apps/scandic-web/components/Blocks/DynamicContent/Overview/Stats/index.tsx @@ -1,4 +1,4 @@ -import Divider from "@/components/TempDesignSystem/Divider" +import { Divider } from "@scandic-hotels/design-system/Divider" import ExpiringPoints from "./ExpiringPoints" import Points from "./Points" diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Overview/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Overview/index.tsx index 4ac43ba6d..ad772614b 100644 --- a/apps/scandic-web/components/Blocks/DynamicContent/Overview/index.tsx +++ b/apps/scandic-web/components/Blocks/DynamicContent/Overview/index.tsx @@ -1,3 +1,5 @@ +import { Divider } from "@scandic-hotels/design-system/Divider" + import { env } from "@/env/server" import { getProfile } from "@/lib/trpc/memoizedRequests" @@ -6,7 +8,6 @@ import DigitalTeamMemberCardAlert from "@/components/MyPages/DigitalTeamMemberCa import SectionContainer from "@/components/Section/Container" import SectionHeader from "@/components/Section/Header" import SectionLink from "@/components/Section/Link" -import Divider from "@/components/TempDesignSystem/Divider" import Hero from "./Friend/Hero" import MembershipNumber from "./Friend/MembershipNumber" diff --git a/apps/scandic-web/components/Blocks/DynamicContent/Points/Overview/index.tsx b/apps/scandic-web/components/Blocks/DynamicContent/Points/Overview/index.tsx index 03db76599..b1922c765 100644 --- a/apps/scandic-web/components/Blocks/DynamicContent/Points/Overview/index.tsx +++ b/apps/scandic-web/components/Blocks/DynamicContent/Points/Overview/index.tsx @@ -1,9 +1,10 @@ +import { Divider } from "@scandic-hotels/design-system/Divider" + import { getProfile } from "@/lib/trpc/memoizedRequests" import SectionContainer from "@/components/Section/Container" import SectionHeader from "@/components/Section/Header" import SectionLink from "@/components/Section/Link" -import Divider from "@/components/TempDesignSystem/Divider" import Friend from "../../Overview/Friend" import Hero from "../../Overview/Friend/Hero" diff --git a/apps/scandic-web/components/Blocks/HotelListing/HotelListingItem/index.tsx b/apps/scandic-web/components/Blocks/HotelListing/HotelListingItem/index.tsx index 6e94da04f..9f2f76466 100644 --- a/apps/scandic-web/components/Blocks/HotelListing/HotelListingItem/index.tsx +++ b/apps/scandic-web/components/Blocks/HotelListing/HotelListingItem/index.tsx @@ -1,9 +1,9 @@ +import { Divider } from "@scandic-hotels/design-system/Divider" import HotelLogoIcon from "@scandic-hotels/design-system/Icons/HotelLogoIcon" import { Typography } from "@scandic-hotels/design-system/Typography" import ButtonLink from "@/components/ButtonLink" import Image from "@/components/Image" -import Divider from "@/components/TempDesignSystem/Divider" import { getIntl } from "@/i18n" import { getSingleDecimal } from "@/utils/numberFormatting" @@ -47,7 +47,7 @@ export default async function HotelListingItem({
{hotel.address.streetAddress} - + {intl.formatMessage( { @@ -71,8 +71,7 @@ export default async function HotelListingItem({ <> - {/* Divider can't be a div */} - + {/* Button can't contain HR elements */} + {totalNightsMsg} @@ -185,7 +185,7 @@ export function MobileToggleButtonSkeleton() { - + diff --git a/apps/scandic-web/components/ContentType/DestinationPage/CityListing/CityListingItem/CityListingItemSkeleton.tsx b/apps/scandic-web/components/ContentType/DestinationPage/CityListing/CityListingItem/CityListingItemSkeleton.tsx index 8669fa86d..27c2f24dd 100644 --- a/apps/scandic-web/components/ContentType/DestinationPage/CityListing/CityListingItem/CityListingItemSkeleton.tsx +++ b/apps/scandic-web/components/ContentType/DestinationPage/CityListing/CityListingItem/CityListingItemSkeleton.tsx @@ -1,7 +1,8 @@ "use client" +import { Divider } from "@scandic-hotels/design-system/Divider" + import SkeletonShimmer from "@/components/SkeletonShimmer" -import Divider from "@/components/TempDesignSystem/Divider" import ExperienceListSkeleton from "../../ExperienceList/ExperienceListSkeleton" @@ -23,7 +24,7 @@ export default function CityListingItemSkeleton() {
- +
diff --git a/apps/scandic-web/components/ContentType/DestinationPage/CityListing/CityListingItem/index.tsx b/apps/scandic-web/components/ContentType/DestinationPage/CityListing/CityListingItem/index.tsx index b9798f8cc..60e3db337 100644 --- a/apps/scandic-web/components/ContentType/DestinationPage/CityListing/CityListingItem/index.tsx +++ b/apps/scandic-web/components/ContentType/DestinationPage/CityListing/CityListingItem/index.tsx @@ -3,9 +3,10 @@ import Link from "next/link" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" + import ImageGallery from "@/components/ImageGallery" import Button from "@/components/TempDesignSystem/Button" -import Divider from "@/components/TempDesignSystem/Divider" import Body from "@/components/TempDesignSystem/Text/Body" import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" import { mapImageVaultImagesToGalleryImages } from "@/utils/imageGallery" @@ -47,7 +48,7 @@ export default function CityListingItem({ city }: CityListingItemProps) { ) : null} {city.preamble} - +
)} - +
) } diff --git a/apps/scandic-web/components/Header/MainMenu/MyPagesMenuContent/index.tsx b/apps/scandic-web/components/Header/MainMenu/MyPagesMenuContent/index.tsx index fdcfa8750..bb3d22e1f 100644 --- a/apps/scandic-web/components/Header/MainMenu/MyPagesMenuContent/index.tsx +++ b/apps/scandic-web/components/Header/MainMenu/MyPagesMenuContent/index.tsx @@ -3,12 +3,12 @@ import FocusLock from "react-focus-lock" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import { logout } from "@/constants/routes/handleAuth" import { trpc } from "@/lib/trpc/client" -import Divider from "@/components/TempDesignSystem/Divider" import Link from "@/components/TempDesignSystem/Link" import Caption from "@/components/TempDesignSystem/Text/Caption" import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" @@ -71,11 +71,11 @@ export default function MyPagesMenuContent({
  • - + - +
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Receipt/TotalPrice/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Receipt/TotalPrice/index.tsx index a3c45905b..551d8bb38 100644 --- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/Receipt/TotalPrice/index.tsx +++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/Receipt/TotalPrice/index.tsx @@ -2,13 +2,13 @@ import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import { Typography } from "@scandic-hotels/design-system/Typography" import { useBookingConfirmationStore } from "@/stores/booking-confirmation" import BookingCodeChip from "@/components/BookingCodeChip" import SkeletonShimmer from "@/components/SkeletonShimmer" -import Divider from "@/components/TempDesignSystem/Divider" import PriceDetails from "../../PriceDetails" @@ -28,7 +28,7 @@ export default function TotalPrice() { return ( <> - +
diff --git a/apps/scandic-web/components/HotelReservation/BookingConfirmation/index.tsx b/apps/scandic-web/components/HotelReservation/BookingConfirmation/index.tsx index 8aff4121d..c25150c94 100644 --- a/apps/scandic-web/components/HotelReservation/BookingConfirmation/index.tsx +++ b/apps/scandic-web/components/HotelReservation/BookingConfirmation/index.tsx @@ -1,5 +1,7 @@ import { notFound } from "next/navigation" +import { Divider } from "@scandic-hotels/design-system/Divider" + import { getBookingConfirmation } from "@/lib/trpc/memoizedRequests" import HotelDetails from "@/components/HotelReservation/BookingConfirmation/HotelDetails" @@ -9,7 +11,6 @@ import Receipt from "@/components/HotelReservation/BookingConfirmation/Receipt" import Rooms from "@/components/HotelReservation/BookingConfirmation/Rooms" import SidePanel from "@/components/HotelReservation/SidePanel" import Alert from "@/components/TempDesignSystem/Alert" -import Divider from "@/components/TempDesignSystem/Divider" import { getIntl } from "@/i18n" import BookingConfirmationProvider from "@/providers/BookingConfirmationProvider" @@ -74,7 +75,7 @@ export default async function BookingConfirmation({ mainRoom={room} /> - + {hotel.specialAlerts.map((alert) => (
diff --git a/apps/scandic-web/components/HotelReservation/EnterDetails/Confirm/index.tsx b/apps/scandic-web/components/HotelReservation/EnterDetails/Confirm/index.tsx index 568270053..7b3df1355 100644 --- a/apps/scandic-web/components/HotelReservation/EnterDetails/Confirm/index.tsx +++ b/apps/scandic-web/components/HotelReservation/EnterDetails/Confirm/index.tsx @@ -5,6 +5,7 @@ import { useFormContext } from "react-hook-form" import { useIntl } from "react-intl" import { Button } from "@scandic-hotels/design-system/Button" +import { Divider } from "@scandic-hotels/design-system/Divider" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import { Typography } from "@scandic-hotels/design-system/Typography" @@ -13,7 +14,6 @@ import { PaymentMethodEnum } from "@/constants/booking" import MySavedCards from "@/components/HotelReservation/MySavedCards" import PaymentOption from "@/components/HotelReservation/PaymentOption" import Modal from "@/components/Modal" -import Divider from "@/components/TempDesignSystem/Divider" import Checkbox from "@/components/TempDesignSystem/Form/Checkbox" import PaymentOptionsGroup from "../Payment/PaymentOptionsGroup" @@ -102,7 +102,7 @@ export default function ConfirmBooking({
- +

{intl.formatMessage({ diff --git a/apps/scandic-web/components/HotelReservation/EnterDetails/PriceChangeDialog/PriceChangeSummary/index.tsx b/apps/scandic-web/components/HotelReservation/EnterDetails/PriceChangeDialog/PriceChangeSummary/index.tsx index abc07cf52..cd6eb97ed 100644 --- a/apps/scandic-web/components/HotelReservation/EnterDetails/PriceChangeDialog/PriceChangeSummary/index.tsx +++ b/apps/scandic-web/components/HotelReservation/EnterDetails/PriceChangeDialog/PriceChangeSummary/index.tsx @@ -9,10 +9,10 @@ import { } from "react-aria-components" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import Button from "@/components/TempDesignSystem/Button" -import Divider from "@/components/TempDesignSystem/Divider" import Body from "@/components/TempDesignSystem/Text/Body" import Caption from "@/components/TempDesignSystem/Text/Caption" import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" @@ -168,7 +168,7 @@ export default function PriceChangeSummary({

))}
- + ) })} diff --git a/apps/scandic-web/components/HotelReservation/EnterDetails/Summary/UI/index.tsx b/apps/scandic-web/components/HotelReservation/EnterDetails/Summary/UI/index.tsx index ef41b7c68..ad805af80 100644 --- a/apps/scandic-web/components/HotelReservation/EnterDetails/Summary/UI/index.tsx +++ b/apps/scandic-web/components/HotelReservation/EnterDetails/Summary/UI/index.tsx @@ -5,6 +5,7 @@ import { useIntl } from "react-intl" import { useMediaQuery } from "usehooks-ts" import { Button } from "@scandic-hotels/design-system/Button" +import { Divider } from "@scandic-hotels/design-system/Divider" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import { dt } from "@/lib/dt" @@ -13,7 +14,6 @@ import BookingCodeChip from "@/components/BookingCodeChip" import PriceDetailsModal from "@/components/HotelReservation/PriceDetailsModal" import SignupPromoDesktop from "@/components/HotelReservation/SignupPromo/Desktop" import Modal from "@/components/Modal" -import Divider from "@/components/TempDesignSystem/Divider" import Body from "@/components/TempDesignSystem/Text/Body" import Caption from "@/components/TempDesignSystem/Text/Caption" import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" @@ -126,7 +126,7 @@ export default function SummaryUI({ color="CurrentColor" /> - + {rooms.map(({ room }, idx) => { const roomNumber = idx + 1 const adults = room.adults @@ -353,7 +353,7 @@ export default function SummaryUI({ nights={nights} /> - + ) })} @@ -422,7 +422,10 @@ export default function SummaryUI({ isBreakfastIncluded={isAllBreakfastIncluded} alignCenter /> - + {showSignupPromo && roomOneMemberPrice && !isMember ? ( - +
diff --git a/apps/scandic-web/components/HotelReservation/HotelCard/index.tsx b/apps/scandic-web/components/HotelReservation/HotelCard/index.tsx index 324d9efe5..5c3b32453 100644 --- a/apps/scandic-web/components/HotelReservation/HotelCard/index.tsx +++ b/apps/scandic-web/components/HotelReservation/HotelCard/index.tsx @@ -6,6 +6,7 @@ import { useRouter, useSearchParams } from "next/navigation" import { memo } from "react" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import HotelLogoIcon from "@scandic-hotels/design-system/Icons/HotelLogoIcon" import { Typography } from "@scandic-hotels/design-system/Typography" @@ -15,7 +16,6 @@ import { useHotelsMapStore } from "@/stores/hotels-map" import BookingCodeChip from "@/components/BookingCodeChip" import { FacilityToIcon } from "@/components/ContentType/HotelPage/data" import ImageGallery from "@/components/ImageGallery" -import Divider from "@/components/TempDesignSystem/Divider" import Link from "@/components/TempDesignSystem/Link" import Caption from "@/components/TempDesignSystem/Text/Caption" import { Tooltip } from "@/components/TempDesignSystem/Tooltip" @@ -133,7 +133,7 @@ function HotelCard({
- +
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/PriceDetails/PriceSummary/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/PriceDetails/PriceSummary/index.tsx index ab19fea8f..b30afe3e4 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/PriceDetails/PriceSummary/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/PriceDetails/PriceSummary/index.tsx @@ -1,9 +1,9 @@ import { Fragment } from "react" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import { Typography } from "@scandic-hotels/design-system/Typography" -import Divider from "@/components/TempDesignSystem/Divider" import { formatPrice } from "@/utils/numberFormatting" import PriceRow from "./PriceRow" @@ -42,7 +42,7 @@ export default function PriceSummary({ })} - + {items.map((item) => ( @@ -68,7 +68,7 @@ export default function PriceSummary({ })}`} /> )} - + ))} diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/PriceDetails/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/PriceDetails/index.tsx index afcf258f2..a32983f23 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/PriceDetails/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddAncillaryFlow/AddAncillaryFlowModal/PriceDetails/index.tsx @@ -1,6 +1,7 @@ import { useWatch } from "react-hook-form" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import { Typography } from "@scandic-hotels/design-system/Typography" import { @@ -9,7 +10,6 @@ import { useAddAncillaryStore, } from "@/stores/my-stay/add-ancillary-flow" -import Divider from "@/components/TempDesignSystem/Divider" import { formatPrice } from "@/utils/numberFormatting" import PriceSummary from "./PriceSummary" @@ -210,7 +210,7 @@ export default function PriceDetails({ )}

- + ) : null} {hasTotalPrice && ( @@ -224,13 +224,11 @@ export default function PriceDetails({

)} - {hasTotalPoints && hasTotalPrice && ( - - )} + {hasTotalPoints && hasTotalPrice && } {hasTotalPoints && (
- +

@@ -248,7 +246,7 @@ export default function PriceDetails({ )}

- + {isPriceDetailsOpen && currentStep === AncillaryStepEnum.confirmation && ( {selectedAncillary.points && (
- +

{intl.formatMessage( @@ -471,7 +471,7 @@ function BreakfastPriceList() { {breakfastData.nrOfPayingChildren > 0 && ( <>

- +
@@ -492,7 +492,7 @@ function BreakfastPriceList() { {breakfastData.nrOfFreeChildren > 0 && ( <>
- +
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx index 60902ccf1..1a33acb42 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/Ancillaries/AddedAncillaries/index.tsx @@ -1,11 +1,11 @@ import { Fragment } from "react" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import Accordion from "@/components/TempDesignSystem/Accordion" import AccordionItem from "@/components/TempDesignSystem/Accordion/AccordionItem" -import Divider from "@/components/TempDesignSystem/Divider" import Body from "@/components/TempDesignSystem/Text/Body" import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" import { formatPrice } from "@/utils/numberFormatting" @@ -174,7 +174,7 @@ export function AddedAncillaries({
- +
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Receipt/Specification/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Receipt/Specification/index.tsx index e905a0b61..91075cb22 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/Receipt/Specification/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/Receipt/Specification/index.tsx @@ -1,6 +1,6 @@ +import { Divider } from "@scandic-hotels/design-system/Divider" import { Typography } from "@scandic-hotels/design-system/Typography" -import Divider from "@/components/TempDesignSystem/Divider" import { getIntl } from "@/i18n" import styles from "./specification.module.css" @@ -146,7 +146,7 @@ export default async function Specification({ {/****** Ancillaries ********/} {booking.ancillaries.map((ancillary) => ( <> - +
@@ -197,7 +197,7 @@ export default async function Specification({ {/****** Breakfast ********/} {displayBreakfastPrice && ( <> - +
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Receipt/Total/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Receipt/Total/index.tsx index b80ec899e..edf5ebe46 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/Receipt/Total/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/Receipt/Total/index.tsx @@ -1,6 +1,6 @@ +import { Divider } from "@scandic-hotels/design-system/Divider" import { Typography } from "@scandic-hotels/design-system/Typography" -import Divider from "@/components/TempDesignSystem/Divider" import { getIntl } from "@/i18n" import styles from "./total.module.css" @@ -48,7 +48,7 @@ export default async function Total({ booking, currency }: TotalProps) {
- +
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/ChangeDates/Steps/Confirmation/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/ChangeDates/Steps/Confirmation/index.tsx index 57af899cc..a9929574a 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/ChangeDates/Steps/Confirmation/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Actions/NotCancelled/ManageStay/Actions/ChangeDates/Steps/Confirmation/index.tsx @@ -1,13 +1,14 @@ "use client" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" + import { dt } from "@/lib/dt" import { trpc } from "@/lib/trpc/client" import { useMyStayStore } from "@/stores/my-stay" import Modal from "@/components/HotelReservation/MyStay/Modal" import PriceContainer from "@/components/HotelReservation/MyStay/ReferenceCard/PriceContainer" -import Divider from "@/components/TempDesignSystem/Divider" import { toast } from "@/components/TempDesignSystem/Toasts" import useLang from "@/hooks/useLang" @@ -148,7 +149,7 @@ export default function Confirmation({ striked /> - +
- + {formatPrice(intl, 0, currencyCode)} diff --git a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Reference/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Reference/index.tsx index 0a08f7700..a4eace2d8 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Reference/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/Reference/index.tsx @@ -1,12 +1,11 @@ "use client" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import { Typography } from "@scandic-hotels/design-system/Typography" import { useMyStayStore } from "@/stores/my-stay" -import Divider from "@/components/TempDesignSystem/Divider" - import styles from "./reference.module.css" export default function Reference() { @@ -43,7 +42,7 @@ export default function Reference() {

- + ) } diff --git a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/index.tsx b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/index.tsx index 38d336df2..d6293af7e 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/index.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/ReferenceCard/index.tsx @@ -1,9 +1,9 @@ "use client" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import { Typography } from "@scandic-hotels/design-system/Typography" -import Divider from "@/components/TempDesignSystem/Divider" import { useGuaranteePaymentFailedToast } from "@/hooks/booking/useGuaranteePaymentFailedToast" import TotalPrice from "../Rooms/TotalPrice" @@ -29,7 +29,7 @@ export function ReferenceCard() { - +
diff --git a/apps/scandic-web/components/HotelReservation/MyStay/Rooms/MultiRoom/Room.tsx b/apps/scandic-web/components/HotelReservation/MyStay/Rooms/MultiRoom/Room.tsx index 44041d628..2054b255f 100644 --- a/apps/scandic-web/components/HotelReservation/MyStay/Rooms/MultiRoom/Room.tsx +++ b/apps/scandic-web/components/HotelReservation/MyStay/Rooms/MultiRoom/Room.tsx @@ -1,6 +1,7 @@ "use client" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import { IconButton } from "@scandic-hotels/design-system/IconButton" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import { Typography } from "@scandic-hotels/design-system/Typography" @@ -11,7 +12,6 @@ import { dt } from "@/lib/dt" import { IconForFeatureCode } from "@/components/HotelReservation/utils" import Image from "@/components/Image" import Modal from "@/components/Modal" -import Divider from "@/components/TempDesignSystem/Divider" import IconChip from "@/components/TempDesignSystem/IconChip" import useRateTitles from "@/hooks/booking/useRateTitles" import useLang from "@/hooks/useLang" @@ -315,7 +315,7 @@ export default function Room({ booking, roomNr, user }: RoomProps) {
)} - +

diff --git a/apps/scandic-web/components/HotelReservation/SelectHotel/FilterAndSortModal/index.tsx b/apps/scandic-web/components/HotelReservation/SelectHotel/FilterAndSortModal/index.tsx index 06fbd972e..3e1088a27 100644 --- a/apps/scandic-web/components/HotelReservation/SelectHotel/FilterAndSortModal/index.tsx +++ b/apps/scandic-web/components/HotelReservation/SelectHotel/FilterAndSortModal/index.tsx @@ -13,12 +13,12 @@ import { } from "react-aria-components" import { useIntl } from "react-intl" +import { Divider } from "@scandic-hotels/design-system/Divider" import { MaterialIcon } from "@scandic-hotels/design-system/Icons/MaterialIcon" import { useHotelFilterStore } from "@/stores/hotel-filters" import Button from "@/components/TempDesignSystem/Button" -import Divider from "@/components/TempDesignSystem/Divider" import Select from "@/components/TempDesignSystem/Select" import Footnote from "@/components/TempDesignSystem/Text/Footnote" import Subtitle from "@/components/TempDesignSystem/Text/Subtitle" @@ -156,7 +156,7 @@ export default function FilterAndSortModal({ />

- +
diff --git a/apps/scandic-web/components/HotelReservation/SelectRate/HotelInfoCard/index.tsx b/apps/scandic-web/components/HotelReservation/SelectRate/HotelInfoCard/index.tsx index 92599cb69..14c290ef7 100644 --- a/apps/scandic-web/components/HotelReservation/SelectRate/HotelInfoCard/index.tsx +++ b/apps/scandic-web/components/HotelReservation/SelectRate/HotelInfoCard/index.tsx @@ -1,10 +1,10 @@ +import { Divider } from "@scandic-hotels/design-system/Divider" import { Typography } from "@scandic-hotels/design-system/Typography" import { FacilityToIcon } from "@/components/ContentType/HotelPage/data" import ImageGallery from "@/components/ImageGallery" import SkeletonShimmer from "@/components/SkeletonShimmer" import Alert from "@/components/TempDesignSystem/Alert" -import Divider from "@/components/TempDesignSystem/Divider" import { getIntl } from "@/i18n" import { mapApiImagesToGalleryImages } from "@/utils/imageGallery" import { getSingleDecimal } from "@/utils/numberFormatting" @@ -71,7 +71,7 @@ export default async function HotelInfoCard({ hotel }: HotelInfoCardProps) { />
- +
{sortedFacilities?.map((facility) => ( @@ -131,7 +131,7 @@ export function HotelInfoCardSkeleton() {
- +
- + {rooms.map((room, idx) => { if (!room) { return null @@ -287,7 +287,7 @@ export default function Summary({
))}
- + ) })} @@ -355,7 +355,10 @@ export default function Summary({ )}
- + {!isMember && memberPrice ? ( diff --git a/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomsHeader/RoomPackageFilter/Form/index.tsx b/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomsHeader/RoomPackageFilter/Form/index.tsx index 5d6fa469b..5a2b304df 100644 --- a/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomsHeader/RoomPackageFilter/Form/index.tsx +++ b/apps/scandic-web/components/HotelReservation/SelectRate/RoomsContainer/Rooms/RoomsHeader/RoomPackageFilter/Form/index.tsx @@ -3,12 +3,12 @@ import { FormProvider, useForm } from "react-hook-form" import { useIntl } from "react-intl" import { Button } from "@scandic-hotels/design-system/Button" +import { Divider } from "@scandic-hotels/design-system/Divider" import { Typography } from "@scandic-hotels/design-system/Typography" import { trpc } from "@/lib/trpc/client" import { useRatesStore } from "@/stores/select-rate" -import Divider from "@/components/TempDesignSystem/Divider" import { useRoomContext } from "@/contexts/SelectRate/Room" import useLang from "@/hooks/useLang" @@ -75,7 +75,7 @@ export default function Form({ close }: { close: () => void }) {
- +
- +
diff --git a/packages/design-system/lib/components/Divider/Divider.stories.tsx b/packages/design-system/lib/components/Divider/Divider.stories.tsx new file mode 100644 index 000000000..e3b184262 --- /dev/null +++ b/packages/design-system/lib/components/Divider/Divider.stories.tsx @@ -0,0 +1,17 @@ +import type { Meta, StoryObj } from '@storybook/react' + +import { Divider } from './Divider' + +const meta: Meta = { + title: 'Components/Divider', + component: Divider, + argTypes: {}, +} + +export default meta + +type Story = StoryObj + +export const Default: Story = { + args: {}, +} diff --git a/packages/design-system/lib/components/Divider/Divider.tsx b/packages/design-system/lib/components/Divider/Divider.tsx new file mode 100644 index 000000000..4cc845a51 --- /dev/null +++ b/packages/design-system/lib/components/Divider/Divider.tsx @@ -0,0 +1,8 @@ +import { dividerVariants } from './variants' + +import type { DividerProps } from './types' + +export function Divider({ className, color, variant }: DividerProps) { + const classNames = dividerVariants({ className, color, variant }) + return
+} diff --git a/apps/scandic-web/components/TempDesignSystem/Divider/divider.module.css b/packages/design-system/lib/components/Divider/divider.module.css similarity index 53% rename from apps/scandic-web/components/TempDesignSystem/Divider/divider.module.css rename to packages/design-system/lib/components/Divider/divider.module.css index 2339d7352..626deb00b 100644 --- a/apps/scandic-web/components/TempDesignSystem/Divider/divider.module.css +++ b/packages/design-system/lib/components/Divider/divider.module.css @@ -25,42 +25,14 @@ background-color: var(--Primary-Light-On-Surface-Divider); } -.beige { - background-color: var(--Scandic-Beige-20); -} - .white { background-color: var(--UI-Opacity-White-100); } -.subtle { - background-color: var(--Base-Border-Subtle); -} - -.primaryLightSubtle { - background-color: var(--Primary-Light-On-Surface-Divider-subtle); -} - -.baseSurfaceSubtleNormal { - background-color: var(--Base-Surface-Subtle-Normal); -} - -.borderDividerSubtle { +.Border-Divider-Subtle { background-color: var(--Border-Divider-Subtle); } -.opacity100 { - opacity: 1; -} - -.opacity8 { - opacity: 0.08; -} - -.baseSurfaceSubtleHover { - background-color: var(--Base-Surface-Subtle-Hover); -} - .Border-Divider-Default { background-color: var(--Border-Divider-Default); } diff --git a/packages/design-system/lib/components/Divider/index.ts b/packages/design-system/lib/components/Divider/index.ts new file mode 100644 index 000000000..465ccc7fd --- /dev/null +++ b/packages/design-system/lib/components/Divider/index.ts @@ -0,0 +1 @@ +export { Divider } from './Divider' diff --git a/packages/design-system/lib/components/Divider/types.ts b/packages/design-system/lib/components/Divider/types.ts new file mode 100644 index 000000000..520d21261 --- /dev/null +++ b/packages/design-system/lib/components/Divider/types.ts @@ -0,0 +1,7 @@ +import type { VariantProps } from 'class-variance-authority' + +import type { dividerVariants } from './variants' + +export interface DividerProps + extends Omit, 'color'>, + VariantProps {} diff --git a/packages/design-system/lib/components/Divider/variants.ts b/packages/design-system/lib/components/Divider/variants.ts new file mode 100644 index 000000000..311114e81 --- /dev/null +++ b/packages/design-system/lib/components/Divider/variants.ts @@ -0,0 +1,24 @@ +import { cva } from 'class-variance-authority' + +import styles from './divider.module.css' + +export const dividerVariants = cva(styles.divider, { + variants: { + color: { + burgundy: styles.burgundy, + pale: styles.pale, + peach: styles.peach, + white: styles.white, + 'Border/Divider/Default': styles['Border-Divider-Default'], + 'Border/Divider/Subtle': styles['Border-Divider-Subtle'], + }, + variant: { + horizontal: styles.horizontal, + vertical: styles.vertical, + }, + }, + defaultVariants: { + color: 'Border/Divider/Default', + variant: 'horizontal', + }, +}) diff --git a/packages/design-system/package.json b/packages/design-system/package.json index 13f3eceb3..560674c32 100644 --- a/packages/design-system/package.json +++ b/packages/design-system/package.json @@ -9,6 +9,7 @@ "./ChipButton": "./dist/components/ChipButton/index.js", "./ChipLink": "./dist/components/ChipLink/index.js", "./Chips": "./dist/components/Chips/index.js", + "./Divider": "./dist/components/Divider/index.js", "./Select": "./dist/components/Select/index.js", "./Typography": "./dist/components/Typography/index.js", "./RegularRateCard": "./dist/components/RateCard/Regular/index.js",