Added navbar links

main
Filip Borum Poulsen 3 years ago
parent 983ce48a25
commit 720fe60821

@ -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 {
</RouterLink>
<div class="links">
<!-- <RouterLink to="/center">Fitness center</RouterLink>
<RouterLink to="/trainer">Personlig træner</RouterLink> -->
<RouterLink to="/trainer">Personlig træner</RouterLink> -->
</div>
<div class="buttons">
<RouterLink to="/login" v-if="!loggedIn">Login</RouterLink>
<RouterLink to="/user/orders" v-if="loggedIn">Træningstimer</RouterLink>
<RouterLink to="/user/orders" v-if="loggedIn && !user.isTrainer">Træningstimer</RouterLink>
<RouterLink to="/trainer/orders" v-if="loggedIn && user.isTrainer">Træningstimer</RouterLink>
<RouterLink to="/trainer/schedule" v-if="loggedIn && user.isTrainer">Skema</RouterLink>
<RouterLink to="/admin/trainer" v-if="loggedIn && user.isAdmin">Centers</RouterLink>
<RouterLink to="/admin/center" v-if="loggedIn && user.isAdmin">Trainers</RouterLink>
<RouterLink to="/user/profile" v-if="loggedIn">Profil</RouterLink>
</div>
</div>

@ -2,4 +2,6 @@ export interface User {
first_name: string
last_name: string
email: string
isTrainer: boolean
isAdmin: boolean
}

@ -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);

Loading…
Cancel
Save