diff --git a/content_management_system/src/api/page/content-types/page/schema.json b/content_management_system/src/api/page/content-types/page/schema.json index d633ec74..4c9ee763 100644 --- a/content_management_system/src/api/page/content-types/page/schema.json +++ b/content_management_system/src/api/page/content-types/page/schema.json @@ -47,7 +47,10 @@ "block.header-with-q-rcode", "block.columns-text", "block.centered-title", - "block.tabs" + "block.tabs-simple-text", + "block.tabs-push-grey-cta", + "block.tabs-little-list", + "block.tabs-image-text" ] }, "seo": { diff --git a/content_management_system/src/components/block/breadcrumb.json b/content_management_system/src/components/block/breadcrumb.json index 515a0769..825c00f8 100644 --- a/content_management_system/src/components/block/breadcrumb.json +++ b/content_management_system/src/components/block/breadcrumb.json @@ -5,10 +5,5 @@ "description": "" }, "options": {}, - "attributes": { - "isUnderHeader": { - "type": "boolean", - "default": false - } - } + "attributes": {} } diff --git a/content_management_system/src/components/block/image-text.json b/content_management_system/src/components/block/image-text.json index d64e7966..281ff4d4 100644 --- a/content_management_system/src/components/block/image-text.json +++ b/content_management_system/src/components/block/image-text.json @@ -14,7 +14,9 @@ "type": "media", "multiple": false, "required": true, - "allowedTypes": ["images"] + "allowedTypes": [ + "images" + ] }, "isImageRight": { "type": "boolean", diff --git a/content_management_system/src/components/block/tab.json b/content_management_system/src/components/block/tab-image-text.json similarity index 72% rename from content_management_system/src/components/block/tab.json rename to content_management_system/src/components/block/tab-image-text.json index b047bf98..1c563d5d 100644 --- a/content_management_system/src/components/block/tab.json +++ b/content_management_system/src/components/block/tab-image-text.json @@ -1,7 +1,7 @@ { - "collectionName": "components_block_tab", + "collectionName": "components_block_tab_image_texts", "info": { - "displayName": "tab" + "displayName": "TabImageText" }, "options": {}, "attributes": { diff --git a/content_management_system/src/components/block/tab-little-list.json b/content_management_system/src/components/block/tab-little-list.json new file mode 100644 index 00000000..df627b13 --- /dev/null +++ b/content_management_system/src/components/block/tab-little-list.json @@ -0,0 +1,18 @@ +{ + "collectionName": "components_block_tab_little_lists", + "info": { + "displayName": "TabLittleList" + }, + "options": {}, + "attributes": { + "title": { + "type": "string", + "required": true + }, + "block": { + "type": "component", + "repeatable": false, + "component": "block.little-list" + } + } +} diff --git a/content_management_system/src/components/block/tab-push-grey-cta.json b/content_management_system/src/components/block/tab-push-grey-cta.json new file mode 100644 index 00000000..c257bc20 --- /dev/null +++ b/content_management_system/src/components/block/tab-push-grey-cta.json @@ -0,0 +1,18 @@ +{ + "collectionName": "components_block_tab_push_grey_ctas", + "info": { + "displayName": "TabPushGreyCTA" + }, + "options": {}, + "attributes": { + "title": { + "type": "string", + "required": true + }, + "block": { + "type": "component", + "repeatable": false, + "component": "block.double-push-cta" + } + } +} diff --git a/content_management_system/src/components/block/tab-simple-text.json b/content_management_system/src/components/block/tab-simple-text.json new file mode 100644 index 00000000..933ce76f --- /dev/null +++ b/content_management_system/src/components/block/tab-simple-text.json @@ -0,0 +1,18 @@ +{ + "collectionName": "components_block_tab_simple_texts", + "info": { + "displayName": "TabSimpleText" + }, + "options": {}, + "attributes": { + "title": { + "type": "string", + "required": true + }, + "block": { + "type": "component", + "repeatable": false, + "component": "block.simple-text-v2" + } + } +} diff --git a/content_management_system/src/components/block/tabs-image-text.json b/content_management_system/src/components/block/tabs-image-text.json new file mode 100644 index 00000000..ebabdd34 --- /dev/null +++ b/content_management_system/src/components/block/tabs-image-text.json @@ -0,0 +1,15 @@ +{ + "collectionName": "components_block_tabs_image_texts", + "info": { + "displayName": "TabsImageText" + }, + "options": {}, + "attributes": { + "tab": { + "displayName": "TabLittleList", + "type": "component", + "repeatable": true, + "component": "block.tab-image-text" + } + } +} diff --git a/content_management_system/src/components/block/tabs-little-list.json b/content_management_system/src/components/block/tabs-little-list.json new file mode 100644 index 00000000..c4c900f3 --- /dev/null +++ b/content_management_system/src/components/block/tabs-little-list.json @@ -0,0 +1,15 @@ +{ + "collectionName": "components_block_tabs_little_lists", + "info": { + "displayName": "TabsLittleList" + }, + "options": {}, + "attributes": { + "tab": { + "displayName": "TabLittleList", + "type": "component", + "repeatable": true, + "component": "block.tab-little-list" + } + } +} diff --git a/content_management_system/src/components/block/tabs-push-grey-cta.json b/content_management_system/src/components/block/tabs-push-grey-cta.json new file mode 100644 index 00000000..cfab5c21 --- /dev/null +++ b/content_management_system/src/components/block/tabs-push-grey-cta.json @@ -0,0 +1,16 @@ +{ + "collectionName": "components_block_tabs_push_grey_ctas", + "info": { + "displayName": "TabsPushGreyCTA", + "description": "" + }, + "options": {}, + "attributes": { + "tab": { + "displayName": "TabPushGreyCTA", + "type": "component", + "repeatable": true, + "component": "block.tab-push-grey-cta" + } + } +} diff --git a/content_management_system/src/components/block/tabs-simple-text.json b/content_management_system/src/components/block/tabs-simple-text.json new file mode 100644 index 00000000..d5e4de19 --- /dev/null +++ b/content_management_system/src/components/block/tabs-simple-text.json @@ -0,0 +1,15 @@ +{ + "collectionName": "components_block_tabs_simple_texts", + "info": { + "displayName": "TabsSimpleText" + }, + "options": {}, + "attributes": { + "tab": { + "displayName": "TabSimpleText", + "type": "component", + "repeatable": true, + "component": "block.tab-simple-text" + } + } +} diff --git a/content_management_system/src/components/block/tabs.json b/content_management_system/src/components/block/tabs.json deleted file mode 100644 index 304eca48..00000000 --- a/content_management_system/src/components/block/tabs.json +++ /dev/null @@ -1,16 +0,0 @@ -{ - "collectionName": "components_block_tabs", - "info": { - "displayName": "Tabs", - "description": "" - }, - "options": {}, - "attributes": { - "tab": { - "displayName": "tab", - "type": "component", - "repeatable": true, - "component": "block.tab" - } - } -} diff --git a/content_management_system/types/generated/components.d.ts b/content_management_system/types/generated/components.d.ts index 25296273..29a1d8a7 100644 --- a/content_management_system/types/generated/components.d.ts +++ b/content_management_system/types/generated/components.d.ts @@ -6,9 +6,7 @@ export interface BlockBreadcrumb extends Schema.Component { displayName: 'Breadcrumbs'; description: ''; }; - attributes: { - isUnderHeader: Attribute.Boolean & Attribute.DefaultTo; - }; + attributes: {}; } export interface BlockCenteredText extends Schema.Component { @@ -426,10 +424,10 @@ export interface BlockSpace extends Schema.Component { }; } -export interface BlockTab extends Schema.Component { - collectionName: 'components_block_tab'; +export interface BlockTabImageText extends Schema.Component { + collectionName: 'components_block_tab_image_texts'; info: { - displayName: 'tab'; + displayName: 'TabImageText'; }; attributes: { title: Attribute.String & Attribute.Required; @@ -437,14 +435,77 @@ export interface BlockTab extends Schema.Component { }; } -export interface BlockTabs extends Schema.Component { - collectionName: 'components_block_tabs'; +export interface BlockTabLittleList extends Schema.Component { + collectionName: 'components_block_tab_little_lists'; + info: { + displayName: 'TabLittleList'; + }; + attributes: { + title: Attribute.String & Attribute.Required; + block: Attribute.Component<'block.little-list'>; + }; +} + +export interface BlockTabPushGreyCta extends Schema.Component { + collectionName: 'components_block_tab_push_grey_ctas'; + info: { + displayName: 'TabPushGreyCTA'; + }; + attributes: { + title: Attribute.String & Attribute.Required; + block: Attribute.Component<'block.double-push-cta'>; + }; +} + +export interface BlockTabSimpleText extends Schema.Component { + collectionName: 'components_block_tab_simple_texts'; + info: { + displayName: 'TabSimpleText'; + }; + attributes: { + title: Attribute.String & Attribute.Required; + block: Attribute.Component<'block.simple-text-v2'>; + }; +} + +export interface BlockTabsImageText extends Schema.Component { + collectionName: 'components_block_tabs_image_texts'; info: { - displayName: 'Tabs'; + displayName: 'TabsImageText'; + }; + attributes: { + tab: Attribute.Component<'block.tab-image-text', true>; + }; +} + +export interface BlockTabsLittleList extends Schema.Component { + collectionName: 'components_block_tabs_little_lists'; + info: { + displayName: 'TabsLittleList'; + }; + attributes: { + tab: Attribute.Component<'block.tab-little-list', true>; + }; +} + +export interface BlockTabsPushGreyCta extends Schema.Component { + collectionName: 'components_block_tabs_push_grey_ctas'; + info: { + displayName: 'TabsPushGreyCTA'; description: ''; }; attributes: { - tab: Attribute.Component<'block.tab', true>; + tab: Attribute.Component<'block.tab-push-grey-cta', true>; + }; +} + +export interface BlockTabsSimpleText extends Schema.Component { + collectionName: 'components_block_tabs_simple_texts'; + info: { + displayName: 'TabsSimpleText'; + }; + attributes: { + tab: Attribute.Component<'block.tab-simple-text', true>; }; } @@ -1143,8 +1204,14 @@ declare module '@strapi/types' { 'block.simple-text-v2': BlockSimpleTextV2; 'block.social-media': BlockSocialMedia; 'block.space': BlockSpace; - 'block.tab': BlockTab; - 'block.tabs': BlockTabs; + 'block.tab-image-text': BlockTabImageText; + 'block.tab-little-list': BlockTabLittleList; + 'block.tab-push-grey-cta': BlockTabPushGreyCta; + 'block.tab-simple-text': BlockTabSimpleText; + 'block.tabs-image-text': BlockTabsImageText; + 'block.tabs-little-list': BlockTabsLittleList; + 'block.tabs-push-grey-cta': BlockTabsPushGreyCta; + 'block.tabs-simple-text': BlockTabsSimpleText; 'block.vertical-carousel': BlockVerticalCarousel; 'block.video': BlockVideo; 'common.detailed-logo': CommonDetailedLogo; diff --git a/content_management_system/types/generated/contentTypes.d.ts b/content_management_system/types/generated/contentTypes.d.ts index d1d20d70..c26d9a25 100644 --- a/content_management_system/types/generated/contentTypes.d.ts +++ b/content_management_system/types/generated/contentTypes.d.ts @@ -1289,7 +1289,10 @@ export interface ApiPagePage extends Schema.CollectionType { 'block.header-with-q-rcode', 'block.columns-text', 'block.centered-title', - 'block.tabs' + 'block.tabs-simple-text', + 'block.tabs-push-grey-cta', + 'block.tabs-little-list', + 'block.tabs-image-text' ] >; seo: Attribute.Component<'shared.seo'>; diff --git a/public_website/src/lib/BlockRenderer.tsx b/public_website/src/lib/BlockRenderer.tsx index a0fe8b8e..df755638 100644 --- a/public_website/src/lib/BlockRenderer.tsx +++ b/public_website/src/lib/BlockRenderer.tsx @@ -28,7 +28,10 @@ import { SimplePushCta } from './blocks/SimplePushCta' import { SimpleTextV2 } from './blocks/SimpleTextV2' import { SimpleTextWithMedia } from './blocks/SimpleTextWithMedia' import { SocialMedia } from './blocks/SocialMedia' -import TabSimpleText from './blocks/tabs/TabSimpleText' +import TabsImageText from './blocks/tabs/TabsImageText' +import TabsPushGreyCta from './blocks/tabs/TabsPushGreyCta' +import TabsLittleList from './blocks/tabs/TabsSimpleList' +import TabsSimpleText from './blocks/tabs/TabsSimpleText' import { VerticalCarousel } from './blocks/verticalCarousel/VerticalCarousel' import { Video } from './blocks/Video' import { WhiteSpace } from './blocks/WhiteSpace' @@ -80,7 +83,10 @@ const COMPONENTS: Record< 'block.header-with-q-rcode': HeaderWithQRCode, 'block.columns-text': SimpleTextWithMedia, 'block.centered-title': CenteredText, - 'block.tabs': TabSimpleText, + 'block.tabs-image-text': TabsImageText, + 'block.tabs-simple-text': TabsSimpleText, + 'block.tabs-little-list': TabsLittleList, + 'block.tabs-push-grey-cta': TabsPushGreyCta, } export function BlockRenderer(props: BlockRendererProps) { diff --git a/public_website/src/lib/blocks/DoublePushCta.tsx b/public_website/src/lib/blocks/DoublePushCta.tsx index 112ea72f..baa44334 100644 --- a/public_website/src/lib/blocks/DoublePushCta.tsx +++ b/public_website/src/lib/blocks/DoublePushCta.tsx @@ -16,9 +16,9 @@ import { parseText } from '@/utils/parseText' export function DoublePushCTA( props: PushCTAProps & { - text: string | undefined + text?: string firstCta: CTA - secondCta: CTA | undefined + secondCta?: CTA } ) { const { diff --git a/public_website/src/lib/blocks/tabs/TabSimpleText.tsx b/public_website/src/lib/blocks/tabs/Tabs.tsx similarity index 67% rename from public_website/src/lib/blocks/tabs/TabSimpleText.tsx rename to public_website/src/lib/blocks/tabs/Tabs.tsx index e6094b8d..62d82be4 100644 --- a/public_website/src/lib/blocks/tabs/TabSimpleText.tsx +++ b/public_website/src/lib/blocks/tabs/Tabs.tsx @@ -1,14 +1,13 @@ -import React, { useState } from 'react' +import React, { ReactNode, useMemo, useState } from 'react' import styled from 'styled-components' -import { ImageText } from '../ImageText' import Tab from './Tab' import TabPanel from './TabPannel' -import { TabSimpleTextProps } from '@/types/props' +import { TabImageTextProps, TabPushGreyProps } from '@/types/props' import { ContentWrapper } from '@/ui/components/ContentWrapper' -const TabSimpleText = (props: TabSimpleTextProps) => { - const { tab } = props +const Tabs = (props: TabImageTextProps | TabPushGreyProps) => { + const { tab, children } = props const [selectedTab, setSelectedTab] = useState(0) const handleClick = (index: number): void => { setSelectedTab(index) @@ -37,6 +36,23 @@ const TabSimpleText = (props: TabSimpleTextProps) => { handleNextTab(first, next, tabCount) } } + const renderChildrenWithProps = ( + child: ReactNode, + props: (Partial & React.Attributes) | undefined + ) => { + return React.cloneElement(child as React.ReactElement, props) + } + const tabPanels = useMemo(() => { + return tab?.map((item, index: number) => ( + + {renderChildrenWithProps(children, { ...item.block })} + + )) + }, [tab, children, selectedTab]) return ( @@ -60,22 +76,12 @@ const TabSimpleText = (props: TabSimpleTextProps) => { })} - {tab?.map((item, index: number) => { - return ( - - - - ) - })} + {tabPanels} ) } -export default TabSimpleText +export default Tabs const StyledTabUl = styled.ul` display: flex; diff --git a/public_website/src/lib/blocks/tabs/TabsImageText.tsx b/public_website/src/lib/blocks/tabs/TabsImageText.tsx new file mode 100644 index 00000000..9e353735 --- /dev/null +++ b/public_website/src/lib/blocks/tabs/TabsImageText.tsx @@ -0,0 +1,15 @@ +import React from 'react' + +import { ImageText } from '../ImageText' +import Tabs from './Tabs' +import { TabImageTextProps } from '@/types/props' + +const TabsImageText = (props: TabImageTextProps) => { + return ( + + + + ) +} + +export default TabsImageText diff --git a/public_website/src/lib/blocks/tabs/TabsPushGreyCta.tsx b/public_website/src/lib/blocks/tabs/TabsPushGreyCta.tsx new file mode 100644 index 00000000..4ee9d798 --- /dev/null +++ b/public_website/src/lib/blocks/tabs/TabsPushGreyCta.tsx @@ -0,0 +1,25 @@ +import React from 'react' + +import { DoublePushCTA } from '../DoublePushCta' +import Tabs from './Tabs' +import { TabPushGreyProps } from '@/types/props' + +const TabsPushGreyCta = (props: TabPushGreyProps) => { + return ( + + + + ) +} + +export default TabsPushGreyCta diff --git a/public_website/src/lib/blocks/tabs/TabsSimpleList.tsx b/public_website/src/lib/blocks/tabs/TabsSimpleList.tsx new file mode 100644 index 00000000..04ab9d31 --- /dev/null +++ b/public_website/src/lib/blocks/tabs/TabsSimpleList.tsx @@ -0,0 +1,15 @@ +import React from 'react' + +import { LittleList } from '../LittleList' +import Tabs from './Tabs' +import { TabImageTextProps } from '@/types/props' + +const TabsLittleList = (props: TabImageTextProps) => { + return ( + + + + ) +} + +export default TabsLittleList diff --git a/public_website/src/lib/blocks/tabs/TabsSimpleText.tsx b/public_website/src/lib/blocks/tabs/TabsSimpleText.tsx new file mode 100644 index 00000000..a1dca925 --- /dev/null +++ b/public_website/src/lib/blocks/tabs/TabsSimpleText.tsx @@ -0,0 +1,15 @@ +import React from 'react' + +import { SimpleTextV2 } from '../SimpleTextV2' +import Tabs from './Tabs' +import { TabSimpleTextProps } from '@/types/props' + +const TabsSimpleText = (props: TabSimpleTextProps) => { + return ( + + + + ) +} + +export default TabsSimpleText diff --git a/public_website/src/pages/[...slug].tsx b/public_website/src/pages/[...slug].tsx index 042f60e0..ef7d9864 100644 --- a/public_website/src/pages/[...slug].tsx +++ b/public_website/src/pages/[...slug].tsx @@ -82,10 +82,13 @@ export const getStaticProps = (async ({ params }) => { 'Blocks.carouselItems', 'Blocks.carouselItems.image', 'Blocks.QRCode', - 'Blocks.tabs', 'Blocks.tab', 'Blocks.tab.block', 'Blocks.tab.block.image', + 'Blocks.tab.block.firstCta', + 'Blocks.tab.block.secondCta', + 'Blocks.tab.block.columns', + 'Blocks.tab.block.content', 'Blocks.centered.title', 'seo', 'seo.metaSocial', diff --git a/public_website/src/types/components.d.ts b/public_website/src/types/components.d.ts index 25296273..29a1d8a7 100644 --- a/public_website/src/types/components.d.ts +++ b/public_website/src/types/components.d.ts @@ -6,9 +6,7 @@ export interface BlockBreadcrumb extends Schema.Component { displayName: 'Breadcrumbs'; description: ''; }; - attributes: { - isUnderHeader: Attribute.Boolean & Attribute.DefaultTo; - }; + attributes: {}; } export interface BlockCenteredText extends Schema.Component { @@ -426,10 +424,10 @@ export interface BlockSpace extends Schema.Component { }; } -export interface BlockTab extends Schema.Component { - collectionName: 'components_block_tab'; +export interface BlockTabImageText extends Schema.Component { + collectionName: 'components_block_tab_image_texts'; info: { - displayName: 'tab'; + displayName: 'TabImageText'; }; attributes: { title: Attribute.String & Attribute.Required; @@ -437,14 +435,77 @@ export interface BlockTab extends Schema.Component { }; } -export interface BlockTabs extends Schema.Component { - collectionName: 'components_block_tabs'; +export interface BlockTabLittleList extends Schema.Component { + collectionName: 'components_block_tab_little_lists'; + info: { + displayName: 'TabLittleList'; + }; + attributes: { + title: Attribute.String & Attribute.Required; + block: Attribute.Component<'block.little-list'>; + }; +} + +export interface BlockTabPushGreyCta extends Schema.Component { + collectionName: 'components_block_tab_push_grey_ctas'; + info: { + displayName: 'TabPushGreyCTA'; + }; + attributes: { + title: Attribute.String & Attribute.Required; + block: Attribute.Component<'block.double-push-cta'>; + }; +} + +export interface BlockTabSimpleText extends Schema.Component { + collectionName: 'components_block_tab_simple_texts'; + info: { + displayName: 'TabSimpleText'; + }; + attributes: { + title: Attribute.String & Attribute.Required; + block: Attribute.Component<'block.simple-text-v2'>; + }; +} + +export interface BlockTabsImageText extends Schema.Component { + collectionName: 'components_block_tabs_image_texts'; info: { - displayName: 'Tabs'; + displayName: 'TabsImageText'; + }; + attributes: { + tab: Attribute.Component<'block.tab-image-text', true>; + }; +} + +export interface BlockTabsLittleList extends Schema.Component { + collectionName: 'components_block_tabs_little_lists'; + info: { + displayName: 'TabsLittleList'; + }; + attributes: { + tab: Attribute.Component<'block.tab-little-list', true>; + }; +} + +export interface BlockTabsPushGreyCta extends Schema.Component { + collectionName: 'components_block_tabs_push_grey_ctas'; + info: { + displayName: 'TabsPushGreyCTA'; description: ''; }; attributes: { - tab: Attribute.Component<'block.tab', true>; + tab: Attribute.Component<'block.tab-push-grey-cta', true>; + }; +} + +export interface BlockTabsSimpleText extends Schema.Component { + collectionName: 'components_block_tabs_simple_texts'; + info: { + displayName: 'TabsSimpleText'; + }; + attributes: { + tab: Attribute.Component<'block.tab-simple-text', true>; }; } @@ -1143,8 +1204,14 @@ declare module '@strapi/types' { 'block.simple-text-v2': BlockSimpleTextV2; 'block.social-media': BlockSocialMedia; 'block.space': BlockSpace; - 'block.tab': BlockTab; - 'block.tabs': BlockTabs; + 'block.tab-image-text': BlockTabImageText; + 'block.tab-little-list': BlockTabLittleList; + 'block.tab-push-grey-cta': BlockTabPushGreyCta; + 'block.tab-simple-text': BlockTabSimpleText; + 'block.tabs-image-text': BlockTabsImageText; + 'block.tabs-little-list': BlockTabsLittleList; + 'block.tabs-push-grey-cta': BlockTabsPushGreyCta; + 'block.tabs-simple-text': BlockTabsSimpleText; 'block.vertical-carousel': BlockVerticalCarousel; 'block.video': BlockVideo; 'common.detailed-logo': CommonDetailedLogo; diff --git a/public_website/src/types/contentTypes.d.ts b/public_website/src/types/contentTypes.d.ts index d1d20d70..c26d9a25 100644 --- a/public_website/src/types/contentTypes.d.ts +++ b/public_website/src/types/contentTypes.d.ts @@ -1289,7 +1289,10 @@ export interface ApiPagePage extends Schema.CollectionType { 'block.header-with-q-rcode', 'block.columns-text', 'block.centered-title', - 'block.tabs' + 'block.tabs-simple-text', + 'block.tabs-push-grey-cta', + 'block.tabs-little-list', + 'block.tabs-image-text' ] >; seo: Attribute.Component<'shared.seo'>; diff --git a/public_website/src/types/props.ts b/public_website/src/types/props.ts index c53ab239..53b8bbb2 100644 --- a/public_website/src/types/props.ts +++ b/public_website/src/types/props.ts @@ -45,14 +45,47 @@ export type HeroProps = { sixthEmoji: string images: APIResponseData<'plugin::upload.file'>[] | null } -export type TabSimpleTextProps = { +export type TabImageTextProps = { id: number + children: React.ReactNode tab: { title: string block: ImageTextProps & { text: string }[] id: number }[] } +export type TabSimpleTextProps = { + id: number + children: React.ReactNode + tab: { + title: string + block: SimpleTextV2Props & { text: string }[] + id: number + }[] +} +export type TabSimpleListProps = { + id: number + children: React.ReactNode + tab: { + title: string + block: LittleListProps & { text: string }[] + id: number + }[] +} +export type TabPushGreyProps = { + id: number + children: React.ReactNode + tab: { + title: string + block: PushCTAProps & + { + text?: string + firstCta: CTA + secondCta?: CTA + }[] + id: number + }[] +} export type ImageTextProps = { title?: string text: BlocksContent @@ -182,7 +215,7 @@ export type HeaderProps = { icon2?: string cta?: CTA } -export interface HeaderWithQRCodeProps { +export type HeaderWithQRCodeProps = { title: string text?: string image: APIResponse<'plugin::upload.file'> | null diff --git a/public_website/src/ui/components/header/Header.tsx b/public_website/src/ui/components/header/Header.tsx index 8b6a01b7..fcc57cf0 100644 --- a/public_website/src/ui/components/header/Header.tsx +++ b/public_website/src/ui/components/header/Header.tsx @@ -184,6 +184,8 @@ export function Header(props: HeaderMenuProps) { useEffect(() => { const activeId = findCollectionIdByPath(currentPath, navItems) + // eslint-disable-next-line no-console + console.log(currentPath, navItems, previousPath, activeId) setActiveId(activeId) }, [currentPath, navItems, previousPath])