Skip to content

Commit

Permalink
Merge pull request #1967 from dxc-technology/gomezivann/site-updates
Browse files Browse the repository at this point in the history
Site updates
  • Loading branch information
raquelarrojo committed Apr 30, 2024
2 parents 74dd241 + 09653a9 commit 661349f
Show file tree
Hide file tree
Showing 8 changed files with 142 additions and 137 deletions.
253 changes: 127 additions & 126 deletions website/package-lock.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion website/package.json
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
"lint": "next lint"
},
"dependencies": {
"@dxc-technology/halstack-react": "12.0.2",
"@dxc-technology/halstack-react": "next",
"@radix-ui/react-popover": "^1.0.7",
"@types/styled-components": "5.1.29",
"cross-env": "^7.0.3",
Expand Down
2 changes: 1 addition & 1 deletion website/pages/_app.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -117,7 +117,7 @@ const MyApp = ({ Component, pageProps }: AppPropsWithLayout) => {
>
{label}
{status && status !== "stable" && (
<StatusBadge componentStatus status={status} />
<StatusBadge hasTitle status={status} />
)}
</DxcApplicationLayout.SideNav.Link>
</Link>
Expand Down
4 changes: 2 additions & 2 deletions website/pages/overview/component-lifecycle.tsx
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
import Head from "next/head";
import ComponentLifecyclePage from "../../screens/principles/component-lifecycle/ComponentLifecyclePage";
import ComponentLifecyclePage from "../../screens/overview/component-lifecycle/ComponentLifecyclePage";

const ComponentLifecycle = () => {
return (
<>
<Head>
<title>Component Lifecycle — Halstack Design System</title>
<title>Component lifecycle — Halstack Design System</title>
</Head>
<ComponentLifecyclePage></ComponentLifecyclePage>
</>
Expand Down
6 changes: 3 additions & 3 deletions website/screens/common/StatusBadge.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ import { DxcBadge } from "@dxc-technology/halstack-react";
import { ComponentStatus } from "./pagesList";

type StatusBadgeProps = {
componentStatus?: boolean;
hasTitle?: boolean;
status: ComponentStatus | "required";
};

Expand Down Expand Up @@ -40,11 +40,11 @@ const getBadgeTitle = (status: StatusBadgeProps["status"]) => {
}
};

const StatusBadge = ({ componentStatus = false, status }: StatusBadgeProps) => (
const StatusBadge = ({ hasTitle = false, status }: StatusBadgeProps) => (
<DxcBadge
label={status[0].toUpperCase() + status.slice(1)}
color={getBadgeColor(status)}
title={componentStatus ? getBadgeTitle(status) : undefined}
title={hasTitle ? getBadgeTitle(status) : undefined}
size="small"
/>
);
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -13,6 +13,7 @@ const itemTypeString = `{
icon?: string | SVG;
label: string;
onSelect?: () => void;
selectedByDefault?: boolean;
}`;

const groupItemTypeString = `{
Expand All @@ -23,7 +24,7 @@ const groupItemTypeString = `{
}`;

const sectionTypeString = `{
items: (Item | GroupItem)[];
items: (Item | GroupItem)[];
title?: string
}`;

Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,6 @@ import {
DxcParagraph,
DxcFlex,
DxcBulletedList,
DxcLink,
} from "@dxc-technology/halstack-react";
import DocFooter from "@/common/DocFooter";
import QuickNavContainer from "@/common/QuickNavContainer";
Expand Down Expand Up @@ -45,6 +44,10 @@ const sections = [
Use our Badge component as a complement to the menu items to show
the status of any navigable section.
</DxcBulletedList.Item>
<DxcBulletedList.Item>
We strongly recommend only selecting by default the first option
of the menu. Any other option may become unintuitive for the user.
</DxcBulletedList.Item>
</DxcBulletedList>
),
},
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,7 @@ const sections = [
even withdrawn to meet ever-evolving standards and user requirements.
</DxcParagraph>
<DxcParagraph>
Each of the stages can be understood as milestones that summarize the
Each of the states can be understood as milestones that summarize the
maturity lifecycle of the components in Halstack and have their
implications or requirements which need to be fulfilled to move from
one to another. This process is non-linear, which means that a
Expand Down Expand Up @@ -226,7 +226,7 @@ const ComponentLifecyclePage = () => {
startHeadingLevel={2}
></QuickNavContainer>
</QuickNavContainerLayout>
<DocFooter githubLink="https://github.com/dxc-technology/halstack-react/blob/master/website/screens/principles/component-lifecycle/ComponentLifecyclePage.tsx" />
<DocFooter githubLink="https://github.com/dxc-technology/halstack-react/blob/master/website/screens/overview/component-lifecycle/ComponentLifecyclePage.tsx" />
</DxcFlex>
);
};
Expand Down

0 comments on commit 661349f

Please sign in to comment.