diff --git a/src/front/Components/DesignSystem/FolderList/classes.module.scss b/src/front/Components/DesignSystem/FolderList/classes.module.scss index b6ca5e4f..d8013f29 100644 --- a/src/front/Components/DesignSystem/FolderList/classes.module.scss +++ b/src/front/Components/DesignSystem/FolderList/classes.module.scss @@ -2,7 +2,11 @@ .root { height: calc(100vh - 290px); - overflow: scroll; + overflow-y: scroll; + + &.archived{ + height: calc(100vh - 220px); + } .active { background-color: var(--grey-medium); diff --git a/src/front/Components/DesignSystem/FolderList/index.tsx b/src/front/Components/DesignSystem/FolderList/index.tsx index 871eb511..a472a435 100644 --- a/src/front/Components/DesignSystem/FolderList/index.tsx +++ b/src/front/Components/DesignSystem/FolderList/index.tsx @@ -7,6 +7,7 @@ import React from "react"; import FolderContainer from "../FolderContainer"; import classes from "./classes.module.scss"; +import classNames from "classnames"; type IProps = { folders: IDashBoardFolder[]; @@ -26,7 +27,7 @@ class FolderListClass extends React.Component { ? Module.getInstance().get().modules.pages.Folder.pages.FolderArchived.pages.FolderInformation.props.path : Module.getInstance().get().modules.pages.Folder.pages.FolderInformation.props.path; public override render(): JSX.Element { - return
{this.renderFolders()}
; + return
{this.renderFolders()}
; } private renderFolders(): JSX.Element[] { diff --git a/src/front/Components/DesignSystem/FolderListContainer/index.tsx b/src/front/Components/DesignSystem/FolderListContainer/index.tsx index 521122ba..2063cba5 100644 --- a/src/front/Components/DesignSystem/FolderListContainer/index.tsx +++ b/src/front/Components/DesignSystem/FolderListContainer/index.tsx @@ -1,4 +1,5 @@ import { IDashBoardFolder } from "@Front/Components/LayoutTemplates/DefaultNotaryDashboard"; +import Module from "@Front/Config/Module"; import Link from "next/link"; import React from "react"; @@ -6,7 +7,6 @@ import Button from "../Button"; import FolderList from "../FolderList"; import SearchBar from "../SearchBar"; import classes from "./classes.module.scss"; -import Module from "@Front/Config/Module"; type IProps = { folders: IDashBoardFolder[]; @@ -44,13 +44,13 @@ export default class FolderListContainer extends React.Component /> -
- {!this.props.isArchived && ( + {!this.props.isArchived && ( +
- )} -
+
+ )} ); } diff --git a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx index 402b8a52..589eadbd 100644 --- a/src/front/Components/Layouts/Folder/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/Folder/FolderInformation/index.tsx @@ -123,7 +123,7 @@ class FolderInformationClass extends BasePage { Informations du dossier
- Vous n'avez aucun dossier archivés + Sélectionnez un dossier
diff --git a/src/front/Components/Layouts/Folder/index.tsx b/src/front/Components/Layouts/Folder/index.tsx index ce73a13d..89aed8ef 100644 --- a/src/front/Components/Layouts/Folder/index.tsx +++ b/src/front/Components/Layouts/Folder/index.tsx @@ -28,7 +28,7 @@ export default class Folder extends BasePage { Informations du dossier
- Vous n'avez aucun dossier archivés + Sélectionnez un dossier
diff --git a/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx b/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx index d17634ae..36d8aafc 100644 --- a/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx +++ b/src/front/Components/Layouts/FolderArchived/FolderInformation/index.tsx @@ -93,7 +93,7 @@ class FolderInformationClass extends BasePage { Informations du dossier
- Vous n'avez aucun dossier archivés + Vous n'avez aucun dossier archivé
diff --git a/src/front/Components/Layouts/FolderArchived/index.tsx b/src/front/Components/Layouts/FolderArchived/index.tsx index f411b087..68c3b4a1 100644 --- a/src/front/Components/Layouts/FolderArchived/index.tsx +++ b/src/front/Components/Layouts/FolderArchived/index.tsx @@ -31,7 +31,7 @@ export default class Folder extends BasePage { Informations du dossier
- Vous n'avez aucun dossier archivés + Vous n'avez aucun dossier archivé