diff --git a/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx b/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx index e28ff5c69..4168c4d37 100644 --- a/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx +++ b/apps/scandic-web/app/[lang]/(live)/(protected)/my-pages/@breadcrumbs/[...path]/page.tsx @@ -1,11 +1,12 @@ import { Suspense } from "react" -import Breadcrumbs from "@/components/Breadcrumbs" -import BreadcrumbsSkeleton from "@/components/TempDesignSystem/Breadcrumbs/BreadcrumbsSkeleton" +import { BreadcrumbsSkeleton } from "@scandic-hotels/design-system/Breadcrumbs" + +import { Breadcrumbs } from "@/components/Breadcrumbs" export default function AllBreadcrumbs() { return ( - }> + }> ) diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/campaign_overview_page/[uid]/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/campaign_overview_page/[uid]/page.tsx index eae837fe6..dfde73b46 100644 --- a/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/campaign_overview_page/[uid]/page.tsx +++ b/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/campaign_overview_page/[uid]/page.tsx @@ -1,9 +1,11 @@ import { Suspense } from "react" -import Breadcrumbs from "@/components/Breadcrumbs" -import BreadcrumbsSkeleton from "@/components/TempDesignSystem/Breadcrumbs/BreadcrumbsSkeleton" +import { + type BreadcrumbsProps, + BreadcrumbsSkeleton, +} from "@scandic-hotels/design-system/Breadcrumbs" -import type { BreadcrumbsProps } from "@/components/TempDesignSystem/Breadcrumbs/breadcrumbs" +import { Breadcrumbs } from "@/components/Breadcrumbs" export default function CampaignOverviewPageBreadcrumbs() { const variants: Pick = { diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/campaign_page/[uid]/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/campaign_page/[uid]/page.tsx index af1ba8270..c1f05282c 100644 --- a/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/campaign_page/[uid]/page.tsx +++ b/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/campaign_page/[uid]/page.tsx @@ -1,9 +1,11 @@ import { Suspense } from "react" -import Breadcrumbs from "@/components/Breadcrumbs" -import BreadcrumbsSkeleton from "@/components/TempDesignSystem/Breadcrumbs/BreadcrumbsSkeleton" +import { + type BreadcrumbsProps, + BreadcrumbsSkeleton, +} from "@scandic-hotels/design-system/Breadcrumbs" -import type { BreadcrumbsProps } from "@/components/TempDesignSystem/Breadcrumbs/breadcrumbs" +import { Breadcrumbs } from "@/components/Breadcrumbs" export default function CampaignPageBreadcrumbs() { const variants: Pick = { diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/loyalty_page/[uid]/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/loyalty_page/[uid]/page.tsx index 72be8de1a..489bfb77f 100644 --- a/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/loyalty_page/[uid]/page.tsx +++ b/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/loyalty_page/[uid]/page.tsx @@ -1,10 +1,12 @@ import { Suspense } from "react" -import Breadcrumbs from "@/components/Breadcrumbs" -import BreadcrumbsSkeleton from "@/components/TempDesignSystem/Breadcrumbs/BreadcrumbsSkeleton" -import { isLoggedInUser } from "@/utils/isLoggedInUser" +import { + type BreadcrumbsProps, + BreadcrumbsSkeleton, +} from "@scandic-hotels/design-system/Breadcrumbs" -import type { BreadcrumbsProps } from "@/components/TempDesignSystem/Breadcrumbs/breadcrumbs" +import { Breadcrumbs } from "@/components/Breadcrumbs" +import { isLoggedInUser } from "@/utils/isLoggedInUser" export default async function LoyaltyPageBreadcrumbs() { const isUserLoggedIn = await isLoggedInUser() diff --git a/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/promo_campaign_page/[uid]/page.tsx b/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/promo_campaign_page/[uid]/page.tsx index 0a6a269ac..155cc0b90 100644 --- a/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/promo_campaign_page/[uid]/page.tsx +++ b/apps/scandic-web/app/[lang]/(live)/(public)/(contentTypes)/@breadcrumbs/promo_campaign_page/[uid]/page.tsx @@ -1,9 +1,11 @@ import { Suspense } from "react" -import Breadcrumbs from "@/components/Breadcrumbs" -import BreadcrumbsSkeleton from "@/components/TempDesignSystem/Breadcrumbs/BreadcrumbsSkeleton" +import { + type BreadcrumbsProps, + BreadcrumbsSkeleton, +} from "@scandic-hotels/design-system/Breadcrumbs" -import type { BreadcrumbsProps } from "@/components/TempDesignSystem/Breadcrumbs/breadcrumbs" +import { Breadcrumbs } from "@/components/Breadcrumbs" export default function PromoCampaignPageBreadcrumbs() { const variants: Pick = { diff --git a/apps/scandic-web/components/Breadcrumbs/index.tsx b/apps/scandic-web/components/Breadcrumbs/index.tsx index 12bd931e9..5c49f84e4 100644 --- a/apps/scandic-web/components/Breadcrumbs/index.tsx +++ b/apps/scandic-web/components/Breadcrumbs/index.tsx @@ -1,15 +1,18 @@ +import { + Breadcrumbs as BreadcrumbsComponent, + type BreadcrumbsProps, +} from "@scandic-hotels/design-system/Breadcrumbs" + import { serverClient } from "@/lib/trpc/server" -import BreadcrumbsComp from "@/components/TempDesignSystem/Breadcrumbs" import { generateBreadcrumbsSchema } from "@/utils/jsonSchemas" -import type { BreadcrumbsProps } from "@/components/TempDesignSystem/Breadcrumbs/breadcrumbs" - -interface Props extends Omit { +export async function Breadcrumbs({ + subpageTitle, + ...props +}: Omit & { subpageTitle?: string -} - -export default async function Breadcrumbs({ subpageTitle, ...props }: Props) { +}) { const caller = await serverClient() const breadcrumbs = await caller.contentstack.breadcrumbs.get() if (!breadcrumbs?.length) { @@ -30,7 +33,7 @@ export default async function Breadcrumbs({ subpageTitle, ...props }: Props) { __html: JSON.stringify(jsonSchema.jsonLd), }} /> - + ) } diff --git a/apps/scandic-web/components/ContentType/CollectionPage/index.tsx b/apps/scandic-web/components/ContentType/CollectionPage/index.tsx index 6a1d6eff1..0be6e7f7e 100644 --- a/apps/scandic-web/components/ContentType/CollectionPage/index.tsx +++ b/apps/scandic-web/components/ContentType/CollectionPage/index.tsx @@ -1,6 +1,10 @@ import { cx } from "class-variance-authority" import { Suspense } from "react" +import { + type BreadcrumbsProps, + BreadcrumbsSkeleton, +} from "@scandic-hotels/design-system/Breadcrumbs" import ButtonLink from "@scandic-hotels/design-system/ButtonLink" import Image from "@scandic-hotels/design-system/Image" import { Typography } from "@scandic-hotels/design-system/Typography" @@ -9,17 +13,14 @@ import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK" import { serverClient } from "@/lib/trpc/server" import Blocks from "@/components/Blocks" -import Breadcrumbs from "@/components/Breadcrumbs" +import { Breadcrumbs } from "@/components/Breadcrumbs" import HeaderDynamicContent from "@/components/Headers/DynamicContent" import { HeroVideo } from "@/components/HeroVideo" import MeetingPackageWidget from "@/components/MeetingPackageWidget" -import BreadcrumbsSkeleton from "@/components/TempDesignSystem/Breadcrumbs/BreadcrumbsSkeleton" import LinkChips from "@/components/TempDesignSystem/LinkChips" import styles from "./collectionPage.module.css" -import type { BreadcrumbsProps } from "@/components/TempDesignSystem/Breadcrumbs/breadcrumbs" - export async function CollectionPage() { const caller = await serverClient() const collectionPageRes = await caller.contentstack.collectionPage.get() diff --git a/apps/scandic-web/components/ContentType/ContentPage/index.tsx b/apps/scandic-web/components/ContentType/ContentPage/index.tsx index cd77cb925..e6a0e1de6 100644 --- a/apps/scandic-web/components/ContentType/ContentPage/index.tsx +++ b/apps/scandic-web/components/ContentType/ContentPage/index.tsx @@ -1,5 +1,6 @@ import { Suspense } from "react" +import { BreadcrumbsSkeleton } from "@scandic-hotels/design-system/Breadcrumbs" import ButtonLink from "@scandic-hotels/design-system/ButtonLink" import { Typography } from "@scandic-hotels/design-system/Typography" import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK" @@ -7,14 +8,13 @@ import { TrackingSDK } from "@scandic-hotels/tracking/TrackingSDK" import { serverClient } from "@/lib/trpc/server" import Blocks from "@/components/Blocks" -import Breadcrumbs from "@/components/Breadcrumbs" +import { Breadcrumbs } from "@/components/Breadcrumbs" import HeaderDynamicContent from "@/components/Headers/DynamicContent" import Hero from "@/components/Hero" import { HeroVideo } from "@/components/HeroVideo" import Sidebar from "@/components/Sidebar" import SidebarSkeleton from "@/components/Sidebar/SidebarSkeleton" import StickyMeetingPackageWidget from "@/components/StickyMeetingPackageWidget" -import BreadcrumbsSkeleton from "@/components/TempDesignSystem/Breadcrumbs/BreadcrumbsSkeleton" import LinkChips from "@/components/TempDesignSystem/LinkChips" import styles from "./contentPage.module.css" diff --git a/apps/scandic-web/components/ContentType/DestinationPage/DestinationCityPage/DestinationCityPageSkeleton.tsx b/apps/scandic-web/components/ContentType/DestinationPage/DestinationCityPage/DestinationCityPageSkeleton.tsx index ca2a9890b..5403829f9 100644 --- a/apps/scandic-web/components/ContentType/DestinationPage/DestinationCityPage/DestinationCityPageSkeleton.tsx +++ b/apps/scandic-web/components/ContentType/DestinationPage/DestinationCityPage/DestinationCityPageSkeleton.tsx @@ -1,9 +1,8 @@ "use client" +import { BreadcrumbsSkeleton } from "@scandic-hotels/design-system/Breadcrumbs" import SkeletonShimmer from "@scandic-hotels/design-system/SkeletonShimmer" -import BreadcrumbsSkeleton from "@/components/TempDesignSystem/Breadcrumbs/BreadcrumbsSkeleton" - import HotelListingSkeleton from "../DestinationListing/HotelListing/HotelListingSkeleton" import ExperienceListSkeleton from "../ExperienceList/ExperienceListSkeleton" import SidebarContentWrapperSkeleton from "../SidebarContentWrapper/SidebarContentWrapperSkeleton" @@ -19,7 +18,9 @@ export default function DestinationCityPageSkeleton() {
- +
+ +