4nk/lecoffre-front
4
0
Fork 0
Code Issues 1 Pull Requests 1 Actions Packages Projects Releases Wiki Activity

Merge branch 'dev' into staging

Browse Source
This commit is contained in:
Maxime Lalo 2024-07-29 18:20:44 +02:00
commit 198c526bca
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/front/Components/LayoutTemplates/DefaultDoubleSidePage/index.tsx
View File

@ -46,7 +46,7 @@ export default function DefaultDoubleSidePage(props: IProps) {
<Image alt={"right side image"} src={image} className={classes["background-image"]} priority /> <Image alt={"right side image"} src={image} className={classes["background-image"]} priority />
</div> </div>
)} )}
<Footer hasLeftPadding isSticky /> <Footer hasLeftPadding />
</div> </div>
); );
} }

4
src/front/Components/LayoutTemplates/DefaultUserDashboard/index.tsx
View File

@ -15,7 +15,7 @@ export default function DefaultUserDashboard(props: IProps) {
const { userUid } = router.query; const { userUid } = router.query;
useEffect(() => { useEffect(() => {
const query: IGetUsersparams = { const query: IGetUsersparams = {
include: { contact: true }, include: { contact: true, office_membership: true },
}; };
Users.getInstance() Users.getInstance()
@ -37,7 +37,7 @@ export default function DefaultUserDashboard(props: IProps) {
id: user.uid!, id: user.uid!,
primaryText: user.contact?.first_name + " " + user.contact?.last_name, primaryText: user.contact?.first_name + " " + user.contact?.last_name,
isActive: user.uid === userUid, isActive: user.uid === userUid,
secondaryText: user.contact?.email, secondaryText: user.office_membership?.crpcen + " - " + user.office_membership?.name,
})) }))
: [] : []
} }