From baea1dadbdd37ce82a285741339d85dca3438974 Mon Sep 17 00:00:00 2001 From: Hugo Lextrait Date: Tue, 2 May 2023 11:14:07 +0200 Subject: [PATCH] 404 Page not found --- .../Layouts/Folder/CreateFolder/index.tsx | 15 ++++-------- .../Layouts/PageNotFound/classes.module.scss | 23 +++++++++++-------- .../Components/Layouts/PageNotFound/index.tsx | 17 ++++++++------ 3 files changed, 28 insertions(+), 27 deletions(-) diff --git a/src/front/Components/Layouts/Folder/CreateFolder/index.tsx b/src/front/Components/Layouts/Folder/CreateFolder/index.tsx index cbe16e4a..05a980a5 100644 --- a/src/front/Components/Layouts/Folder/CreateFolder/index.tsx +++ b/src/front/Components/Layouts/Folder/CreateFolder/index.tsx @@ -13,8 +13,8 @@ import { ActionMeta, MultiValue } from "react-select"; import BasePage from "../../Base"; import classes from "./classes.module.scss"; -import { Deed, DeedType, OfficeFolder, OfficeFolderHasCustomer, OfficeFolderHasStakeholder } from "le-coffre-resources/dist/Notary"; -import DeedTypes from "@Front/Api/LeCoffreApi/SuperAdmin/DeedTypes/DeedTypes"; +import { Deed, DeedType, OfficeFolder, OfficeFolderHasStakeholder } from "le-coffre-resources/dist/Notary"; +// import DeedTypes from "@Front/Api/LeCoffreApi/SuperAdmin/DeedTypes/DeedTypes"; import Users from "@Front/Api/LeCoffreApi/SuperAdmin/Users/Users"; import User from "le-coffre-resources/dist/Notary"; @@ -83,13 +83,8 @@ export default class CreateFolder extends BasePage { type="number" onChange={this.onFolderNumberChange} /> -<<<<<<< Updated upstream - - ->>>>>>> Stashed changes { } public override async componentDidMount() { - const deedTypes = await DeedTypes.getInstance().get({ q: {} }); + // const deedTypes = await DeedTypes.getInstance().get({ q: {} }); // TODO SETUP userStore and get the user's office membership -> Replace IwJ70M471c by the user's office membership uid const collaborators = await Users.getInstance().get({ q: { where: { office_membership: { uid: "IwJ70M471c" } }, include: { contact: true } }, }); this.setState({ - deedTypes, - deedTypesOptions: this.mapDeedOptions(deedTypes), + // deedTypes, + // deedTypesOptions: this.mapDeedOptions(deedTypes), collaborators, collaboratorsOptions: this.mapUsersOptions(collaborators), }); diff --git a/src/front/Components/Layouts/PageNotFound/classes.module.scss b/src/front/Components/Layouts/PageNotFound/classes.module.scss index 30a6f4b3..0921d66e 100644 --- a/src/front/Components/Layouts/PageNotFound/classes.module.scss +++ b/src/front/Components/Layouts/PageNotFound/classes.module.scss @@ -2,17 +2,20 @@ @import "@Themes/animation.scss"; .root { + height: 100%; + width: 100%; display: flex; - align-items: center; - justify-content: center; - flex-direction: column; - text-align: center; - - .buttons-container{ - margin-top: 32px; + + .content { + margin: auto; + + .text { + margin: 32px 0; + } + + @media(max-width: $screen-s) { + text-align: center; + } } - @media(max-width: $screen-s){ - margin-top: 32px; - } } \ No newline at end of file diff --git a/src/front/Components/Layouts/PageNotFound/index.tsx b/src/front/Components/Layouts/PageNotFound/index.tsx index d7592019..0a4d6577 100644 --- a/src/front/Components/Layouts/PageNotFound/index.tsx +++ b/src/front/Components/Layouts/PageNotFound/index.tsx @@ -1,25 +1,28 @@ import Button from "@Front/Components/DesignSystem/Button"; import Typography, { ITypo } from "@Front/Components/DesignSystem/Typography"; -import DefaultTemplate from "@Front/Components/LayoutTemplates/DefaultTemplate"; import Module from "@Front/Config/Module"; import Link from "next/link"; - +import RightImage from "@Assets/images/create-folder/right-image.png"; import BasePage from "../Base"; import classes from "./classes.module.scss"; +import DefaultDoubleSidePage from "@Front/Components/LayoutTemplates/DefaultDoubleSidePage"; export default class PageNotFound extends BasePage { public override render(): JSX.Element { return ( - +
- Il n'y a rien ici, la page que vous avez demandée n'existe pas -
+
+ Erreur 404 + + La page que vous recherchez semble introuvable. + - +
- + ); } }