devops/encoach_frontend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merged in bugfix/mongo-migration-bugs (pull request #104)

Browse Source 
Added back the demographic view

Approved-by: Tiago Ribeiro
This commit is contained in:
carlos.mesquita
2024-10-01 16:52:00 +00:00
committed by Tiago Ribeiro
parent 8c392f8b49 3c1c4489f8
commit 8adacc51a6
2 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/pages/api/users/update.ts
View File

@@ -158,7 +158,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
delete updatedUser.password; delete updatedUser.password;
delete updatedUser.newPassword; delete updatedUser.newPassword;
await db.collection("users").updateOne({id: queryId}, {$set: updatedUser}); await db.collection("users").updateOne({id: queryId ? (queryId as string) : req.session.user.id}, {$set: updatedUser});
if (!queryId) { if (!queryId) {
req.session.user = updatedUser ? {...updatedUser, id: req.session.user.id} : null; req.session.user = updatedUser ? {...updatedUser, id: req.session.user.id} : null;
@@ -169,7 +169,7 @@ async function handler(req: NextApiRequest, res: NextApiResponse) {
await managePaymentRecords({...updatedUser, id: req.session.user!.id}, queryId); await managePaymentRecords({...updatedUser, id: req.session.user!.id}, queryId);
} }
res.status(200).json({user: {...updatedUser, id: req.session.user!.id}}); res.status(200).json({user: {...updatedUser, ...user, id: req.session.user!.id}});
} }
export const config = { export const config = {

2
src/pages/index.tsx
View File

@@ -79,7 +79,7 @@ export default function Home({user: propsUser, linkedCorporate}: Props) {
useEffect(() => { useEffect(() => {
if (user) { if (user) {
// setShowDemographicInput(!user.demographicInformation || !user.demographicInformation.country || !user.demographicInformation.phone); setShowDemographicInput(!user.demographicInformation || !user.demographicInformation.country || !user.demographicInformation.phone);
setShowDiagnostics(user.isFirstLogin && user.type === "student"); setShowDiagnostics(user.isFirstLogin && user.type === "student");
} }
}, [user]); }, [user]);