diff --git a/apps/website/pages/_app.tsx b/apps/website/pages/_app.tsx index 34fbd44b0..236dbabce 100644 --- a/apps/website/pages/_app.tsx +++ b/apps/website/pages/_app.tsx @@ -100,13 +100,11 @@ export default function App({ Component, pageProps, emotionCache = clientSideEmo - } + header={} sidenav={ } + branding={isExpanded && } topContent={ isExpanded && ( ( + <> + + Sidenav code — Halstack Design System + + + +); + +Code.getLayout = (page: ReactElement) => {page}; + +export default Code; diff --git a/apps/website/pages/components/sidenav/index.tsx b/apps/website/pages/components/sidenav/index.tsx index 8e099c450..50ec17a20 100644 --- a/apps/website/pages/components/sidenav/index.tsx +++ b/apps/website/pages/components/sidenav/index.tsx @@ -1,36 +1,17 @@ -// import Head from "next/head"; -// import type { ReactElement } from "react"; -// import SidenavPageLayout from "screens/components/sidenav/SidenavPageLayout"; -// import SidenavOverviewPage from "screens/components/sidenav/overview/SidenavOverviewPage"; - -// const Index = () => ( -// <> -// -// Sidenav — Halstack Design System -// -// {/* */} -// -// -// ); - -// Index.getLayout = (page: ReactElement) => {page}; - -// export default Index; - import Head from "next/head"; import type { ReactElement } from "react"; import SidenavPageLayout from "screens/components/sidenav/SidenavPageLayout"; -import SidenavCodePage from "screens/components/sidenav/code/SidenavCodePage"; +import SidenavOverviewPage from "screens/components/sidenav/overview/SidenavOverviewPage"; -const Code = () => ( +const Index = () => ( <> - Sidenav code — Halstack Design System + Sidenav — Halstack Design System - + ); -Code.getLayout = (page: ReactElement) => {page}; +Index.getLayout = (page: ReactElement) => {page}; -export default Code; +export default Index; diff --git a/apps/website/screens/common/sidenav/SidenavLogo.tsx b/apps/website/screens/common/sidenav/SidenavLogo.tsx index 286f78e9b..74efd7829 100644 --- a/apps/website/screens/common/sidenav/SidenavLogo.tsx +++ b/apps/website/screens/common/sidenav/SidenavLogo.tsx @@ -1,60 +1,28 @@ import styled from "@emotion/styled"; -import Image from "@/common/Image"; import { DxcBadge, DxcFlex } from "@dxc-technology/halstack-react"; -import halstackLogo from "@/common/images/halstack_logo.svg"; -const LogoContainer = styled.div` +const SidenavTitle = styled.div` display: flex; - flex-direction: column; - margin: var(--spacing-padding-none) var(--spacing-padding-l); -`; - -const Title = styled.div` - color: var(--color-fg-primary-strong); - font-size: var(--typography-title-l); - font-family: var(--typography-font-family); -`; - -const Subtitle = styled.div` - color: var(--color-fg-neutral-strongest); - font-size: var(--typography-title-m); - margin-left: var(--spacing-padding-s); + align-items: center; font-family: var(--typography-font-family); + font-size: var(--typography-ttle-m); + color: var(--color-fg-neutral-dark); + font-weight: var(--typography-title-bold); `; -const SidenavLogo = ({ subtitle = "Design System", expanded }: { subtitle?: string; expanded: boolean }) => { +const SidenavLogo = () => { const pathVersion = process.env.NEXT_PUBLIC_SITE_VERSION; const isDev = process.env.NODE_ENV === "development"; - return expanded ? ( - - - - Halstack logo - Halstack - - {subtitle} - + return ( + + Halstack Design System - ) : ( - Halstack logo ); }; diff --git a/apps/website/screens/components/sidenav/SidenavPageLayout.tsx b/apps/website/screens/components/sidenav/SidenavPageLayout.tsx index fb5616270..72413b817 100644 --- a/apps/website/screens/components/sidenav/SidenavPageLayout.tsx +++ b/apps/website/screens/components/sidenav/SidenavPageLayout.tsx @@ -7,9 +7,8 @@ import { ReactNode } from "react"; const SidenavPageHeading = ({ children }: { children: ReactNode }) => { const tabs = [ - // { label: "Overview", path: "/components/sidenav" }, - // { label: "Code", path: "/components/sidenav/code" }, - { label: "Code", path: "/components/sidenav" }, + { label: "Overview", path: "/components/sidenav" }, + { label: "Code", path: "/components/sidenav/code" }, ]; // TODO: UPDATE DESCRIPTION WHEN OVERVIEW IS ADDED return ( @@ -18,10 +17,12 @@ const SidenavPageHeading = ({ children }: { children: ReactNode }) => { - The sidenav component provides a vertical navigation structure placed on the left side of the interface. + The sidenav component provides a vertical navigation structure placed on the left side of the interface. It + provides global access to navigation, branding, and user actions, ensuring consistency and orientation + across products and applications. - The sidenav is part of the application layout, so it can only be used inside of it. Please check the{" "} + It is part of the application layout, so it can only be used inside of it. Please check the{" "} DxcApplicationLayout {" "} diff --git a/apps/website/screens/components/sidenav/code/SidenavCodePage.tsx b/apps/website/screens/components/sidenav/code/SidenavCodePage.tsx index 1cb2135c1..5ea9cbaa2 100644 --- a/apps/website/screens/components/sidenav/code/SidenavCodePage.tsx +++ b/apps/website/screens/components/sidenav/code/SidenavCodePage.tsx @@ -153,7 +153,7 @@ const sections = [ title: "Application layout with sidenav", content: (