🐛 Review withmelissa

This commit is contained in:
Maxime Lalo 2023-07-26 16:54:26 +02:00
parent 8b0a683ddd
commit c84036d3d7
8 changed files with 75 additions and 27 deletions

View File

@ -37,6 +37,46 @@ export default class BurgerModal extends React.Component<IProps, IState> {
text="Collaborateurs" text="Collaborateurs"
routesActive={[Module.getInstance().get().modules.pages.Collaborators.props.path]} routesActive={[Module.getInstance().get().modules.pages.Collaborators.props.path]}
/> />
<NavigationLink
path={Module.getInstance().get().modules.pages.DeedTypes.props.path}
text="Paramétrage des listes de pièces"
routesActive={[
Module.getInstance().get().modules.pages.DeedTypes.props.path,
Module.getInstance().get().modules.pages.DeedTypes.pages.Create.props.path,
Module.getInstance().get().modules.pages.DeedTypes.pages.DeedTypesInformations.props.path,
Module.getInstance().get().modules.pages.DeedTypes.pages.Edit.props.path,
Module.getInstance().get().modules.pages.DocumentTypes.pages.Edit.props.path,
Module.getInstance().get().modules.pages.DocumentTypes.pages.Create.props.path,
Module.getInstance().get().modules.pages.DocumentTypes.pages.DocumentTypesInformations.props.path,
Module.getInstance().get().modules.pages.DocumentTypes.props.path,
]}
/>
<NavigationLink
path={Module.getInstance().get().modules.pages.Roles.props.path}
text="Gestion des rôles"
routesActive={[
Module.getInstance().get().modules.pages.Roles.props.path,
Module.getInstance().get().modules.pages.Roles.pages.RolesInformations.props.path,
]}
/>
<NavigationLink
path={Module.getInstance().get().modules.pages.Users.props.path}
text="Gestion des utilisateurs"
routesActive={[
Module.getInstance().get().modules.pages.Users.props.path,
Module.getInstance().get().modules.pages.Users.pages.UsersInformations.props.path,
]}
/>
<NavigationLink
path={Module.getInstance().get().modules.pages.Offices.props.path}
text="Gestion des offices"
routesActive={[
Module.getInstance().get().modules.pages.Offices.props.path,
Module.getInstance().get().modules.pages.Offices.pages.OfficesInformations.props.path,
]}
/>
<NavigationLink path={Module.getInstance().get().modules.pages.MyAccount.props.path} text="Mon compte" />
<NavigationLink text="CGU" />
<div className={classes["separator"]} /> <div className={classes["separator"]} />
<LogOutButton /> <LogOutButton />
</div> </div>

View File

@ -3,6 +3,7 @@
.root { .root {
color: $black; color: $black;
vertical-align: center;
font-family: "Inter", sans-serif; font-family: "Inter", sans-serif;
&.H1-60 { &.H1-60 {
font-style: normal; font-style: normal;

View File

@ -38,6 +38,7 @@
} }
.second-line { .second-line {
margin-top: 32px; margin-top: 32px;
max-width: 426px;
} }
.third-line { .third-line {
margin-top: 32px; margin-top: 32px;

View File

@ -4,7 +4,7 @@
.header { .header {
display: flex; display: flex;
justify-content: space-between; justify-content: space-between;
align-items: flex-end; align-items: flex-start;
@media (max-width: $screen-l) { @media (max-width: $screen-l) {
flex-direction: column; flex-direction: column;

View File

@ -15,7 +15,7 @@ export default class DeedTypes extends BasePage<IProps, IState> {
<Typography typo={ITypo.H1Bis}>Paramétrage des listes de pièces</Typography> <Typography typo={ITypo.H1Bis}>Paramétrage des listes de pièces</Typography>
<div className={classes["choose-a-role"]}> <div className={classes["choose-a-role"]}>
<Typography typo={ITypo.P_18} color={ITypoColor.GREY}> <Typography typo={ITypo.P_18} color={ITypoColor.GREY}>
Sélectionnez une liste de pièces Sélectionnez un type d'acte
</Typography> </Typography>
</div> </div>
</div> </div>

View File

@ -18,7 +18,7 @@ export default function Login() {
const redirectUserOnConnection = useCallback(() => { const redirectUserOnConnection = useCallback(() => {
async function getUser() { async function getUser() {
try { try {
await UserStore.instance.connect("jelkvelknvlkn"); await UserStore.instance.connect(process.env["NEXT_PUBLIC_ADMIN_ID"] as string);
await JwtService.getInstance().checkJwt(); await JwtService.getInstance().checkJwt();
router.push(Module.getInstance().get().modules.pages.Folder.props.path); router.push(Module.getInstance().get().modules.pages.Folder.props.path);
} catch (e) { } catch (e) {

View File

@ -47,31 +47,31 @@ export default function OfficeInformations(props: IProps) {
</div> </div>
<div key={user.uid} className={classes["user-line-mobile"]}> <div key={user.uid} className={classes["user-line-mobile"]}>
<div className={classes["line"]}> <div className={classes["line"]}>
<Typography typo={ITypo.P_16} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_16} color={ITypoColor.BLACK}>
Nom Nom
</Typography> </Typography>
<Typography typo={ITypo.P_16}>{user.contact?.last_name}</Typography> <Typography typo={ITypo.P_16}>{user.contact?.last_name}</Typography>
</div> </div>
<div className={classes["line"]}> <div className={classes["line"]}>
<Typography typo={ITypo.P_16} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_16} color={ITypoColor.BLACK}>
Prénom Prénom
</Typography> </Typography>
<Typography typo={ITypo.P_16}>{user.contact?.first_name}</Typography> <Typography typo={ITypo.P_16}>{user.contact?.first_name}</Typography>
</div> </div>
<div className={classes["line"]}> <div className={classes["line"]}>
<Typography typo={ITypo.P_16} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_16} color={ITypoColor.BLACK}>
E-mail pro E-mail
</Typography> </Typography>
<Typography typo={ITypo.P_16}>{user.contact?.email}</Typography> <Typography typo={ITypo.P_16}>{user.contact?.email}</Typography>
</div> </div>
<div className={classes["line"]}> <div className={classes["line"]}>
<Typography typo={ITypo.P_16} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_16} color={ITypoColor.BLACK}>
Numéro de téléphone Téléphone
</Typography> </Typography>
<Typography typo={ITypo.P_16}>{user.contact?.phone_number}</Typography> <Typography typo={ITypo.P_16}>{user.contact?.phone_number}</Typography>
</div> </div>
<div className={classes["line"]}> <div className={classes["line"]}>
<Typography typo={ITypo.P_16} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_16} color={ITypoColor.BLACK}>
Rôle Rôle
</Typography> </Typography>
<Typography typo={ITypo.P_16}>{user.office_role ? user.office_role?.name : user.role?.name}</Typography> <Typography typo={ITypo.P_16}>{user.office_role ? user.office_role?.name : user.role?.name}</Typography>
@ -118,19 +118,19 @@ export default function OfficeInformations(props: IProps) {
</div> </div>
<div className={classes["users-container"]}> <div className={classes["users-container"]}>
<div className={classes["first-line"]}> <div className={classes["first-line"]}>
<Typography typo={ITypo.NAV_HEADER_18} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_18} color={ITypoColor.BLACK}>
Nom Nom
</Typography> </Typography>
<Typography typo={ITypo.NAV_HEADER_18} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_18} color={ITypoColor.BLACK}>
Prénom Prénom
</Typography> </Typography>
<Typography typo={ITypo.NAV_HEADER_18} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_18} color={ITypoColor.BLACK}>
E-mail pro E-mail
</Typography> </Typography>
<Typography typo={ITypo.NAV_HEADER_18} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_18} color={ITypoColor.BLACK}>
Numéro de téléphone Téléphone
</Typography> </Typography>
<Typography typo={ITypo.NAV_HEADER_18} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_18} color={ITypoColor.BLACK}>
Rôle Rôle
</Typography> </Typography>
</div> </div>
@ -155,19 +155,19 @@ export default function OfficeInformations(props: IProps) {
</div> </div>
<div className={classes["users-container"]}> <div className={classes["users-container"]}>
<div className={classes["first-line"]}> <div className={classes["first-line"]}>
<Typography typo={ITypo.NAV_HEADER_18} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_18} color={ITypoColor.BLACK}>
Nom Nom
</Typography> </Typography>
<Typography typo={ITypo.NAV_HEADER_18} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_18} color={ITypoColor.BLACK}>
Prénom Prénom
</Typography> </Typography>
<Typography typo={ITypo.NAV_HEADER_18} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_18} color={ITypoColor.BLACK}>
E-mail pro E-mail
</Typography> </Typography>
<Typography typo={ITypo.NAV_HEADER_18} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_18} color={ITypoColor.BLACK}>
Numéro de téléphone Téléphone
</Typography> </Typography>
<Typography typo={ITypo.NAV_HEADER_18} color={ITypoColor.BLACK}> <Typography typo={ITypo.P_SB_18} color={ITypoColor.BLACK}>
Rôle Rôle
</Typography> </Typography>
</div> </div>

View File

@ -221,9 +221,15 @@ export default function UserInformations(props: IProps) {
onClose={closeAdminModal} onClose={closeAdminModal}
onAccept={handleAdminModalAccepted} onAccept={handleAdminModalAccepted}
closeBtn closeBtn
header={`Souhaitez-vous ${adminModalType === "add" ? "ajouter" : "retirer"} ${ header={
adminModalType === "add"
? `Souhaitez-vous nommer ${
userSelected?.contact?.first_name + " " + userSelected?.contact?.last_name userSelected?.contact?.first_name + " " + userSelected?.contact?.last_name
} aux administrateurs de son office ?`} } 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"} confirmText={adminModalType === "add" ? "Ajouter" : "Retirer"}
cancelText={"Annuler"}> cancelText={"Annuler"}>
<div className={classes["modal-content"]}></div> <div className={classes["modal-content"]}></div>