diff --git a/src/front/Components/DesignSystem/Tag/classes.module.scss b/src/front/Components/DesignSystem/Tag/classes.module.scss index 045e6b93..69c4b841 100644 --- a/src/front/Components/DesignSystem/Tag/classes.module.scss +++ b/src/front/Components/DesignSystem/Tag/classes.module.scss @@ -2,9 +2,11 @@ .root { padding: 2px 8px; - border-radius: 360px; + display: flex; + align-items: center; + &.info { background-color: var(--color-info-50); } @@ -14,6 +16,10 @@ } &.error { + background-color: var(--color-error-50); + } + + &.warning { background-color: var(--color-warning-50); } } diff --git a/src/front/Components/DesignSystem/Tag/index.tsx b/src/front/Components/DesignSystem/Tag/index.tsx index 16af5f10..7df7faa4 100644 --- a/src/front/Components/DesignSystem/Tag/index.tsx +++ b/src/front/Components/DesignSystem/Tag/index.tsx @@ -4,30 +4,43 @@ import React from "react"; import Typography, { ETypo, ETypoColor } from "../Typography"; import classes from "./classes.module.scss"; -export enum ETagVariant { +export enum ETagColor { INFO = "info", SUCCESS = "success", ERROR = "error", + WARNING = "warning", +} + +export enum ETagVariant { + REGULAR = "regular", + SEMI_BOLD = "semi_bold", } type IProps = { label: string; + color: ETagColor; variant: ETagVariant; className?: string; }; -const typoColor: Record = { - [ETagVariant.INFO]: ETypoColor.COLOR_INFO_900, - [ETagVariant.SUCCESS]: ETypoColor.COLOR_SUCCESS_700, - [ETagVariant.ERROR]: ETypoColor.COLOR_SECONDARY_700, +const colorMap: Record = { + [ETagColor.INFO]: ETypoColor.COLOR_INFO_900, + [ETagColor.SUCCESS]: ETypoColor.COLOR_SUCCESS_700, + [ETagColor.ERROR]: ETypoColor.COLOR_SECONDARY_700, + [ETagColor.WARNING]: ETypoColor.COLOR_WARNING_700, +}; + +const typoMap: Record = { + [ETagVariant.REGULAR]: ETypo.TEXT_MD_REGULAR, + [ETagVariant.SEMI_BOLD]: ETypo.TEXT_XS_SEMIBOLD, }; export default function Tag(props: IProps) { - const { className, label, variant } = props; + const { className, label, color, variant } = props; return ( -
- +
+ {label}
diff --git a/src/front/Components/Layouts/Folder/index.tsx b/src/front/Components/Layouts/Folder/index.tsx index 966839d1..4d24f00f 100644 --- a/src/front/Components/Layouts/Folder/index.tsx +++ b/src/front/Components/Layouts/Folder/index.tsx @@ -6,7 +6,7 @@ import BasePage from "../Base"; import classes from "./classes.module.scss"; import Newletter from "@Front/Components/DesignSystem/Newsletter"; import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; -import Tag, { ETagVariant } from "@Front/Components/DesignSystem/Tag"; +import Tag, { ETagColor, ETagVariant } from "@Front/Components/DesignSystem/Tag"; type IProps = {}; type IState = { @@ -99,9 +99,16 @@ export default class Folder extends BasePage {
- - - + + + + +
+
+ + + +