diff --git a/src/front/Api/BaseApiService.ts b/src/front/Api/BaseApiService.ts index 2992b609..f3786452 100644 --- a/src/front/Api/BaseApiService.ts +++ b/src/front/Api/BaseApiService.ts @@ -17,6 +17,7 @@ export default abstract class BaseApiService { } protected getBaseUrl() { + console.log("BaseApiService.baseUrl >>> ", BaseApiService.baseUrl); return BaseApiService.baseUrl; } diff --git a/src/front/Assets/Icons/id-note-logo.svg b/src/front/Assets/Icons/id-note-logo.svg new file mode 100644 index 00000000..caee423d --- /dev/null +++ b/src/front/Assets/Icons/id-note-logo.svg @@ -0,0 +1,10 @@ + + + + + + + + + + diff --git a/src/front/Components/DesignSystem/FolderList/classes.module.scss b/src/front/Components/DesignSystem/FolderList/classes.module.scss index 8b1f302f..0bf5be03 100644 --- a/src/front/Components/DesignSystem/FolderList/classes.module.scss +++ b/src/front/Components/DesignSystem/FolderList/classes.module.scss @@ -4,4 +4,4 @@ .active { background-color: var(--grey-medium); } -} +} \ No newline at end of file diff --git a/src/front/Components/DesignSystem/FolderList/index.tsx b/src/front/Components/DesignSystem/FolderList/index.tsx index 7d67e2c7..359ca97f 100644 --- a/src/front/Components/DesignSystem/FolderList/index.tsx +++ b/src/front/Components/DesignSystem/FolderList/index.tsx @@ -28,25 +28,31 @@ class FolderListClass extends React.Component { : Module.getInstance().get().modules.pages.Folder.pages.FolderInformation.props.path; return (
- {this.props.folders.sort((folder) => { - const pendingDocuments = (folder.documents ?? []).filter((document) => document.document_status === EDocumentStatus.DEPOSITED); - return pendingDocuments.length >= 1 ? -1 : 1; - }).sort((folder1, folder2) => { - return folder1.created_at! < folder2.created_at! ? -1 : 1; - }).sort((folder1, folder2) => { - return folder1.folder_number! < folder2.folder_number! ? -1 : 1; - }).map((folder) => { - return ( -
- - ; - -
- ); - })} + {this.props.folders + .sort((folder) => { + const pendingDocuments = (folder.documents ?? []).filter( + (document) => document.document_status === EDocumentStatus.DEPOSITED, + ); + return pendingDocuments.length >= 1 ? -1 : 1; + }) + .sort((folder1, folder2) => { + return folder1.created_at! < folder2.created_at! ? -1 : 1; + }) + .sort((folder1, folder2) => { + return folder1.folder_number! < folder2.folder_number! ? -1 : 1; + }) + .map((folder) => { + return ( +
+ + ; + +
+ ); + })} ;
); diff --git a/src/front/Components/DesignSystem/FolderListContainer/classes.module.scss b/src/front/Components/DesignSystem/FolderListContainer/classes.module.scss index 3fa26504..588e1a18 100644 --- a/src/front/Components/DesignSystem/FolderListContainer/classes.module.scss +++ b/src/front/Components/DesignSystem/FolderListContainer/classes.module.scss @@ -7,7 +7,16 @@ flex-direction: column; justify-content: space-between; + .header { + flex: 1; + } + .searchbar { padding: 40px 24px 24px 24px; } -} + + .folderlist-container { + height: 100%; + border-right: 1px solid var(--grey-medium); + } +} \ No newline at end of file diff --git a/src/front/Components/DesignSystem/FolderListContainer/index.tsx b/src/front/Components/DesignSystem/FolderListContainer/index.tsx index 70ac65bf..521122ba 100644 --- a/src/front/Components/DesignSystem/FolderListContainer/index.tsx +++ b/src/front/Components/DesignSystem/FolderListContainer/index.tsx @@ -31,16 +31,18 @@ export default class FolderListContainer extends React.Component const navigatePath = Module.getInstance().get().modules.pages.Folder.pages.CreateFolder.props.path; return (
-
+
- +
+ +
{!this.props.isArchived && ( diff --git a/src/front/Components/DesignSystem/Header/classes.module.scss b/src/front/Components/DesignSystem/Header/classes.module.scss index 89f3b93d..3c51f7f6 100644 --- a/src/front/Components/DesignSystem/Header/classes.module.scss +++ b/src/front/Components/DesignSystem/Header/classes.module.scss @@ -31,10 +31,6 @@ .profile-section { display: inline-flex; - > :first-child { - margin-right: 32px; - } - @media (max-width: $screen-ls) { display: none; } @@ -61,4 +57,4 @@ } } } -} +} \ No newline at end of file diff --git a/src/front/Components/Layouts/Login/classes.module.scss b/src/front/Components/Layouts/Login/classes.module.scss index 8fc12a31..b1f43eee 100644 --- a/src/front/Components/Layouts/Login/classes.module.scss +++ b/src/front/Components/Layouts/Login/classes.module.scss @@ -1,13 +1,21 @@ +@import "@Themes/constants.scss"; + .root { display: flex; align-items: center; justify-content: center; flex-direction: column; height: 100%; + max-width: 530px; + margin: auto; .title { margin: 32px 0; text-align: center; + + @media (max-width: $screen-s) { + font-family: 48px; + } } .forget-password { diff --git a/src/front/Components/Layouts/Login/index.tsx b/src/front/Components/Layouts/Login/index.tsx index 196dd836..5b5be2e8 100644 --- a/src/front/Components/Layouts/Login/index.tsx +++ b/src/front/Components/Layouts/Login/index.tsx @@ -7,6 +7,7 @@ import LandingImage from "./landing-connect.png"; import Image from "next/image"; import DefaultDoubleSidePage from "@Front/Components/LayoutTemplates/DefaultDoubleSidePage"; import { FrontendVariables } from "@Front/Config/VariablesFront"; +import idNoteLogo from "@Assets/Icons/id-note-logo.svg"; export default class LoginClass extends BasePage { public override render(): JSX.Element { @@ -17,7 +18,9 @@ export default class LoginClass extends BasePage {
Connexion espace professionnel
 - +
Vous n'arrivez pas à vous connecter ?