From 7fce125aad607610d7b3777523fc7dd8950e0b10 Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Tue, 18 Apr 2023 11:09:33 +0200 Subject: [PATCH] :sparkles: Harmonizing icons --- .../Components/DesignSystem/Button/index.tsx | 6 ++++-- .../DesignSystem/FolderContainer/index.tsx | 11 ++++++----- .../Components/DesignSystem/Select/index.tsx | 8 ++++---- .../DesignSystem/UserFolder/index.tsx | 19 ++++++++++--------- .../Components/Elements/BackArrow/index.tsx | 5 +++-- .../DefaultDoubleSidePage/classes.module.scss | 2 +- .../DefaultDoubleSidePage/index.tsx | 7 ++++--- .../DefaultNotaryDashboard/index.tsx | 19 +++++++++++-------- .../Folder/CreateFolder/classes.module.scss | 4 ++-- 9 files changed, 45 insertions(+), 36 deletions(-) diff --git a/src/front/Components/DesignSystem/Button/index.tsx b/src/front/Components/DesignSystem/Button/index.tsx index 5c6e1cd8..88be86e8 100644 --- a/src/front/Components/DesignSystem/Button/index.tsx +++ b/src/front/Components/DesignSystem/Button/index.tsx @@ -1,6 +1,7 @@ -import React, { CSSProperties } from "react"; -import classes from "./classes.module.scss"; import Image from "next/image"; +import React, { CSSProperties } from "react"; + +import classes from "./classes.module.scss"; export enum EButtonVariant { PRIMARY = "primary", @@ -40,6 +41,7 @@ export default function Button(props: IProps) { const isloadingattr = isloading.toString(); const attributes = { ...props, variant, disabled, type, isloadingattr, fullwidthattr }; + delete attributes.fullwidth; delete attributes.icon; delete attributes.iconstyle; delete attributes.iconposition; diff --git a/src/front/Components/DesignSystem/FolderContainer/index.tsx b/src/front/Components/DesignSystem/FolderContainer/index.tsx index b93ab62b..5892f98b 100644 --- a/src/front/Components/DesignSystem/FolderContainer/index.tsx +++ b/src/front/Components/DesignSystem/FolderContainer/index.tsx @@ -1,10 +1,11 @@ -import React from "react"; -import classes from "./classes.module.scss"; -import Typography, { ITypo } from "../Typography"; -import Image from "next/image"; import ChevronIcon from "@Assets/Icons/chevron.svg"; -import WarningBadge from "../WarningBadge"; import { IDashBoardFolder } from "@Front/Components/LayoutTemplates/DefaultNotaryDashboard"; +import Image from "next/image"; +import React from "react"; + +import Typography, { ITypo } from "../Typography"; +import WarningBadge from "../WarningBadge"; +import classes from "./classes.module.scss"; type IProps = { folder: IDashBoardFolder; diff --git a/src/front/Components/DesignSystem/Select/index.tsx b/src/front/Components/DesignSystem/Select/index.tsx index f06bbf31..3c0453c7 100644 --- a/src/front/Components/DesignSystem/Select/index.tsx +++ b/src/front/Components/DesignSystem/Select/index.tsx @@ -1,11 +1,11 @@ -import classNames from "classnames"; -import React, { FormEvent, ReactNode } from "react"; import ChevronIcon from "@Assets/Icons/chevron.svg"; +import WindowStore from "@Front/Stores/WindowStore"; +import classNames from "classnames"; +import Image from "next/image"; +import React, { FormEvent, ReactNode } from "react"; import Typography, { ITypo } from "../Typography"; import classes from "./classes.module.scss"; -import WindowStore from "@Front/Stores/WindowStore"; -import Image from "next/image"; type IProps = { selectedOption?: IOption; diff --git a/src/front/Components/DesignSystem/UserFolder/index.tsx b/src/front/Components/DesignSystem/UserFolder/index.tsx index 5231c0ff..bf951344 100644 --- a/src/front/Components/DesignSystem/UserFolder/index.tsx +++ b/src/front/Components/DesignSystem/UserFolder/index.tsx @@ -1,16 +1,17 @@ -import React from "react"; -import classes from "./classes.module.scss"; -import UserFolderHeader from "./UserFolderHeader"; +import ChevronIcon from "@Assets/Icons/chevron.svg"; +import PlusIcon from "@Assets/Icons/plus.svg"; +import { IDashBoardFolder } from "@Front/Components/LayoutTemplates/DefaultNotaryDashboard"; +import classNames from "classnames"; import Customer, { Document } from "le-coffre-resources/dist/Customer"; import Image from "next/image"; -import ChevronIcon from "@Assets/Icons/chevron.svg"; -import QuantityProgressBar from "../QuantityProgressBar"; -import classNames from "classnames"; -import DocumentList from "./DocumentList"; +import React from "react"; + import Button, { EButtonVariant } from "../Button"; -import PlusIcon from "@Assets/Icons/plus.svg"; import Confirm from "../Modal/Confirm"; -import { IDashBoardFolder } from "@Front/Components/LayoutTemplates/DefaultNotaryDashboard"; +import QuantityProgressBar from "../QuantityProgressBar"; +import classes from "./classes.module.scss"; +import DocumentList from "./DocumentList"; +import UserFolderHeader from "./UserFolderHeader"; type IProps = { customer: Customer; diff --git a/src/front/Components/Elements/BackArrow/index.tsx b/src/front/Components/Elements/BackArrow/index.tsx index 8ed19bdc..37ea588c 100644 --- a/src/front/Components/Elements/BackArrow/index.tsx +++ b/src/front/Components/Elements/BackArrow/index.tsx @@ -1,7 +1,8 @@ +import ChevronIcon from "@Assets/Icons/chevron.svg"; +import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; import Link from "next/link"; import React from "react"; -import Button, { EButtonVariant } from "@Front/Components/DesignSystem/Button"; -import ChevronIcon from "@Assets/icons/chevron.svg"; + type IProps = { url: string; }; diff --git a/src/front/Components/LayoutTemplates/DefaultDoubleSidePage/classes.module.scss b/src/front/Components/LayoutTemplates/DefaultDoubleSidePage/classes.module.scss index 76ecc3ff..1d49462d 100644 --- a/src/front/Components/LayoutTemplates/DefaultDoubleSidePage/classes.module.scss +++ b/src/front/Components/LayoutTemplates/DefaultDoubleSidePage/classes.module.scss @@ -27,7 +27,7 @@ } background: var(--grey-soft); .image { - height: 100%; + width: 100%; object-fit: contain; } } diff --git a/src/front/Components/LayoutTemplates/DefaultDoubleSidePage/index.tsx b/src/front/Components/LayoutTemplates/DefaultDoubleSidePage/index.tsx index 705d1cef..b86d5071 100644 --- a/src/front/Components/LayoutTemplates/DefaultDoubleSidePage/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultDoubleSidePage/index.tsx @@ -1,9 +1,10 @@ -import React, { ReactNode } from "react"; -import classes from "./classes.module.scss"; import Header from "@Front/Components/DesignSystem/Header"; import Version from "@Front/Components/DesignSystem/Version"; -import Image, { StaticImageData } from "next/image"; import classNames from "classnames"; +import Image, { StaticImageData } from "next/image"; +import React, { ReactNode } from "react"; + +import classes from "./classes.module.scss"; type IProps = { title: string; diff --git a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx index ce555674..a1d535b9 100644 --- a/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx +++ b/src/front/Components/LayoutTemplates/DefaultNotaryDashboard/index.tsx @@ -1,15 +1,18 @@ -import "reflect-metadata"; -import React, { ReactNode } from "react"; -import classes from "./classes.module.scss"; +import ChevronIcon from "@Assets/Icons/chevron.svg"; import FolderListContainer from "@Front/Components/DesignSystem/FolderListContainer"; import Header from "@Front/Components/DesignSystem/Header"; import Version from "@Front/Components/DesignSystem/Version"; import { folders } from "@Front/Components/Layouts/DesignSystem/dummyData"; -import { OfficeFolder } from "le-coffre-resources/dist/Customer"; -import chevronIcon from "@Assets/Icons/chevron.svg"; -import Image from "next/image"; -import classNames from "classnames"; import WindowStore from "@Front/Stores/WindowStore"; +import classNames from "classnames"; +import { OfficeFolder } from "le-coffre-resources/dist/Customer"; +import Image from "next/image"; +import React, { ReactNode } from "react"; + +import classes from "./classes.module.scss"; + +import "reflect-metadata"; + type IProps = { title: string; children?: ReactNode; @@ -61,7 +64,7 @@ export default class DefaultNotaryDashboard extends React.Component
- open side menu + open side menu
{this.props.children}
diff --git a/src/front/Components/Layouts/Folder/CreateFolder/classes.module.scss b/src/front/Components/Layouts/Folder/CreateFolder/classes.module.scss index ddfaeb8f..8abdd7e3 100644 --- a/src/front/Components/Layouts/Folder/CreateFolder/classes.module.scss +++ b/src/front/Components/Layouts/Folder/CreateFolder/classes.module.scss @@ -1,11 +1,11 @@ @import "@Themes/constants.scss"; .root { - padding: 64px 0 0 64px; + margin: 64px; width: 530px; @media (max-width: $screen-m) { width: 100%; - padding: 64px 16px 0 16px; + margin: 64px 16px 0 16px; } .title { margin-top: 24px;