From c84036d3d7e348a4bb24f4c0c3b601a0eca9f64e Mon Sep 17 00:00:00 2001 From: Maxime Lalo Date: Wed, 26 Jul 2023 16:54:26 +0200 Subject: [PATCH] :bug: Review withmelissa --- .../Header/BurgerMenu/BurgerModal/index.tsx | 40 ++++++++++++++++++ .../Typography/classes.module.scss | 1 + .../classes.module.scss | 1 + .../DeedTypesInformations/classes.module.scss | 2 +- .../Components/Layouts/DeedTypes/index.tsx | 2 +- src/front/Components/Layouts/Login/index.tsx | 2 +- .../Offices/OfficeInformations/index.tsx | 42 +++++++++---------- .../Layouts/Users/UserInformations/index.tsx | 12 ++++-- 8 files changed, 75 insertions(+), 27 deletions(-) diff --git a/src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx b/src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx index 857c731c..f9b5dcfa 100644 --- a/src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx +++ b/src/front/Components/DesignSystem/Header/BurgerMenu/BurgerModal/index.tsx @@ -37,6 +37,46 @@ export default class BurgerModal extends React.Component { text="Collaborateurs" routesActive={[Module.getInstance().get().modules.pages.Collaborators.props.path]} /> + + + + + +
diff --git a/src/front/Components/DesignSystem/Typography/classes.module.scss b/src/front/Components/DesignSystem/Typography/classes.module.scss index 186404af..0efa8539 100644 --- a/src/front/Components/DesignSystem/Typography/classes.module.scss +++ b/src/front/Components/DesignSystem/Typography/classes.module.scss @@ -3,6 +3,7 @@ .root { color: $black; + vertical-align: center; font-family: "Inter", sans-serif; &.H1-60 { font-style: normal; diff --git a/src/front/Components/Layouts/Collaborators/CollaboratorInformations/classes.module.scss b/src/front/Components/Layouts/Collaborators/CollaboratorInformations/classes.module.scss index d04c1ba8..745a1691 100644 --- a/src/front/Components/Layouts/Collaborators/CollaboratorInformations/classes.module.scss +++ b/src/front/Components/Layouts/Collaborators/CollaboratorInformations/classes.module.scss @@ -38,6 +38,7 @@ } .second-line { margin-top: 32px; + max-width: 426px; } .third-line { margin-top: 32px; diff --git a/src/front/Components/Layouts/DeedTypes/DeedTypesInformations/classes.module.scss b/src/front/Components/Layouts/DeedTypes/DeedTypesInformations/classes.module.scss index 72fe71da..b81e9055 100644 --- a/src/front/Components/Layouts/DeedTypes/DeedTypesInformations/classes.module.scss +++ b/src/front/Components/Layouts/DeedTypes/DeedTypesInformations/classes.module.scss @@ -4,7 +4,7 @@ .header { display: flex; justify-content: space-between; - align-items: flex-end; + align-items: flex-start; @media (max-width: $screen-l) { flex-direction: column; diff --git a/src/front/Components/Layouts/DeedTypes/index.tsx b/src/front/Components/Layouts/DeedTypes/index.tsx index e169d5c4..319c5bbd 100644 --- a/src/front/Components/Layouts/DeedTypes/index.tsx +++ b/src/front/Components/Layouts/DeedTypes/index.tsx @@ -15,7 +15,7 @@ export default class DeedTypes extends BasePage { Paramétrage des listes de pièces
- Sélectionnez une liste de pièces + Sélectionnez un type d'acte
diff --git a/src/front/Components/Layouts/Login/index.tsx b/src/front/Components/Layouts/Login/index.tsx index 977c4138..b4c10d64 100644 --- a/src/front/Components/Layouts/Login/index.tsx +++ b/src/front/Components/Layouts/Login/index.tsx @@ -18,7 +18,7 @@ export default function Login() { const redirectUserOnConnection = useCallback(() => { async function getUser() { try { - await UserStore.instance.connect("jelkvelknvlkn"); + await UserStore.instance.connect(process.env["NEXT_PUBLIC_ADMIN_ID"] as string); await JwtService.getInstance().checkJwt(); router.push(Module.getInstance().get().modules.pages.Folder.props.path); } catch (e) { diff --git a/src/front/Components/Layouts/Offices/OfficeInformations/index.tsx b/src/front/Components/Layouts/Offices/OfficeInformations/index.tsx index 9c55a60e..56495989 100644 --- a/src/front/Components/Layouts/Offices/OfficeInformations/index.tsx +++ b/src/front/Components/Layouts/Offices/OfficeInformations/index.tsx @@ -47,31 +47,31 @@ export default function OfficeInformations(props: IProps) {
- + Nom {user.contact?.last_name}
- + Prénom {user.contact?.first_name}
- - E-mail pro + + E-mail {user.contact?.email}
- - Numéro de téléphone + + Téléphone {user.contact?.phone_number}
- + Rôle {user.office_role ? user.office_role?.name : user.role?.name} @@ -118,19 +118,19 @@ export default function OfficeInformations(props: IProps) {
- + Nom - + Prénom - - E-mail pro + + E-mail - - Numéro de téléphone + + Téléphone - + Rôle
@@ -155,19 +155,19 @@ export default function OfficeInformations(props: IProps) {
- + Nom - + Prénom - - E-mail pro + + E-mail - - Numéro de téléphone + + Téléphone - + Rôle
diff --git a/src/front/Components/Layouts/Users/UserInformations/index.tsx b/src/front/Components/Layouts/Users/UserInformations/index.tsx index a50d01a1..2abaca93 100644 --- a/src/front/Components/Layouts/Users/UserInformations/index.tsx +++ b/src/front/Components/Layouts/Users/UserInformations/index.tsx @@ -221,9 +221,15 @@ export default function UserInformations(props: IProps) { onClose={closeAdminModal} onAccept={handleAdminModalAccepted} closeBtn - header={`Souhaitez-vous ${adminModalType === "add" ? "ajouter" : "retirer"} ${ - userSelected?.contact?.first_name + " " + userSelected?.contact?.last_name - } aux administrateurs de son office ?`} + header={ + adminModalType === "add" + ? `Souhaitez-vous nommer ${ + userSelected?.contact?.first_name + " " + userSelected?.contact?.last_name + } administrateur de son office ?` + : `Souhaitez-vous retirer le rôle administrateur de son office à ${ + userSelected?.contact?.first_name + " " + userSelected?.contact?.last_name + } ?` + } confirmText={adminModalType === "add" ? "Ajouter" : "Retirer"} cancelText={"Annuler"}>