Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Replace the Status tag with our Badge #1906

Merged
merged 7 commits into from Mar 20, 2024
Merged

Replace the Status tag with our Badge #1906

Show file tree
Hide file tree
Changes from 2 commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
9ebcb64
Repace the Status tag with our Badge
raquelarrojo Mar 15, 2024
9e55996
Merge branch 'master' into rarrojolopez-status-badge
raquelarrojo Mar 15, 2024
cdc1c8f
Merge branch 'master' into rarrojolopez-status-badge
raquelarrojo Mar 18, 2024
c805cda
Merge branch 'master' into rarrojolopez-status-badge
raquelarrojo Mar 19, 2024
0c59b35
Merge branch 'master' into rarrojolopez-status-badge
Mil4n0r Mar 20, 2024
0905bb1
Changes in status badge
raquelarrojo Mar 20, 2024
b199f07
Small cahnge StatusBadge
raquelarrojo Mar 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Jump to
Jump to file
Failed to load files.
Diff view
Diff view
4 changes: 2 additions & 2 deletions website/pages/_app.tsx
View file
Open in desktop
Expand Up @@ -18,7 +18,7 @@ import {
themeGeneratorLinks,
} from "@/common/pagesList";
import Link from "next/link";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";

type NextPageWithLayout = NextPage & {
getLayout?: (page: ReactElement) => ReactNode;
Expand Down Expand Up @@ -117,7 +117,7 @@ const MyApp = ({ Component, pageProps }: AppPropsWithLayout) => {
>
{label}
{status !== "Ready" && (
<StatusTag status={status}>{status}</StatusTag>
<StatusBadge label={status} status={status} />
)}
</DxcApplicationLayout.SideNav.Link>
</Link>
Expand Down
29 changes: 29 additions & 0 deletions website/screens/common/StatusBadge.tsx
View file
Open in desktop
@@ -0,0 +1,29 @@
import { DxcBadge } from "@dxc-technology/halstack-react";

type StatusBadgeProps = {
label: string;
status: "Deprecated" | "Experimental" | "Information" | "Ready" | "Required";
};

const getBadgeColor = (status: StatusBadgeProps["status"]) => {
switch (status) {
case "Deprecated":
return "yellow";
case "Experimental":
return "purple";
case "Information":
return "blue";
case "Ready":
return "green";
case "Required":
return "orange";
default:
return "grey";
}
};

const StatusBadge = ({ label, status }: StatusBadgeProps) => (
<DxcBadge label={label} color={getBadgeColor(status)} size="small" />
);

export default StatusBadge;
42 changes: 0 additions & 42 deletions website/screens/common/StatusTag.tsx
View file
Open in desktop

This file was deleted.

20 changes: 12 additions & 8 deletions website/screens/common/sidenav/SidenavLogo.tsx
View file
Open in desktop
Mil4n0r marked this conversation as resolved.
Show resolved Hide resolved
@@ -1,10 +1,10 @@
import styled from "styled-components";
import Image from "@/common/Image";
import halstackLogo from "@/common/images/halstack_logo.svg";
import StatusTag from "@/common/StatusTag";
import React from "react";
import { useRouter } from "next/router";
import pjson from "../../../package-lock.json";
import { DxcBadge } from "@dxc-technology/halstack-react";

type SidenavLogoProps = { subtitle?: string };

Expand All @@ -31,13 +31,17 @@ const SidenavLogo = ({
</Header>
<Subtitle>{subtitle}</Subtitle>
</LogoContainer>
<StatusTag>
{isDev
? "dev"
: isNaN(parseInt(pathVersion))
? "next"
: `v${halstackVersion}`}
</StatusTag>
<DxcBadge
label={
isDev
? "dev"
: isNaN(parseInt(pathVersion))
? "next"
: `v${halstackVersion}`
}
color="purple"
size="small"
/>
</SidenavLogoContainer>
);
};
Expand Down
14 changes: 8 additions & 6 deletions website/screens/components/accordion/code/AccordionCodePage.tsx
View file
Open in desktop
Expand Up @@ -14,7 +14,7 @@ import icons from "./examples/icons";
import controlledAccordionGroup from "./examples/controlledAccordionGroup";
import uncontrolledAccordionGroup from "./examples/uncontrolledAccordionGroup";
import TableCode from "@/common/TableCode";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";
import Code from "@/common/Code";

const sections = [
Expand All @@ -34,7 +34,8 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>label
<StatusBadge label="Required" status="Required" />
label
</DxcFlex>
</td>
<td>
Expand Down Expand Up @@ -115,7 +116,7 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>
<StatusBadge label="Required" status="Required" />
children
</DxcFlex>
</td>
Expand Down Expand Up @@ -233,7 +234,7 @@ const sections = [
gap="0.25rem"
alignItems="baseline"
>
<StatusTag status="Required">Required</StatusTag>
<StatusBadge label="Required" status="Required" />
children
</DxcFlex>
</td>
Expand Down Expand Up @@ -294,7 +295,8 @@ const sections = [
gap="0.25rem"
alignItems="baseline"
>
<StatusTag status="Required">Required</StatusTag>label
<StatusBadge label="Required" status="Required" />
label
</DxcFlex>
</td>
<td>
Expand Down Expand Up @@ -351,7 +353,7 @@ const sections = [
gap="0.25rem"
alignItems="baseline"
>
<StatusTag status="Required">Required</StatusTag>
<StatusBadge label="Required" status="Required" />
children
</DxcFlex>
</td>
Expand Down
4 changes: 2 additions & 2 deletions website/screens/components/application-layout/code/ApplicationLayoutCodePage.tsx
View file
Open in desktop
Expand Up @@ -9,7 +9,7 @@ import QuickNavContainer from "@/common/QuickNavContainer";
import QuickNavContainerLayout from "@/common/QuickNavContainerLayout";
import Link from "next/link";
import TableCode from "@/common/TableCode";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";
import Code from "@/common/Code";

const ApplicationLayoutPropsTable = () => (
Expand Down Expand Up @@ -84,7 +84,7 @@ const ApplicationLayoutPropsTable = () => (
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>
<StatusBadge label="Required" status="Required" />
children
</DxcFlex>
</td>
Expand Down
5 changes: 3 additions & 2 deletions website/screens/components/bleed/code/BleedCodePage.tsx
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ import DocFooter from "@/common/DocFooter";
import Example from "@/common/example/Example";
import basicUsage from "./examples/basicUsage";
import customSizes from "./examples/customSides";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";

const sections = [
{
Expand Down Expand Up @@ -113,7 +113,8 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>children
<StatusBadge label="Required" status="Required" />
children
</DxcFlex>
</td>
<td>
Expand Down
5 changes: 3 additions & 2 deletions website/screens/components/box/code/BoxCodePage.tsx
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ import DocFooter from "@/common/DocFooter";
import Example from "@/common/example/Example";
import basicUsage from "./examples/basicUsage";
import TableCode from "@/common/TableCode";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";
import Code from "@/common/Code";

const sections = [
Expand Down Expand Up @@ -47,7 +47,8 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>children
<StatusBadge label="Required" status="Required" />
children
</DxcFlex>
</td>
<td>
Expand Down
5 changes: 3 additions & 2 deletions website/screens/components/button/code/ButtonCodePage.tsx
View file
Open in desktop
Expand Up @@ -6,7 +6,7 @@ import QuickNavContainerLayout from "@/common/QuickNavContainerLayout";
import Example from "@/common/example/Example";
import basicUsage from "./examples/basicUsage";
import icons from "./examples/icons";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";
import TableCode from "@/common/TableCode";

const sections = [
Expand Down Expand Up @@ -44,7 +44,8 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Information">New</StatusTag>title
<StatusBadge label="New" status="Information" />
title
</DxcFlex>
</td>
<td>
Expand Down
5 changes: 3 additions & 2 deletions website/screens/components/checkbox/code/CheckboxCodePage.tsx
View file
Open in desktop
Expand Up @@ -5,7 +5,7 @@ import DocFooter from "@/common/DocFooter";
import Example from "@/common/example/Example";
import controlled from "./examples/controlled";
import uncontrolled from "./examples/uncontrolled";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";
import TableCode from "@/common/TableCode";
import Code from "@/common/Code";

Expand Down Expand Up @@ -115,7 +115,8 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Information">New</StatusTag>readOnly
<StatusBadge label="New" status="Information" />
readOnly
</DxcFlex>
</td>
<td>
Expand Down
5 changes: 3 additions & 2 deletions website/screens/components/container/code/ContainerCodePage.tsx
View file
Open in desktop
Expand Up @@ -8,7 +8,7 @@ import Code from "@/common/Code";
import DocFooter from "@/common/DocFooter";
import QuickNavContainer from "@/common/QuickNavContainer";
import QuickNavContainerLayout from "@/common/QuickNavContainerLayout";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";
import TableCode, { ExtendedTableCode } from "@/common/TableCode";
import Example from "@/common/example/Example";
import basicUsage from "./examples/basicUsage";
Expand Down Expand Up @@ -181,7 +181,8 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>children
<StatusBadge label="Required" status="Required" />
children
</DxcFlex>
</td>
<td>
Expand Down
5 changes: 3 additions & 2 deletions website/screens/components/date-input/code/DateInputCodePage.tsx
View file
Open in desktop
Expand Up @@ -13,7 +13,7 @@ import basicUsage from "./examples/basicUsage";
import errorHandling from "./examples/errorHandling";
import controlled from "./examples/controlled";
import uncontrolled from "./examples/uncontrolled";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";
import TableCode from "@/common/TableCode";

const sections = [
Expand Down Expand Up @@ -146,7 +146,8 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Information">New</StatusTag>readOnly
<StatusBadge label="New" status="Information" />
readOnly
</DxcFlex>
</td>
<td>
Expand Down
5 changes: 3 additions & 2 deletions website/screens/components/dialog/code/DialogCodePage.tsx
View file
Open in desktop
Expand Up @@ -12,7 +12,7 @@ import basicUsage from "./examples/basicUsage";
import withContent from "./examples/withContent";
import backgroundClick from "./examples/backgroundClick";
import TableCode from "@/common/TableCode";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";

const sections = [
{
Expand Down Expand Up @@ -77,7 +77,8 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>children
<StatusBadge label="Required" status="Required" />
children
</DxcFlex>
</td>
<td>
Expand Down
7 changes: 4 additions & 3 deletions website/screens/components/dropdown/code/DropdownCodePage.tsx
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ import Example from "@/common/example/Example";
import basicUsage from "./examples/basicUsage";
import icons from "./examples/icons";
import TableCode from "@/common/TableCode";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";

const sections = [
{
Expand All @@ -27,7 +27,8 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>options
<StatusBadge label="Required" status="Required" />
options
</DxcFlex>
</td>
<td>
Expand Down Expand Up @@ -150,7 +151,7 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>
<StatusBadge label="Required" status="Required" />
onSelectOption
</DxcFlex>
</td>
Expand Down
9 changes: 5 additions & 4 deletions website/screens/components/file-input/code/FileInputCodePage.tsx
View file
Open in desktop
Expand Up @@ -7,7 +7,7 @@ import Example from "@/common/example/Example";
import basicUsage from "./examples/basicUsage";
import errorHandling from "./examples/errorHandling";
import formFileInput from "./examples/formFileInput";
import StatusTag from "@/common/StatusTag";
import StatusBadge from "@/common/StatusBadge";
import TableCode from "@/common/TableCode";

const sections = [
Expand All @@ -27,7 +27,8 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Deprecated">Deprecated</StatusTag>name
<StatusBadge label="Deprecated" status="Deprecated" />
name
</DxcFlex>
</td>
<td>
Expand Down Expand Up @@ -122,7 +123,7 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>
<StatusBadge label="Required" status="Required" />
value
</DxcFlex>
</td>
Expand Down Expand Up @@ -190,7 +191,7 @@ const sections = [
<tr>
<td>
<DxcFlex direction="column" gap="0.25rem" alignItems="baseline">
<StatusTag status="Required">Required</StatusTag>
<StatusBadge label="Required" status="Required" />
callbackFile
</DxcFlex>
</td>
Expand Down