diff --git a/client/src/components/NavBar.vue b/client/src/components/NavBar.vue index 78c488c..c20e4f2 100644 --- a/client/src/components/NavBar.vue +++ b/client/src/components/NavBar.vue @@ -13,11 +13,7 @@ export default { }, data() { return { - user: { - first_name: "", - last_name: "", - email: "" - } as User + user: {} as User } }, async mounted() { @@ -49,11 +45,15 @@ export default {
Login - Træningstimer + Træningstimer + Træningstimer + Skema + Centers + Trainers Profil
diff --git a/client/src/interfaces/user.ts b/client/src/interfaces/user.ts index d7a844a..98cd5a7 100644 --- a/client/src/interfaces/user.ts +++ b/client/src/interfaces/user.ts @@ -2,4 +2,6 @@ export interface User { first_name: string last_name: string email: string + isTrainer: boolean + isAdmin: boolean } \ No newline at end of file diff --git a/server/src/routes/user.ts b/server/src/routes/user.ts index daa70bd..d4d5631 100644 --- a/server/src/routes/user.ts +++ b/server/src/routes/user.ts @@ -18,7 +18,7 @@ interface UserObject { router.get("/user", UserAuth, async (req: AuthedRequest, res: Response) => { try { const databaseResult = await client.query(` - SELECT first_name, last_name, email, is_admin as isAdmin, trainers.user_id IS NOT NULL as isTrainer + SELECT first_name, last_name, email, is_admin as is_admin, trainers.user_id IS NOT NULL as is_trainer FROM users LEFT JOIN trainers ON trainers.user_id = users.id WHERE users.id = $1; @@ -26,6 +26,12 @@ router.get("/user", UserAuth, async (req: AuthedRequest, res: Response) => { req.user?.userId ]); + databaseResult.rows[0].isTrainer = databaseResult.rows[0].is_trainer; + databaseResult.rows[0].is_trainer = undefined; + + databaseResult.rows[0].isAdmin = databaseResult.rows[0].is_admin; + databaseResult.rows[0].is_admin = undefined; + const user: UserObject = databaseResult.rows[0]; return res.status(200).send(user);