diff --git a/apps/console/src/pages/organizations/cookie-banners/CookieBannerLayout.tsx b/apps/console/src/pages/organizations/cookie-banners/CookieBannersLayout.tsx similarity index 100% rename from apps/console/src/pages/organizations/cookie-banners/CookieBannerLayout.tsx rename to apps/console/src/pages/organizations/cookie-banners/CookieBannersLayout.tsx diff --git a/apps/console/src/pages/organizations/cookie-banners/configuration/CookieBannerConfigLayout.tsx b/apps/console/src/pages/organizations/cookie-banners/configuration/CookieBannerConfigLayout.tsx index dee11b9a9..1e894b005 100644 --- a/apps/console/src/pages/organizations/cookie-banners/configuration/CookieBannerConfigLayout.tsx +++ b/apps/console/src/pages/organizations/cookie-banners/configuration/CookieBannerConfigLayout.tsx @@ -18,10 +18,10 @@ import { Badge, Breadcrumb, Button, - IconImage, IconListStack, IconPageTextLine, IconSettingsGear2, + IconSquareBehindSquare2, PageHeader, TabLink, Tabs, @@ -190,7 +190,31 @@ export default function CookieBannerConfigLayout({ queryRef }: CookieBannerConfi )} )} - description={banner.origin} + description={( + + + {__("Origin")} + {" "} + {banner.origin} + + ยท + + {__("ID")} + {" "} + {banner.id} + + + + )} > {banner.state === "ACTIVE" ? __("Active") : __("Inactive")} @@ -220,11 +244,7 @@ export default function CookieBannerConfigLayout({ queryRef }: CookieBannerConfi - {__("Snippet")} - - - - {__("Theme")} + {__("JS / CSS snippets")} diff --git a/apps/console/src/pages/organizations/cookie-banners/configuration/cookies/_components/CategorySection.tsx b/apps/console/src/pages/organizations/cookie-banners/configuration/cookies/_components/CategorySection.tsx index ebd77dbf4..89ae979a4 100644 --- a/apps/console/src/pages/organizations/cookie-banners/configuration/cookies/_components/CategorySection.tsx +++ b/apps/console/src/pages/organizations/cookie-banners/configuration/cookies/_components/CategorySection.tsx @@ -274,9 +274,20 @@ export function CategorySection({ categoryKey }: CategorySectionProps) { )} {!isEditingCategory && ( -

- {category.description} -

+ <> +

+ {category.description} +

+

+ {__("Block elements until consent is given:")} + {" "} + + data-cookie-consent=" + {category.name.toLowerCase()} + " + +

+ )} diff --git a/apps/console/src/pages/organizations/cookie-banners/configuration/snippet/CookieBannerSnippetPage.tsx b/apps/console/src/pages/organizations/cookie-banners/configuration/snippet/CookieBannerSnippetPage.tsx index de854d150..f084981ae 100644 --- a/apps/console/src/pages/organizations/cookie-banners/configuration/snippet/CookieBannerSnippetPage.tsx +++ b/apps/console/src/pages/organizations/cookie-banners/configuration/snippet/CookieBannerSnippetPage.tsx @@ -16,6 +16,8 @@ import { useTranslate } from "@probo/i18n"; import { Card } from "@probo/ui"; import type { ReactNode } from "react"; +import { ThemePreview } from "#/pages/organizations/cookie-banners/configuration/theme/_components/ThemePreview"; + import { CodeSnippets } from "./_components/CodeSnippets"; export default function CookieBannerSnippetPage() { @@ -33,6 +35,14 @@ export default function CookieBannerSnippetPage() { + + + + diff --git a/apps/console/src/pages/organizations/cookie-banners/overview/CookieBannerOverviewPage.tsx b/apps/console/src/pages/organizations/cookie-banners/overview/CookieBannersOverviewPage.tsx similarity index 86% rename from apps/console/src/pages/organizations/cookie-banners/overview/CookieBannerOverviewPage.tsx rename to apps/console/src/pages/organizations/cookie-banners/overview/CookieBannersOverviewPage.tsx index 464816a4d..8ec1d1125 100644 --- a/apps/console/src/pages/organizations/cookie-banners/overview/CookieBannerOverviewPage.tsx +++ b/apps/console/src/pages/organizations/cookie-banners/overview/CookieBannersOverviewPage.tsx @@ -18,13 +18,13 @@ import { type PreloadedQuery, usePreloadedQuery } from "react-relay"; import { Link } from "react-router"; import { graphql } from "relay-runtime"; -import type { CookieBannerOverviewPageQuery } from "#/__generated__/core/CookieBannerOverviewPageQuery.graphql"; +import type { CookieBannersOverviewPageQuery } from "#/__generated__/core/CookieBannersOverviewPageQuery.graphql"; import { useOrganizationId } from "#/hooks/useOrganizationId"; import { CookieBannerEmptyState } from "./_components/CookieBannerEmptyState"; -export const cookieBannerOverviewPageQuery = graphql` - query CookieBannerOverviewPageQuery($organizationId: ID!) { +export const cookieBannersOverviewPageQuery = graphql` + query CookieBannersOverviewPageQuery($organizationId: ID!) { organization: node(id: $organizationId) { __typename ... on Organization { @@ -44,15 +44,15 @@ export const cookieBannerOverviewPageQuery = graphql` } `; -interface CookieBannerOverviewPageProps { - queryRef: PreloadedQuery; +interface CookieBannersOverviewPageProps { + queryRef: PreloadedQuery; } -export default function CookieBannerOverviewPage({ queryRef }: CookieBannerOverviewPageProps) { +export function CookieBannersOverviewPage({ queryRef }: CookieBannersOverviewPageProps) { const { __ } = useTranslate(); const organizationId = useOrganizationId(); - const { organization } = usePreloadedQuery(cookieBannerOverviewPageQuery, queryRef); + const { organization } = usePreloadedQuery(cookieBannersOverviewPageQuery, queryRef); if (organization.__typename !== "Organization") { throw new Error("invalid type for node"); } diff --git a/apps/console/src/pages/organizations/cookie-banners/overview/CookieBannerOverviewPageLoader.tsx b/apps/console/src/pages/organizations/cookie-banners/overview/CookieBannersOverviewPageLoader.tsx similarity index 74% rename from apps/console/src/pages/organizations/cookie-banners/overview/CookieBannerOverviewPageLoader.tsx rename to apps/console/src/pages/organizations/cookie-banners/overview/CookieBannersOverviewPageLoader.tsx index da9f1d209..a47df303c 100644 --- a/apps/console/src/pages/organizations/cookie-banners/overview/CookieBannerOverviewPageLoader.tsx +++ b/apps/console/src/pages/organizations/cookie-banners/overview/CookieBannersOverviewPageLoader.tsx @@ -15,15 +15,15 @@ import { Suspense, useEffect } from "react"; import { useQueryLoader } from "react-relay"; -import type { CookieBannerOverviewPageQuery } from "#/__generated__/core/CookieBannerOverviewPageQuery.graphql"; +import type { CookieBannersOverviewPageQuery } from "#/__generated__/core/CookieBannersOverviewPageQuery.graphql"; import { PageSkeleton } from "#/components/skeletons/PageSkeleton"; import { useOrganizationId } from "#/hooks/useOrganizationId"; -import CookieBannerOverviewPage, { cookieBannerOverviewPageQuery } from "./CookieBannerOverviewPage"; +import { CookieBannersOverviewPage, cookieBannersOverviewPageQuery } from "./CookieBannersOverviewPage"; -export default function CookieBannerOverviewPageLoader() { +export default function CookieBannersOverviewPageLoader() { const organizationId = useOrganizationId(); - const [queryRef, loadQuery] = useQueryLoader(cookieBannerOverviewPageQuery); + const [queryRef, loadQuery] = useQueryLoader(cookieBannersOverviewPageQuery); useEffect(() => { loadQuery({ organizationId }); @@ -35,7 +35,7 @@ export default function CookieBannerOverviewPageLoader() { return ( }> - + ); } diff --git a/apps/console/src/pages/organizations/cookie-banners/routes.ts b/apps/console/src/pages/organizations/cookie-banners/routes.ts index c3c01b15d..f595a53d7 100644 --- a/apps/console/src/pages/organizations/cookie-banners/routes.ts +++ b/apps/console/src/pages/organizations/cookie-banners/routes.ts @@ -24,12 +24,12 @@ export const cookieBannerRoutes = [ { path: "cookie-banners", Fallback: PageSkeleton, - Component: lazy(() => import("#/pages/organizations/cookie-banners/CookieBannerLayout")), + Component: lazy(() => import("#/pages/organizations/cookie-banners/CookieBannersLayout")), children: [ { index: true, Fallback: LinkCardSkeleton, - Component: lazy(() => import("#/pages/organizations/cookie-banners/overview/CookieBannerOverviewPageLoader")), + Component: lazy(() => import("#/pages/organizations/cookie-banners/overview/CookieBannersOverviewPageLoader")), }, { path: "new", @@ -65,11 +65,6 @@ export const cookieBannerRoutes = [ Fallback: LinkCardSkeleton, Component: lazy(() => import("#/pages/organizations/cookie-banners/configuration/snippet/CookieBannerSnippetPage")), }, - { - path: "theme", - Fallback: LinkCardSkeleton, - Component: lazy(() => import("#/pages/organizations/cookie-banners/configuration/theme/CookieBannerThemePage")), - }, ], }, ] satisfies AppRoute[]; diff --git a/packages/ui/src/Molecules/PageHeader/PageHeader.tsx b/packages/ui/src/Molecules/PageHeader/PageHeader.tsx index 04c8f15c6..d7eed75fc 100644 --- a/packages/ui/src/Molecules/PageHeader/PageHeader.tsx +++ b/packages/ui/src/Molecules/PageHeader/PageHeader.tsx @@ -16,7 +16,7 @@ import type { PropsWithChildren, ReactNode } from "react"; type Props = PropsWithChildren<{ title: ReactNode; - description?: string | null; + description?: ReactNode; }>; export function PageHeader({ title, description, children }: Props) {