From 327ba170eff2e2d1af111a944387b7f9831c5179 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Wed, 17 Jul 2024 15:52:34 +0200 Subject: [PATCH 1/4] :sparkles: Tabs almost working --- .../DesignSystem/Typography/index.tsx | 5 +- .../Tabs/HorizontalTab/classes.module.scss | 16 +++ .../Elements/Tabs/HorizontalTab/index.tsx | 33 +++++ .../Tabs/VerticalTabs/classes.module.scss | 6 + .../Elements/Tabs/VerticalTabs/index.tsx | 23 ++++ .../Elements/Tabs/classes.module.scss | 49 ++++++++ src/front/Components/Elements/Tabs/index.tsx | 116 ++++++++++++++++++ .../Components/Layouts/DesignSystem/index.tsx | 67 +++++++--- 8 files changed, 298 insertions(+), 17 deletions(-) create mode 100644 src/front/Components/Elements/Tabs/HorizontalTab/classes.module.scss create mode 100644 src/front/Components/Elements/Tabs/HorizontalTab/index.tsx create mode 100644 src/front/Components/Elements/Tabs/VerticalTabs/classes.module.scss create mode 100644 src/front/Components/Elements/Tabs/VerticalTabs/index.tsx create mode 100644 src/front/Components/Elements/Tabs/classes.module.scss create mode 100644 src/front/Components/Elements/Tabs/index.tsx diff --git a/src/front/Components/DesignSystem/Typography/index.tsx b/src/front/Components/DesignSystem/Typography/index.tsx index 04349b33..06d6179c 100644 --- a/src/front/Components/DesignSystem/Typography/index.tsx +++ b/src/front/Components/DesignSystem/Typography/index.tsx @@ -8,6 +8,7 @@ type IProps = { color?: ETypoColor; className?: string; title?: string; + onClick?: () => void; }; export enum ETypo { @@ -142,12 +143,12 @@ export enum ETypoColor { } export default function Typography(props: IProps) { - const { typo, color, className, title, children } = props; + const { typo, color, className, title, children, onClick } = props; const style = color ? ({ "--data-color": `var(${color})` } as React.CSSProperties) : undefined; return ( -
+
{children}
); diff --git a/src/front/Components/Elements/Tabs/HorizontalTab/classes.module.scss b/src/front/Components/Elements/Tabs/HorizontalTab/classes.module.scss new file mode 100644 index 00000000..34782dad --- /dev/null +++ b/src/front/Components/Elements/Tabs/HorizontalTab/classes.module.scss @@ -0,0 +1,16 @@ +.root { + padding: 8px 16px; + font-size: 16px; + letter-spacing: 0.08px; + + border-bottom: 1px solid var(--color-neutral-500); + cursor: pointer; + + &[data-is-selected="true"] { + border-bottom: 2px solid var(--color-neutral-950, #24282e); + } + + &:hover { + border-bottom: 2px solid var(--color-neutral-950, #24282e); + } +} diff --git a/src/front/Components/Elements/Tabs/HorizontalTab/index.tsx b/src/front/Components/Elements/Tabs/HorizontalTab/index.tsx new file mode 100644 index 00000000..3c0f46fa --- /dev/null +++ b/src/front/Components/Elements/Tabs/HorizontalTab/index.tsx @@ -0,0 +1,33 @@ +import { useCallback } from "react"; +import classes from "./classes.module.scss"; +import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; +import useHoverable from "@Front/Hooks/useHoverable"; +export type ITab = { + label: React.ReactNode; +}; + +export type IProps = { + onSelect: (value: T) => void; + value: T; + isSelected: boolean; +} & ITab; + +export default function HorizontalTabs(props: IProps) { + const onClick = useCallback(() => props.onSelect(props.value), [props]); + + const { isHovered, handleMouseEnter, handleMouseLeave } = useHoverable(); + return ( +
+ + {props.label} + +
+ ); +} diff --git a/src/front/Components/Elements/Tabs/VerticalTabs/classes.module.scss b/src/front/Components/Elements/Tabs/VerticalTabs/classes.module.scss new file mode 100644 index 00000000..e7dfd493 --- /dev/null +++ b/src/front/Components/Elements/Tabs/VerticalTabs/classes.module.scss @@ -0,0 +1,6 @@ +.root { + padding: 8px 16px; + font-size: 16px; + letter-spacing: 0.08px; + cursor: pointer; +} diff --git a/src/front/Components/Elements/Tabs/VerticalTabs/index.tsx b/src/front/Components/Elements/Tabs/VerticalTabs/index.tsx new file mode 100644 index 00000000..dc901e91 --- /dev/null +++ b/src/front/Components/Elements/Tabs/VerticalTabs/index.tsx @@ -0,0 +1,23 @@ +import { useCallback } from "react"; +import classes from "./classes.module.scss"; +import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; +export type ITab = { + label: React.ReactNode; +}; + +export type IProps = { + onSelect: (value: T) => void; + value: T; + isSelected: boolean; +} & ITab; + +export default function VerticalTabs(props: IProps) { + const onClick = useCallback(() => props.onSelect(props.value), [props]); + return ( +
+ + {props.label} + +
+ ); +} diff --git a/src/front/Components/Elements/Tabs/classes.module.scss b/src/front/Components/Elements/Tabs/classes.module.scss new file mode 100644 index 00000000..3498652b --- /dev/null +++ b/src/front/Components/Elements/Tabs/classes.module.scss @@ -0,0 +1,49 @@ +.root { + .hidden-tester { + display: flex; + overflow: hidden; + background: red; + height: 0px; + } + .horizontal-container { + display: flex; + flex-direction: row; + flex: 1; + .horizontal-tab { + display: flex; + justify-content: space-evenly; + overflow: hidden; + } + } + + .show-more-container { + position: relative; + .show-more { + padding: 8px 16px; + display: flex; + color: white; + font-size: 16px; + justify-content: center; + align-items: center; + color: white; + cursor: pointer; + border-bottom: 1px solid var(--color-neutral-500); + } + + .vertical-container { + position: absolute; + display: flex; + flex-direction: column; + top: 50px; + padding: var(--spacing-05, 4px) var(--spacing-2, 16px); + background: var(--color-generic-white, #fff); + + border: 1px solid var(--menu-border, #d7dce0); + border-radius: var(--menu-radius, 0px); + box-shadow: 0px 4px 16px 0px rgba(0, 0, 0, 0.1); + &[data-visible="false"] { + display: none; + } + } + } +} diff --git a/src/front/Components/Elements/Tabs/index.tsx b/src/front/Components/Elements/Tabs/index.tsx new file mode 100644 index 00000000..cb552b36 --- /dev/null +++ b/src/front/Components/Elements/Tabs/index.tsx @@ -0,0 +1,116 @@ +import { useCallback, useEffect, useRef, useState } from "react"; +import classes from "./classes.module.scss"; +import HorizontalTab, { ITab } from "./HorizontalTab"; +import VerticalTabs from "./VerticalTabs"; +import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; +import { useDebounce, useToggle, useWindowSize } from "@uidotdev/usehooks"; +import Button from "@Front/Components/DesignSystem/Button"; +import useOpenable from "@Front/Hooks/useOpenable"; + +type ITabInternal = ITab & { + key?: string; + value: T; +}; + +type IProps = { + tabs: ITabInternal[]; + onSelect: (value: T) => void; +}; + +export default function Tabs(props: IProps) { + const { onSelect } = props; + const rootRef = useRef(null); + const [visibleElements, setVisibleElements] = useState[]>([]); + const [overflowedElements, setOverflowedElements] = useState[]>([]); + + const [selectedTab, setSelectedTab] = useState(props.tabs[0]!.value); + + const { close, isOpen, toggle } = useOpenable(); + + const windowSize = useWindowSize(); + const windowSizeDebounced = useDebounce(windowSize, 100); + + const calculateVisibleElements = useCallback(() => { + const container = rootRef.current; + if (!container) return; + + const containerWidth = container.offsetWidth; + let totalWidth = 115; + let visibleCount = 0; + + const children = Array.from(container.children) as HTMLDivElement[]; + for (let i = 0; i < children.length; i++) { + totalWidth += children[i]!.offsetWidth; + if (totalWidth > containerWidth) { + break; + } + visibleCount++; + } + + setVisibleElements(props.tabs.slice(0, visibleCount)); + setOverflowedElements(props.tabs.slice(visibleCount)); + }, [props.tabs]); + + useEffect(() => { + calculateVisibleElements(); + }, [calculateVisibleElements, windowSizeDebounced]); + + const handleSelect = useCallback( + (value: T) => { + setSelectedTab(value); + onSelect(value); + close(); + }, + [close, onSelect], + ); + + return ( +
+
+ {props.tabs.map((element, index) => ( + + label={element.label} + key={element.key ?? index} + value={element.value} + onSelect={handleSelect} + isSelected={selectedTab === element.value} + /> + ))} +
+
+
+ {visibleElements.map((element, index) => ( + + label={element.label} + key={element.key ?? index} + value={element.value} + onSelect={handleSelect} + isSelected={selectedTab === element.value} + /> + ))} +
+ {overflowedElements.length > 0 && ( +
+
+ + {overflowedElements.length} de plus... + +
+
+ {overflowedElements.length > 0 && + overflowedElements.map((element, index) => ( + + label={element.label} + key={element.key ?? index} + value={element.value} + onSelect={handleSelect} + isSelected={selectedTab === element.value} + /> + ))} +
+
+ )} +
+
+ ); +} diff --git a/src/front/Components/Layouts/DesignSystem/index.tsx b/src/front/Components/Layouts/DesignSystem/index.tsx index c8d45fe9..93c99890 100644 --- a/src/front/Components/Layouts/DesignSystem/index.tsx +++ b/src/front/Components/Layouts/DesignSystem/index.tsx @@ -7,11 +7,48 @@ import Typography, { ETypo } from "@Front/Components/DesignSystem/Typography"; import DefaultTemplate from "@Front/Components/LayoutTemplates/DefaultTemplate"; import classes from "./classes.module.scss"; +import Tabs from "@Front/Components/Elements/Tabs"; +import { useCallback } from "react"; export default function DesignSystem() { + const userDb = [ + { + username: "Maxime", + id: 1, + }, + { + username: "Vincent", + id: 2, + }, + { + username: "Massi", + id: 3, + }, + { + username: "Maxime", + id: 4, + }, + { + username: "Arnaud", + id: 5, + }, + ]; + + const onSelect = useCallback((value: (typeof userDb)[number]) => { + console.log(value); + }, []); + return ( + + tabs={userDb.map((user) => ({ + label: user.username, + key: user.id.toString(), + value: user, + }))} + onSelect={onSelect} + />
DesignSystem
@@ -83,48 +120,48 @@ export default function DesignSystem() { Buttons
- +
- +
- +
- +
- +
From 88acd08bcf65c4e8da1b65f16fab2e892c8915f1 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Wed, 17 Jul 2024 15:56:29 +0200 Subject: [PATCH 2/4] :bug: Fixing border bottom --- src/front/Components/Elements/Tabs/classes.module.scss | 2 +- src/front/Components/Elements/Tabs/index.tsx | 3 +-- 2 files changed, 2 insertions(+), 3 deletions(-) diff --git a/src/front/Components/Elements/Tabs/classes.module.scss b/src/front/Components/Elements/Tabs/classes.module.scss index 3498652b..89a0e389 100644 --- a/src/front/Components/Elements/Tabs/classes.module.scss +++ b/src/front/Components/Elements/Tabs/classes.module.scss @@ -18,6 +18,7 @@ .show-more-container { position: relative; + border-bottom: 1px solid var(--color-neutral-500); .show-more { padding: 8px 16px; display: flex; @@ -27,7 +28,6 @@ align-items: center; color: white; cursor: pointer; - border-bottom: 1px solid var(--color-neutral-500); } .vertical-container { diff --git a/src/front/Components/Elements/Tabs/index.tsx b/src/front/Components/Elements/Tabs/index.tsx index cb552b36..08cc6438 100644 --- a/src/front/Components/Elements/Tabs/index.tsx +++ b/src/front/Components/Elements/Tabs/index.tsx @@ -3,8 +3,7 @@ import classes from "./classes.module.scss"; import HorizontalTab, { ITab } from "./HorizontalTab"; import VerticalTabs from "./VerticalTabs"; import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; -import { useDebounce, useToggle, useWindowSize } from "@uidotdev/usehooks"; -import Button from "@Front/Components/DesignSystem/Button"; +import { useDebounce, useWindowSize } from "@uidotdev/usehooks"; import useOpenable from "@Front/Hooks/useOpenable"; type ITabInternal = ITab & { From e07e5cacde669f17eab20c35a283baa9a51aaa90 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Wed, 17 Jul 2024 16:07:38 +0200 Subject: [PATCH 3/4] :bug: Fixing selected tab --- .../Elements/Tabs/HorizontalTab/index.tsx | 5 +++-- .../Elements/Tabs/VerticalTabs/index.tsx | 5 +++-- src/front/Components/Elements/Tabs/index.tsx | 14 +++++++++----- .../Components/Layouts/DesignSystem/index.tsx | 14 +++++++++++--- 4 files changed, 26 insertions(+), 12 deletions(-) diff --git a/src/front/Components/Elements/Tabs/HorizontalTab/index.tsx b/src/front/Components/Elements/Tabs/HorizontalTab/index.tsx index 3c0f46fa..198cd857 100644 --- a/src/front/Components/Elements/Tabs/HorizontalTab/index.tsx +++ b/src/front/Components/Elements/Tabs/HorizontalTab/index.tsx @@ -2,13 +2,14 @@ import { useCallback } from "react"; import classes from "./classes.module.scss"; import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; import useHoverable from "@Front/Hooks/useHoverable"; +import { ITabValue } from ".."; export type ITab = { label: React.ReactNode; }; export type IProps = { - onSelect: (value: T) => void; - value: T; + onSelect: (value: ITabValue) => void; + value: ITabValue; isSelected: boolean; } & ITab; diff --git a/src/front/Components/Elements/Tabs/VerticalTabs/index.tsx b/src/front/Components/Elements/Tabs/VerticalTabs/index.tsx index dc901e91..e54247bb 100644 --- a/src/front/Components/Elements/Tabs/VerticalTabs/index.tsx +++ b/src/front/Components/Elements/Tabs/VerticalTabs/index.tsx @@ -1,13 +1,14 @@ import { useCallback } from "react"; import classes from "./classes.module.scss"; import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; +import { ITabValue } from ".."; export type ITab = { label: React.ReactNode; }; export type IProps = { - onSelect: (value: T) => void; - value: T; + onSelect: (value: ITabValue) => void; + value: ITabValue; isSelected: boolean; } & ITab; diff --git a/src/front/Components/Elements/Tabs/index.tsx b/src/front/Components/Elements/Tabs/index.tsx index 08cc6438..bd5d04bd 100644 --- a/src/front/Components/Elements/Tabs/index.tsx +++ b/src/front/Components/Elements/Tabs/index.tsx @@ -6,9 +6,13 @@ import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Ty import { useDebounce, useWindowSize } from "@uidotdev/usehooks"; import useOpenable from "@Front/Hooks/useOpenable"; +export type ITabValue = T & { + id: unknown; +}; + type ITabInternal = ITab & { key?: string; - value: T; + value: ITabValue; }; type IProps = { @@ -22,7 +26,7 @@ export default function Tabs(props: IProps) { const [visibleElements, setVisibleElements] = useState[]>([]); const [overflowedElements, setOverflowedElements] = useState[]>([]); - const [selectedTab, setSelectedTab] = useState(props.tabs[0]!.value); + const [selectedTab, setSelectedTab] = useState>(props.tabs[0]!.value); const { close, isOpen, toggle } = useOpenable(); @@ -55,7 +59,7 @@ export default function Tabs(props: IProps) { }, [calculateVisibleElements, windowSizeDebounced]); const handleSelect = useCallback( - (value: T) => { + (value: ITabValue) => { setSelectedTab(value); onSelect(value); close(); @@ -72,7 +76,7 @@ export default function Tabs(props: IProps) { key={element.key ?? index} value={element.value} onSelect={handleSelect} - isSelected={selectedTab === element.value} + isSelected={element.value.id === selectedTab.id} /> ))}
@@ -84,7 +88,7 @@ export default function Tabs(props: IProps) { key={element.key ?? index} value={element.value} onSelect={handleSelect} - isSelected={selectedTab === element.value} + isSelected={element.value.id === selectedTab.id} /> ))}
diff --git a/src/front/Components/Layouts/DesignSystem/index.tsx b/src/front/Components/Layouts/DesignSystem/index.tsx index 93c99890..37d26764 100644 --- a/src/front/Components/Layouts/DesignSystem/index.tsx +++ b/src/front/Components/Layouts/DesignSystem/index.tsx @@ -8,7 +8,7 @@ import DefaultTemplate from "@Front/Components/LayoutTemplates/DefaultTemplate"; import classes from "./classes.module.scss"; import Tabs from "@Front/Components/Elements/Tabs"; -import { useCallback } from "react"; +import { useCallback, useState } from "react"; export default function DesignSystem() { const userDb = [ @@ -34,13 +34,17 @@ export default function DesignSystem() { }, ]; + const [selectedTab, setSelectedTab] = useState<(typeof userDb)[number]>(userDb[0]!); + const onSelect = useCallback((value: (typeof userDb)[number]) => { - console.log(value); + setSelectedTab(value); }, []); return ( + DesignSystem + Tabs tabs={userDb.map((user) => ({ label: user.username, @@ -49,8 +53,12 @@ export default function DesignSystem() { }))} onSelect={onSelect} /> +
+ + {selectedTab.id} - {selectedTab.username} + +
- DesignSystem
Circle Progress
From 34fbe78beb5c8490b89f6abf2a1988743b7df5de Mon Sep 17 00:00:00 2001 From: Max S Date: Wed, 17 Jul 2024 18:02:06 +0200 Subject: [PATCH 4/4] Refacto page: folder no-folder --- src/front/Assets/logo_small_blue.svg | 4 +- src/front/Assets/logo_standard_blue.svg | 26 ++++---- .../Components/DesignSystem/Button/index.tsx | 6 +- .../DesignSystem/DepositDocument/index.tsx | 6 +- .../DepositOtherDocument/index.tsx | 4 +- .../DesignSystem/DepositRib/index.tsx | 4 +- .../DesignSystem/Modal/Alert/index.tsx | 4 +- .../DesignSystem/Modal/Confirm/index.tsx | 8 +-- .../DesignSystem/Newsletter/index.tsx | 4 +- .../Table/MuiTable/classes.module.scss | 4 -- .../DesignSystem/Tag/classes.module.scss | 1 + .../Components/DesignSystem/Tag/index.tsx | 4 +- .../DesignSystem/Typography/index.tsx | 11 +++- .../DesignSystem/UserFolder/index.tsx | 4 +- .../Components/Elements/BackArrow/index.tsx | 4 +- .../DefaultCollaboratorDashboard/index.tsx | 4 +- .../DefaultDeedTypeDashboard/index.tsx | 4 +- .../DefaultDocumentTypesDashboard/index.tsx | 4 +- .../DefaultNotaryDashboard/index.tsx | 4 +- .../DefaultOfficeDashboard/index.tsx | 4 +- .../DefaultRoleDashboard/index.tsx | 4 +- .../DefaultUserDashboard/index.tsx | 4 +- .../Layouts/ClientDashboard/index.tsx | 4 +- .../Layouts/ClientDashboard/index2.tsx | 4 +- .../CollaboratorInformations/index.tsx | 4 +- .../DeedTypes/DeedTypesCreate/index.tsx | 4 +- .../Layouts/DeedTypes/DeedTypesEdit/index.tsx | 4 +- .../DeedTypes/DeedTypesInformations/index.tsx | 6 +- .../Components/Layouts/DesignSystem/index.tsx | 46 +++++++------- .../DocumentTypesCreate/index.tsx | 4 +- .../DocumentTypes/DocumentTypesEdit/index.tsx | 4 +- .../DocumentTypesInformations/index.tsx | 4 +- .../Folder/AddClientToFolder/index.tsx | 6 +- .../Layouts/Folder/AskDocuments/index.tsx | 6 +- .../Folder/CreateCustomerNote/index.tsx | 4 +- .../Layouts/Folder/UpdateClient/index.tsx | 6 +- .../Folder/UpdateCustomerNote/index.tsx | 4 +- .../UpdateFolderCollaborators/index.tsx | 4 +- .../Folder/UpdateFolderDescription/index.tsx | 4 +- .../Folder/UpdateFolderMetadata/index.tsx | 4 +- .../Layouts/Folder/ViewDocuments/index.tsx | 4 +- .../Layouts/Folder/classes.module.scss | 52 ++++++++++++++- src/front/Components/Layouts/Folder/index.tsx | 63 ++++++++++++++++++- .../FolderInformation/index.tsx | 8 +-- .../UpdateFolderMetadata/index.tsx | 4 +- src/front/Components/Layouts/Login/index.tsx | 4 +- .../Layouts/LoginCallback/index.tsx | 4 +- .../Layouts/LoginCallbackCustomer/index.tsx | 4 +- .../LoginCustomer/PasswordForgotten/index.tsx | 4 +- .../Layouts/LoginCustomer/StepEmail/index.tsx | 4 +- .../LoginCustomer/StepNewPassword/index.tsx | 4 +- .../LoginCustomer/StepPassword/index.tsx | 4 +- .../Layouts/LoginCustomer/StepTotp/index.tsx | 6 +- .../Components/Layouts/LoginHome/index.tsx | 4 +- src/front/Components/Layouts/Rib/index.tsx | 6 +- .../Layouts/Roles/RolesCreate/index.tsx | 4 +- .../SubscribeIllimityComponent/index.tsx | 4 +- .../SubscribeStandardComponent/index.tsx | 4 +- .../SubscriptionClientInfos/index.tsx | 2 +- .../SubscriptionManageCollaborators/index.tsx | 6 +- .../SubscriptionFacturation/index.tsx | 14 ++--- .../Subscription/SubscriptionInvite/index.tsx | 4 +- .../Layouts/Users/UserInformations/index.tsx | 4 +- 63 files changed, 287 insertions(+), 174 deletions(-) diff --git a/src/front/Assets/logo_small_blue.svg b/src/front/Assets/logo_small_blue.svg index a52c0ab4..d3ac57f9 100644 --- a/src/front/Assets/logo_small_blue.svg +++ b/src/front/Assets/logo_small_blue.svg @@ -1,4 +1,4 @@ - - + + diff --git a/src/front/Assets/logo_standard_blue.svg b/src/front/Assets/logo_standard_blue.svg index 2095bba7..a4af4bde 100644 --- a/src/front/Assets/logo_standard_blue.svg +++ b/src/front/Assets/logo_standard_blue.svg @@ -1,15 +1,15 @@ - - - - - - - - - - - - - + + + + + + + + + + + + + diff --git a/src/front/Components/DesignSystem/Button/index.tsx b/src/front/Components/DesignSystem/Button/index.tsx index 4c2e7baa..286e0d39 100644 --- a/src/front/Components/DesignSystem/Button/index.tsx +++ b/src/front/Components/DesignSystem/Button/index.tsx @@ -4,7 +4,7 @@ import React, { CSSProperties } from "react"; import classes from "./classes.module.scss"; import classNames from "classnames"; -export enum EButtonVariant { +export enum EButtonColor { PRIMARY = "primary", SECONDARY = "secondary", NEUTRAL = "neutral", @@ -29,7 +29,7 @@ export enum EButtonStyleType { type IProps = { onClick?: React.MouseEventHandler | undefined; children?: React.ReactNode; - variant?: EButtonVariant; + variant?: EButtonColor; size?: EButtonSize; styleType?: EButtonStyleType; fullwidth?: boolean; @@ -44,7 +44,7 @@ type IProps = { export default function Button(props: IProps) { let { - variant = EButtonVariant.PRIMARY, + variant = EButtonColor.PRIMARY, size = EButtonSize.LG, styleType = EButtonStyleType.CONTAINED, disabled = false, diff --git a/src/front/Components/DesignSystem/DepositDocument/index.tsx b/src/front/Components/DesignSystem/DepositDocument/index.tsx index 1a4f48b9..193d1227 100644 --- a/src/front/Components/DesignSystem/DepositDocument/index.tsx +++ b/src/front/Components/DesignSystem/DepositDocument/index.tsx @@ -5,7 +5,7 @@ import DocumentCheckIcon from "@Assets/Icons/document-check.svg"; import Image from "next/image"; import React from "react"; -import Button, { EButtonStyleType, EButtonVariant } from "../Button"; +import Button, { EButtonStyleType, EButtonColor } from "../Button"; import Tooltip from "../ToolTip"; import Typography, { ETypo, ETypoColor } from "../Typography"; import classes from "./classes.module.scss"; @@ -191,7 +191,7 @@ export default class DepositDocument extends React.Component { {this.props.document.document_status !== EDocumentStatus.VALIDATED && (
diff --git a/src/front/Components/DesignSystem/Modal/Confirm/index.tsx b/src/front/Components/DesignSystem/Modal/Confirm/index.tsx index 06e394a7..1e3c7639 100644 --- a/src/front/Components/DesignSystem/Modal/Confirm/index.tsx +++ b/src/front/Components/DesignSystem/Modal/Confirm/index.tsx @@ -2,7 +2,7 @@ import Link from "next/link"; import React from "react"; import Modal, { IProps as IPropsModal } from ".."; -import Button, { EButtonStyleType, EButtonVariant } from "../../Button"; +import Button, { EButtonStyleType, EButtonColor } from "../../Button"; import classes from "./classes.module.scss"; type IProps = IPropsModal & { @@ -47,14 +47,14 @@ export default class Confirm extends React.Component { {this.props.showCancelButton && (this.props.cancelPath ? ( - ) : (
))}
-
diff --git a/src/front/Components/DesignSystem/Newsletter/index.tsx b/src/front/Components/DesignSystem/Newsletter/index.tsx index 794433c6..22749f0c 100644 --- a/src/front/Components/DesignSystem/Newsletter/index.tsx +++ b/src/front/Components/DesignSystem/Newsletter/index.tsx @@ -1,7 +1,7 @@ import React from "react"; import classes from "./classes.module.scss"; import TextField from "../Form/TextField"; -import Button, { EButtonVariant } from "../Button"; +import Button, { EButtonColor } from "../Button"; import Typography, { ETypo, ETypoColor } from "../Typography"; import Mailchimp from "@Front/Api/LeCoffreApi/Notary/Mailchimp/Mailchimp"; import Form from "../Form"; @@ -96,7 +96,7 @@ export default class Newsletter extends React.Component {
-
diff --git a/src/front/Components/DesignSystem/Table/MuiTable/classes.module.scss b/src/front/Components/DesignSystem/Table/MuiTable/classes.module.scss index a97f961c..1348e460 100644 --- a/src/front/Components/DesignSystem/Table/MuiTable/classes.module.scss +++ b/src/front/Components/DesignSystem/Table/MuiTable/classes.module.scss @@ -27,10 +27,6 @@ max-width: 270px; width: 100%; word-break: break-word; - - > :first-child { - width: 80%; - } } } diff --git a/src/front/Components/DesignSystem/Tag/classes.module.scss b/src/front/Components/DesignSystem/Tag/classes.module.scss index 9c206676..651f6877 100644 --- a/src/front/Components/DesignSystem/Tag/classes.module.scss +++ b/src/front/Components/DesignSystem/Tag/classes.module.scss @@ -1,6 +1,7 @@ @import "@Themes/constants.scss"; .root { + width: fit-content; padding: 2px 8px; border-radius: 360px; diff --git a/src/front/Components/DesignSystem/Tag/index.tsx b/src/front/Components/DesignSystem/Tag/index.tsx index 7df7faa4..090a90fd 100644 --- a/src/front/Components/DesignSystem/Tag/index.tsx +++ b/src/front/Components/DesignSystem/Tag/index.tsx @@ -19,7 +19,7 @@ export enum ETagVariant { type IProps = { label: string; color: ETagColor; - variant: ETagVariant; + variant?: ETagVariant; className?: string; }; @@ -36,7 +36,7 @@ const typoMap: Record = { }; export default function Tag(props: IProps) { - const { className, label, color, variant } = props; + const { className, label, color, variant = ETagVariant.REGULAR } = props; return (
diff --git a/src/front/Components/DesignSystem/Typography/index.tsx b/src/front/Components/DesignSystem/Typography/index.tsx index 04349b33..ffe41e28 100644 --- a/src/front/Components/DesignSystem/Typography/index.tsx +++ b/src/front/Components/DesignSystem/Typography/index.tsx @@ -8,6 +8,7 @@ type IProps = { color?: ETypoColor; className?: string; title?: string; + type?: "div" | "span"; }; export enum ETypo { @@ -142,10 +143,18 @@ export enum ETypoColor { } export default function Typography(props: IProps) { - const { typo, color, className, title, children } = props; + const { typo, color, className, title, children, type = "div" } = props; const style = color ? ({ "--data-color": `var(${color})` } as React.CSSProperties) : undefined; + if (type === "span") { + return ( + + {children} + + ); + } + return (
{children} diff --git a/src/front/Components/DesignSystem/UserFolder/index.tsx b/src/front/Components/DesignSystem/UserFolder/index.tsx index cb1ea3bb..ea594fe6 100644 --- a/src/front/Components/DesignSystem/UserFolder/index.tsx +++ b/src/front/Components/DesignSystem/UserFolder/index.tsx @@ -10,7 +10,7 @@ import Image from "next/image"; import Link from "next/link"; import React from "react"; -import Button, { EButtonStyleType, EButtonVariant } from "../Button"; +import Button, { EButtonStyleType, EButtonColor } from "../Button"; import Confirm from "../Modal/Confirm"; import QuantityProgressBar from "../QuantityProgressBar"; import classes from "./classes.module.scss"; @@ -138,7 +138,7 @@ export default class UserFolder extends React.Component { {!this.props.isArchived && this.props.anchorStatus === AnchorStatus.NOT_ANCHORED && (
- diff --git a/src/front/Components/Elements/BackArrow/index.tsx b/src/front/Components/Elements/BackArrow/index.tsx index d075a098..5a8c9351 100644 --- a/src/front/Components/Elements/BackArrow/index.tsx +++ b/src/front/Components/Elements/BackArrow/index.tsx @@ -1,5 +1,5 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import { NextRouter, useRouter } from "next/router"; import React from "react"; @@ -24,7 +24,7 @@ class BackArrowClass extends React.Component { icon={ChevronIcon} iconposition={"left"} iconstyle={{ transform: "rotate(180deg)", width: "22px", height: "22px" }} - variant={EButtonVariant.PRIMARY} + variant={EButtonColor.PRIMARY} styleType={EButtonStyleType.TEXT} onClick={this.handleClick}> Retour diff --git a/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx index 26cbc385..7c318345 100644 --- a/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultCollaboratorDashboard/index.tsx @@ -1,6 +1,6 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; import Users, { IGetUsersparams } from "@Front/Api/LeCoffreApi/Admin/Users/Users"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Header from "@Front/Components/DesignSystem/Header"; import Version from "@Front/Components/DesignSystem/Version"; import BackArrow from "@Front/Components/Elements/BackArrow"; @@ -72,7 +72,7 @@ export default class DefaultCollaboratorDashboard extends React.Component {this.props.mobileBackText ?? "Retour"} diff --git a/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/index.tsx index d7ebc0e8..b6389cd3 100644 --- a/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultDeedTypeDashboard/index.tsx @@ -1,6 +1,6 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; import DeedTypes, { IGetDeedTypesParams } from "@Front/Api/LeCoffreApi/Notary/DeedTypes/DeedTypes"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Header from "@Front/Components/DesignSystem/Header"; import Version from "@Front/Components/DesignSystem/Version"; import BackArrow from "@Front/Components/Elements/BackArrow"; @@ -71,7 +71,7 @@ export default class DefaultDeedTypesDashboard extends React.Component {this.props.mobileBackText ?? "Retour"} diff --git a/src/front/Components/LayoutTemplates/DefaultDocumentTypesDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultDocumentTypesDashboard/index.tsx index c5b976a5..ab5b0bcb 100644 --- a/src/front/Components/LayoutTemplates/DefaultDocumentTypesDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultDocumentTypesDashboard/index.tsx @@ -1,6 +1,6 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; import DocumentTypes from "@Front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Header from "@Front/Components/DesignSystem/Header"; import Version from "@Front/Components/DesignSystem/Version"; import BackArrow from "@Front/Components/Elements/BackArrow"; @@ -72,7 +72,7 @@ export default class DefaultDocumentTypesDashboard extends React.Component {this.props.mobileBackText ?? "Retour"} diff --git a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx index c8a0fee7..f787b1e0 100644 --- a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx @@ -1,6 +1,6 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; import Folders, { IGetFoldersParams } from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import FolderListContainer from "@Front/Components/DesignSystem/FolderListContainer"; import FolderArchivedListContainer from "@Front/Components/DesignSystem/FolderArchivedListContainer"; import Header from "@Front/Components/DesignSystem/Header"; @@ -88,7 +88,7 @@ export default class DefaultNotaryDashboard extends React.Component {this.props.mobileBackText ?? "Retour"} diff --git a/src/front/Components/LayoutTemplates/DefaultOfficeDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultOfficeDashboard/index.tsx index 3344e843..a39e7aec 100644 --- a/src/front/Components/LayoutTemplates/DefaultOfficeDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultOfficeDashboard/index.tsx @@ -1,6 +1,6 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; import Offices from "@Front/Api/LeCoffreApi/SuperAdmin/Offices/Offices"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Header from "@Front/Components/DesignSystem/Header"; import Version from "@Front/Components/DesignSystem/Version"; import BackArrow from "@Front/Components/Elements/BackArrow"; @@ -69,7 +69,7 @@ export default class DefaultOfficeDashboard extends React.Component {this.props.mobileBackText ?? "Retour"} diff --git a/src/front/Components/LayoutTemplates/DefaultRoleDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultRoleDashboard/index.tsx index 55183c54..a10e04fa 100644 --- a/src/front/Components/LayoutTemplates/DefaultRoleDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultRoleDashboard/index.tsx @@ -1,6 +1,6 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; import OfficeRoles, { IGetRolesParams } from "@Front/Api/LeCoffreApi/Admin/OfficeRoles/OfficeRoles"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Header from "@Front/Components/DesignSystem/Header"; import Version from "@Front/Components/DesignSystem/Version"; import BackArrow from "@Front/Components/Elements/BackArrow"; @@ -69,7 +69,7 @@ export default class DefaultRoleDashboard extends React.Component {this.props.mobileBackText ?? "Retour"} diff --git a/src/front/Components/LayoutTemplates/DefaultUserDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultUserDashboard/index.tsx index bf3f4509..04c7a615 100644 --- a/src/front/Components/LayoutTemplates/DefaultUserDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultUserDashboard/index.tsx @@ -1,6 +1,6 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; import Users, { IGetUsersparams } from "@Front/Api/LeCoffreApi/SuperAdmin/Users/Users"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Header from "@Front/Components/DesignSystem/Header"; import Version from "@Front/Components/DesignSystem/Version"; import BackArrow from "@Front/Components/Elements/BackArrow"; @@ -69,7 +69,7 @@ export default class DefaultUserDashboard extends React.Component {this.props.mobileBackText ?? "Retour"} diff --git a/src/front/Components/Layouts/ClientDashboard/index.tsx b/src/front/Components/Layouts/ClientDashboard/index.tsx index 768c509a..04f384ec 100644 --- a/src/front/Components/Layouts/ClientDashboard/index.tsx +++ b/src/front/Components/Layouts/ClientDashboard/index.tsx @@ -1,6 +1,6 @@ "use client"; import Documents, { IGetDocumentsparams } from "@Front/Api/LeCoffreApi/Customer/Documents/Documents"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import DepositDocument from "@Front/Components/DesignSystem/DepositDocument"; import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; import DefaultTemplate from "@Front/Components/LayoutTemplates/DefaultTemplate"; @@ -224,7 +224,7 @@ export default function ClientDashboard(props: IProps) { Vous souhaitez envoyer d'autres documents à votre notaire ? diff --git a/src/front/Components/Layouts/DeedTypes/DeedTypesCreate/index.tsx b/src/front/Components/Layouts/DeedTypes/DeedTypesCreate/index.tsx index b5c3c7bf..645b3c24 100644 --- a/src/front/Components/Layouts/DeedTypes/DeedTypesCreate/index.tsx +++ b/src/front/Components/Layouts/DeedTypes/DeedTypesCreate/index.tsx @@ -1,5 +1,5 @@ import DeedTypes from "@Front/Api/LeCoffreApi/Admin/DeedTypes/DeedTypes"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; @@ -101,7 +101,7 @@ export default function DeedTypesCreate(props: IProps) { validationError={validationError.find((error) => error.property === "description")} />
- diff --git a/src/front/Components/Layouts/DeedTypes/DeedTypesEdit/index.tsx b/src/front/Components/Layouts/DeedTypes/DeedTypesEdit/index.tsx index 9a442889..c9b63d71 100644 --- a/src/front/Components/Layouts/DeedTypes/DeedTypesEdit/index.tsx +++ b/src/front/Components/Layouts/DeedTypes/DeedTypesEdit/index.tsx @@ -1,5 +1,5 @@ import DeedTypes from "@Front/Api/LeCoffreApi/Admin/DeedTypes/DeedTypes"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; @@ -119,7 +119,7 @@ export default function DeedTypesEdit() { validationError={validationError.find((error) => error.property === "description")} />
- diff --git a/src/front/Components/Layouts/DeedTypes/DeedTypesInformations/index.tsx b/src/front/Components/Layouts/DeedTypes/DeedTypesInformations/index.tsx index b032cd01..2b877268 100644 --- a/src/front/Components/Layouts/DeedTypes/DeedTypesInformations/index.tsx +++ b/src/front/Components/Layouts/DeedTypes/DeedTypesInformations/index.tsx @@ -2,7 +2,7 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; import PenICon from "@Assets/Icons/pen.svg"; import DeedTypes from "@Front/Api/LeCoffreApi/Admin/DeedTypes/DeedTypes"; import DocumentTypes from "@Front/Api/LeCoffreApi/Admin/DocumentTypes/DocumentTypes"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; @@ -123,7 +123,7 @@ export default function DeedTypesInformations(props: IProps) {
Paramétrage des listes de pièces - @@ -174,7 +174,7 @@ export default function DeedTypesInformations(props: IProps) {
-
diff --git a/src/front/Components/Layouts/DesignSystem/index.tsx b/src/front/Components/Layouts/DesignSystem/index.tsx index c8d45fe9..d1eb4f8f 100644 --- a/src/front/Components/Layouts/DesignSystem/index.tsx +++ b/src/front/Components/Layouts/DesignSystem/index.tsx @@ -1,4 +1,4 @@ -import Button, { EButtonSize, EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonSize, EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import CircleProgress from "@Front/Components/DesignSystem/CircleProgress"; import Newsletter from "@Front/Components/DesignSystem/Newsletter"; import Table from "@Front/Components/DesignSystem/Table"; @@ -61,7 +61,7 @@ export default function DesignSystem() { name: "Doe", firstname: "John", button: ( - ), @@ -83,65 +83,65 @@ export default function DesignSystem() { Buttons
- - + -
- - + -
- - + -
- - + -
- - + -
- - + -
- - + -
diff --git a/src/front/Components/Layouts/DocumentTypes/DocumentTypesCreate/index.tsx b/src/front/Components/Layouts/DocumentTypes/DocumentTypesCreate/index.tsx index 824176c7..89154830 100644 --- a/src/front/Components/Layouts/DocumentTypes/DocumentTypesCreate/index.tsx +++ b/src/front/Components/Layouts/DocumentTypes/DocumentTypesCreate/index.tsx @@ -1,5 +1,5 @@ import DocumentTypes from "@Front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; @@ -71,7 +71,7 @@ export default function DocumentTypesCreate(props: IProps) { validationError={validationError.find((error) => error.property === "public_description")} />
- diff --git a/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx b/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx index 1c7c23de..262f1545 100644 --- a/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx +++ b/src/front/Components/Layouts/DocumentTypes/DocumentTypesEdit/index.tsx @@ -1,5 +1,5 @@ import DocumentTypes from "@Front/Api/LeCoffreApi/Notary/DocumentTypes/DocumentTypes"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; @@ -91,7 +91,7 @@ export default function DocumentTypesEdit() { validationError={validationError.find((error) => error.property === "public_description")} />
- diff --git a/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx b/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx index 778d5812..3b3ed1ff 100644 --- a/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx +++ b/src/front/Components/Layouts/DocumentTypes/DocumentTypesInformations/index.tsx @@ -11,7 +11,7 @@ import { useRouter } from "next/router"; import { useEffect, useState } from "react"; import classes from "./classes.module.scss"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; export default function DocumentTypesInformations() { const router = useRouter(); @@ -38,7 +38,7 @@ export default function DocumentTypesInformations() {
Paramétrage des listes de pièces - diff --git a/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx b/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx index bbc01d05..cbaafbcc 100644 --- a/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx +++ b/src/front/Components/Layouts/Folder/AddClientToFolder/index.tsx @@ -1,6 +1,6 @@ import Customers from "@Front/Api/LeCoffreApi/Notary/Customers/Customers"; import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; import MultiSelect from "@Front/Components/DesignSystem/MultiSelect"; @@ -99,7 +99,7 @@ class AddClientToFolderClass extends BasePage { />
- @@ -134,7 +134,7 @@ class AddClientToFolderClass extends BasePage { />
- diff --git a/src/front/Components/Layouts/Folder/AskDocuments/index.tsx b/src/front/Components/Layouts/Folder/AskDocuments/index.tsx index 1261b148..f4b651d6 100644 --- a/src/front/Components/Layouts/Folder/AskDocuments/index.tsx +++ b/src/front/Components/Layouts/Folder/AskDocuments/index.tsx @@ -1,7 +1,7 @@ import PlusIcon from "@Assets/Icons/plus.svg"; import Documents from "@Front/Api/LeCoffreApi/Notary/Documents/Documents"; import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import CheckBox from "@Front/Components/DesignSystem/CheckBox"; import Form from "@Front/Components/DesignSystem/Form"; import { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; @@ -78,7 +78,7 @@ class AskDocumentsClass extends BasePage { icon={PlusIcon} iconposition={"right"} iconstyle={{ transform: "rotate(180deg)", width: "22px", height: "22px" }} - variant={EButtonVariant.PRIMARY} + variant={EButtonColor.PRIMARY} styleType={EButtonStyleType.TEXT} onClick={this.openModal}> Ajouter un document @@ -86,7 +86,7 @@ class AskDocumentsClass extends BasePage {
- diff --git a/src/front/Components/Layouts/Folder/CreateCustomerNote/index.tsx b/src/front/Components/Layouts/Folder/CreateCustomerNote/index.tsx index 53cb39ac..8c255223 100644 --- a/src/front/Components/Layouts/Folder/CreateCustomerNote/index.tsx +++ b/src/front/Components/Layouts/Folder/CreateCustomerNote/index.tsx @@ -1,4 +1,4 @@ -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; import Typography, { ETypo } from "@Front/Components/DesignSystem/Typography"; @@ -63,7 +63,7 @@ class CreateCustomerNoteClass extends BasePage {
- diff --git a/src/front/Components/Layouts/Folder/UpdateClient/index.tsx b/src/front/Components/Layouts/Folder/UpdateClient/index.tsx index a22ba91d..d03d1828 100644 --- a/src/front/Components/Layouts/Folder/UpdateClient/index.tsx +++ b/src/front/Components/Layouts/Folder/UpdateClient/index.tsx @@ -1,5 +1,5 @@ import Customers from "@Front/Api/LeCoffreApi/Notary/Customers/Customers"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; @@ -130,13 +130,13 @@ class UpdateClientClass extends BasePage {
{!this.doesInputsHaveValues() ? ( - ) : ( diff --git a/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx b/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx index 633bfcd7..1758acc9 100644 --- a/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx +++ b/src/front/Components/Layouts/Folder/UpdateFolderCollaborators/index.tsx @@ -1,6 +1,6 @@ import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; import Users, { IGetUsersParams } from "@Front/Api/LeCoffreApi/Notary/Users/Users"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; import MultiSelect from "@Front/Components/DesignSystem/MultiSelect"; @@ -105,7 +105,7 @@ class UpdateFolderCollaboratorsClass extends BasePage {
- diff --git a/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx b/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx index 7cde1e44..c21b3863 100644 --- a/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx +++ b/src/front/Components/Layouts/Folder/UpdateFolderDescription/index.tsx @@ -1,5 +1,5 @@ import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextAreaField from "@Front/Components/DesignSystem/Form/TextareaField"; import Typography, { ETypo } from "@Front/Components/DesignSystem/Typography"; @@ -54,7 +54,7 @@ class UpdateFolderDescriptionClass extends BasePage {
- diff --git a/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx b/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx index 0667f6a8..9b0d10f6 100644 --- a/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx +++ b/src/front/Components/Layouts/Folder/UpdateFolderMetadata/index.tsx @@ -1,5 +1,5 @@ import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import Select, { IOption } from "@Front/Components/DesignSystem/Form/SelectField"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; @@ -77,7 +77,7 @@ class UpdateFolderMetadataClass extends BasePage {
- diff --git a/src/front/Components/Layouts/Folder/ViewDocuments/index.tsx b/src/front/Components/Layouts/Folder/ViewDocuments/index.tsx index 3de0979e..816b18b6 100644 --- a/src/front/Components/Layouts/Folder/ViewDocuments/index.tsx +++ b/src/front/Components/Layouts/Folder/ViewDocuments/index.tsx @@ -1,7 +1,7 @@ import LeftArrowIcon from "@Assets/Icons/left-arrow.svg"; import RightArrowIcon from "@Assets/Icons/right-arrow.svg"; import Documents from "@Front/Api/LeCoffreApi/Notary/Documents/Documents"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import FilePreview from "@Front/Components/DesignSystem/FilePreview"; import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; @@ -118,7 +118,7 @@ class ViewDocumentsClass extends BasePage { {this.state.document?.document_status === EDocumentStatus.DEPOSITED && ( <> + +
+ +
+
+ Besoin d'aide ? + Consultez nos guides pour bien démarrer. + +
+
+ +
+ Vous avez des questions ? + Notre équipe de support est là pour vous aider. + +
+
+
+
); } diff --git a/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx b/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx index 216d4f0f..772c39a4 100644 --- a/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx @@ -1,6 +1,6 @@ import ChevronIcon from "@Assets/Icons/chevron.svg"; import Folders from "@Front/Api/LeCoffreApi/Notary/Folders/Folders"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import FolderBoxInformation, { EFolderBoxInformationType } from "@Front/Components/DesignSystem/FolderBoxInformation"; import QuantityProgressBar from "@Front/Components/DesignSystem/QuantityProgressBar"; import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; @@ -66,7 +66,7 @@ class FolderInformationClass extends BasePage { Informations du dossier
- @@ -116,14 +116,14 @@ class FolderInformationClass extends BasePage {
{this.props.isAnchored === AnchorStatus.VERIFIED_ON_CHAIN && ( diff --git a/src/front/Components/Layouts/Login/index.tsx b/src/front/Components/Layouts/Login/index.tsx index 8243bab6..98363c06 100644 --- a/src/front/Components/Layouts/Login/index.tsx +++ b/src/front/Components/Layouts/Login/index.tsx @@ -1,6 +1,6 @@ import CoffreIcon from "@Assets/Icons/coffre.svg"; import idNoteLogo from "@Assets/Icons/id-note-logo.svg"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Typography, { ETypo } from "@Front/Components/DesignSystem/Typography"; import DefaultDoubleSidePage from "@Front/Components/LayoutTemplates/DefaultDoubleSidePage"; import Image from "next/image"; @@ -65,7 +65,7 @@ export default function Login() {
Vous n'arrivez pas à vous connecter ?
- diff --git a/src/front/Components/Layouts/LoginCallback/index.tsx b/src/front/Components/Layouts/LoginCallback/index.tsx index c77340e6..233ab31d 100644 --- a/src/front/Components/Layouts/LoginCallback/index.tsx +++ b/src/front/Components/Layouts/LoginCallback/index.tsx @@ -8,7 +8,7 @@ import Module from "@Front/Config/Module"; import Auth from "@Front/Api/Auth/IdNot"; import DefaultDoubleSidePage from "@Front/Components/LayoutTemplates/DefaultDoubleSidePage"; import Typography, { ETypo } from "@Front/Components/DesignSystem/Typography"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Loader from "@Front/Components/DesignSystem/Loader"; import UserStore from "@Front/Stores/UserStore"; import Link from "next/link"; @@ -73,7 +73,7 @@ export default function LoginCallBack() {
Vous n'arrivez pas à vous connecter ?
- diff --git a/src/front/Components/Layouts/LoginCallbackCustomer/index.tsx b/src/front/Components/Layouts/LoginCallbackCustomer/index.tsx index 408923c4..7e8b1362 100644 --- a/src/front/Components/Layouts/LoginCallbackCustomer/index.tsx +++ b/src/front/Components/Layouts/LoginCallbackCustomer/index.tsx @@ -6,7 +6,7 @@ import React, { useEffect } from "react"; import classes from "./classes.module.scss"; import DefaultDoubleSidePage from "@Front/Components/LayoutTemplates/DefaultDoubleSidePage"; import Typography, { ETypo } from "@Front/Components/DesignSystem/Typography"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Loader from "@Front/Components/DesignSystem/Loader"; import Customers, { ICustomerTokens } from "@Front/Api/Auth/Id360/Customers/Customers"; import CustomerStore from "@Front/Stores/CustomerStore"; @@ -59,7 +59,7 @@ export default function LoginCallBackCustomer() {
Vous n'arrivez pas à vous connecter ?
- diff --git a/src/front/Components/Layouts/LoginCustomer/PasswordForgotten/index.tsx b/src/front/Components/Layouts/LoginCustomer/PasswordForgotten/index.tsx index 074ee9ee..847b841c 100644 --- a/src/front/Components/Layouts/LoginCustomer/PasswordForgotten/index.tsx +++ b/src/front/Components/Layouts/LoginCustomer/PasswordForgotten/index.tsx @@ -3,7 +3,7 @@ import classes from "./classes.module.scss"; import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; import Form from "@Front/Components/DesignSystem/Form"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; -import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonColor } from "@Front/Components/DesignSystem/Button"; import { ValidationError } from "class-validator"; type IProps = { onSubmit: (e: React.FormEvent | null, values: { [key: string]: string }) => void; @@ -34,7 +34,7 @@ export default function PasswordForgotten(props: IProps) { validationError={validationErrors.find((error) => error.property === "confirm_password")} password /> - diff --git a/src/front/Components/Layouts/LoginCustomer/StepEmail/index.tsx b/src/front/Components/Layouts/LoginCustomer/StepEmail/index.tsx index 262ea9ff..fc87fe8d 100644 --- a/src/front/Components/Layouts/LoginCustomer/StepEmail/index.tsx +++ b/src/front/Components/Layouts/LoginCustomer/StepEmail/index.tsx @@ -4,7 +4,7 @@ import Typography, { ETypo } from "@Front/Components/DesignSystem/Typography"; //import Image from "next/image"; import Form from "@Front/Components/DesignSystem/Form"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; -import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonColor } from "@Front/Components/DesignSystem/Button"; //import franceConnectLogo from "../france-connect.svg"; // import { useRouter } from "next/router"; // import Customers from "@Front/Api/Auth/Id360/Customers/Customers"; @@ -49,7 +49,7 @@ export default function StepEmail(props: IProps) { name="email" validationError={validationErrors.find((error) => error.property === "email")} /> - diff --git a/src/front/Components/Layouts/LoginCustomer/StepNewPassword/index.tsx b/src/front/Components/Layouts/LoginCustomer/StepNewPassword/index.tsx index 94ba48c3..ff11d07d 100644 --- a/src/front/Components/Layouts/LoginCustomer/StepNewPassword/index.tsx +++ b/src/front/Components/Layouts/LoginCustomer/StepNewPassword/index.tsx @@ -3,7 +3,7 @@ import classes from "./classes.module.scss"; import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; import Form from "@Front/Components/DesignSystem/Form"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; -import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonColor } from "@Front/Components/DesignSystem/Button"; import { ValidationError } from "class-validator"; type IProps = { onSubmit: (e: React.FormEvent | null, values: { [key: string]: string }) => void; @@ -34,7 +34,7 @@ export default function StepNewPassword(props: IProps) { validationError={validationErrors.find((error) => error.property === "confirm_password")} password /> - diff --git a/src/front/Components/Layouts/LoginCustomer/StepPassword/index.tsx b/src/front/Components/Layouts/LoginCustomer/StepPassword/index.tsx index e1f9543e..f299a4d4 100644 --- a/src/front/Components/Layouts/LoginCustomer/StepPassword/index.tsx +++ b/src/front/Components/Layouts/LoginCustomer/StepPassword/index.tsx @@ -3,7 +3,7 @@ import classes from "./classes.module.scss"; import Typography, { ETypo } from "@Front/Components/DesignSystem/Typography"; import Form from "@Front/Components/DesignSystem/Form"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; -import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonColor } from "@Front/Components/DesignSystem/Button"; import { ValidationError } from "class-validator"; import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; type IProps = { @@ -46,7 +46,7 @@ export default function StepPassword(props: IProps) { Mot de passe oublié ?
- diff --git a/src/front/Components/Layouts/LoginCustomer/StepTotp/index.tsx b/src/front/Components/Layouts/LoginCustomer/StepTotp/index.tsx index fd8e80a8..5ce0954d 100644 --- a/src/front/Components/Layouts/LoginCustomer/StepTotp/index.tsx +++ b/src/front/Components/Layouts/LoginCustomer/StepTotp/index.tsx @@ -3,7 +3,7 @@ import classes from "./classes.module.scss"; import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Typography"; import Form from "@Front/Components/DesignSystem/Form"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import { ValidationError } from "class-validator"; type IProps = { onSubmit: (e: React.FormEvent | null, values: { [key: string]: string }) => void; @@ -48,14 +48,14 @@ export default function StepTotp(props: IProps) { name="totpCode" validationError={validationErrors.find((error) => error.property === "totpCode")} /> -
Vous n'avez rien reçu ?
- diff --git a/src/front/Components/Layouts/Rib/index.tsx b/src/front/Components/Layouts/Rib/index.tsx index 6967e9e6..7b6156fd 100644 --- a/src/front/Components/Layouts/Rib/index.tsx +++ b/src/front/Components/Layouts/Rib/index.tsx @@ -3,7 +3,7 @@ import Typography, { ETypo, ETypoColor } from "@Front/Components/DesignSystem/Ty import classes from "./classes.module.scss"; import DefaultTemplate from "@Front/Components/LayoutTemplates/DefaultTemplate"; import FilePreview from "@Front/Components/DesignSystem/FilePreview"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import { useRouter } from "next/router"; import OfficeRib from "@Front/Api/LeCoffreApi/Notary/OfficeRib/OfficeRib"; import DepositRib from "@Front/Components/DesignSystem/DepositRib"; @@ -130,10 +130,10 @@ export default function Rib() {
- - diff --git a/src/front/Components/Layouts/Roles/RolesCreate/index.tsx b/src/front/Components/Layouts/Roles/RolesCreate/index.tsx index c98a7c8e..b8d367a8 100644 --- a/src/front/Components/Layouts/Roles/RolesCreate/index.tsx +++ b/src/front/Components/Layouts/Roles/RolesCreate/index.tsx @@ -1,5 +1,5 @@ import OfficeRoles from "@Front/Api/LeCoffreApi/Admin/OfficeRoles/OfficeRoles"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import Form from "@Front/Components/DesignSystem/Form"; import TextField from "@Front/Components/DesignSystem/Form/TextField"; import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; @@ -100,7 +100,7 @@ export default function RolesCreate(props: IProps) { validationError={validationError.find((error) => error.property === "name")} />
- diff --git a/src/front/Components/Layouts/Subscription/Components/SubscribeIllimityComponent/index.tsx b/src/front/Components/Layouts/Subscription/Components/SubscribeIllimityComponent/index.tsx index 9c3bcd2c..b5fd0dbf 100644 --- a/src/front/Components/Layouts/Subscription/Components/SubscribeIllimityComponent/index.tsx +++ b/src/front/Components/Layouts/Subscription/Components/SubscribeIllimityComponent/index.tsx @@ -6,7 +6,7 @@ import SubscribeCheckoutTicket, { EPaymentFrequencyFront as EPaymentFrequency } import { EForfeitType, forfeitsPrices } from "../../SubscriptionFacturation"; import { useEffect, useState } from "react"; import Check from "@Front/Components/Elements/Icons/Check"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import RadioBox from "@Front/Components/DesignSystem/RadioBox"; import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; import useOpenable from "@Front/Hooks/useOpenable"; @@ -135,7 +135,7 @@ export default function SubscribeIllimityComponent({ hasNavTab = true }: IProps)
-
diff --git a/src/front/Components/Layouts/Subscription/Components/SubscribeStandardComponent/index.tsx b/src/front/Components/Layouts/Subscription/Components/SubscribeStandardComponent/index.tsx index c62048d6..cdd7bb0f 100644 --- a/src/front/Components/Layouts/Subscription/Components/SubscribeStandardComponent/index.tsx +++ b/src/front/Components/Layouts/Subscription/Components/SubscribeStandardComponent/index.tsx @@ -7,7 +7,7 @@ import SubscribeCheckoutTicket, { EPaymentFrequencyFront as EPaymentFrequency } import { EForfeitType, collaboratorPrice, forfeitsPrices } from "../../SubscriptionFacturation"; import { useEffect, useState } from "react"; import Check from "@Front/Components/Elements/Icons/Check"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import RadioBox from "@Front/Components/DesignSystem/RadioBox"; import Confirm from "@Front/Components/DesignSystem/Modal/Confirm"; import useOpenable from "@Front/Hooks/useOpenable"; @@ -130,7 +130,7 @@ export default function SubscribeStandardComponent({ hasNavTab = true }: IProps)
-
diff --git a/src/front/Components/Layouts/Subscription/Components/SubscriptionClientInfos/index.tsx b/src/front/Components/Layouts/Subscription/Components/SubscriptionClientInfos/index.tsx index 74959d00..a030e002 100644 --- a/src/front/Components/Layouts/Subscription/Components/SubscriptionClientInfos/index.tsx +++ b/src/front/Components/Layouts/Subscription/Components/SubscriptionClientInfos/index.tsx @@ -16,7 +16,7 @@ export default function SubscriptionClientInfos(props: IProps) { {customer.email} - {/* + {/* Adresse de facturation */} diff --git a/src/front/Components/Layouts/Subscription/Manage/SubscriptionManageCollaborators/index.tsx b/src/front/Components/Layouts/Subscription/Manage/SubscriptionManageCollaborators/index.tsx index 7ddd1ebf..26a225f5 100644 --- a/src/front/Components/Layouts/Subscription/Manage/SubscriptionManageCollaborators/index.tsx +++ b/src/front/Components/Layouts/Subscription/Manage/SubscriptionManageCollaborators/index.tsx @@ -3,7 +3,7 @@ import classes from "./classes.module.scss"; import DefaultTemplate from "@Front/Components/LayoutTemplates/DefaultTemplate"; import Form from "@Front/Components/DesignSystem/Form"; import CheckBox from "@Front/Components/DesignSystem/CheckBox"; -import Button, { EButtonStyleType, EButtonVariant } from "@Front/Components/DesignSystem/Button"; +import Button, { EButtonStyleType, EButtonColor } from "@Front/Components/DesignSystem/Button"; import React, { useCallback, useEffect, useState } from "react"; import User, { Subscription } from "le-coffre-resources/dist/Admin"; import JwtService, { IUserJwtPayload } from "@Front/Services/JwtService/JwtService"; @@ -113,11 +113,11 @@ export default function SubscriptionManageCollaborators() { {selectedCollaborators.length} collaborateurs sélectionnés
- @@ -165,7 +165,7 @@ export default function SubscriptionFacturation() { href={ Module.getInstance().get().modules.pages.Subscription.pages.Manage.pages.Standard.props.path }> */} - {/* */} @@ -173,7 +173,7 @@ export default function SubscriptionFacturation() { href={ Module.getInstance().get().modules.pages.Subscription.pages.ManageCollaborators.props.path }> - @@ -223,7 +223,7 @@ export default function SubscriptionFacturation() {
{subscription.type === "UNLIMITED" && ( - )} @@ -233,7 +233,7 @@ export default function SubscriptionFacturation() { @@ -243,7 +243,7 @@ export default function SubscriptionFacturation() {
-
{userHasVoted() && (
-