Skip to content

Commit

Permalink
style: format
Browse files Browse the repository at this point in the history
  • Loading branch information
Mala1180 committed Jan 29, 2024
1 parent c5c9ba4 commit 9c74002
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 17 deletions.
2 changes: 1 addition & 1 deletion auth/src/routes/userAccess.ts
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ export const userAccessRouter: Router = express.Router()
userAccessRouter.route('/login').post((req: Request, res: Response): void => {
userAccessController
.login(req.body.username, req.body.password)
.then((access: { accessToken: string, refreshToken: string }): void => {
.then((access: { accessToken: string; refreshToken: string }): void => {
res.status(HttpStatusCode.OK).send(access)
})
.catch((err): void => {
Expand Down
7 changes: 3 additions & 4 deletions frontend/src/components/NavbarComponent.vue
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@ const logout = () => {
}
})
}
</script>

<template>
Expand All @@ -35,14 +34,14 @@ const logout = () => {
</div>
<router-link to="/" :class="routeName == 'Home' ? 'selected home' : 'home'">Home</router-link>
<router-link to="/monitoring" :class="routeName == 'Monitoring' ? 'selected' : ''"
>Monitoring
>Monitoring
</router-link>
<router-link to="/devices" :class="routeName == 'Devices' ? 'selected' : ''"
>Devices
>Devices
</router-link>
<router-link to="/alarms" :class="routeName == 'Alarms' ? 'selected' : ''">Alarms</router-link>
<router-link to="/notifications" :class="routeName == 'Notifications' ? 'selected' : ''"
>Notifications
>Notifications
</router-link>
<router-link to="/login" class="logout" @click="logout()">Logout</router-link>
</nav>
Expand Down
23 changes: 11 additions & 12 deletions frontend/src/views/LoginView.vue
Original file line number Diff line number Diff line change
Expand Up @@ -14,21 +14,20 @@ const login = () => {
RequestHelper.post(`http://${authHost}:${authPort}/login`, {
username: username.value,
password: password.value
}).then((res): void => {
if (res.status == AxiosHttpStatusCode.Ok) {
userStore.username = username.value
userStore.accessToken = res.data.accessToken
userStore.refreshToken = res.data.refreshToken
userStore.isLoggedIn = true
router.push('/home')
} else {
console.log(`Login failed with status code ${res.status} and message ${res.data.message}`)
}
})
.then((res): void => {
if (res.status == AxiosHttpStatusCode.Ok) {
userStore.username = username.value
userStore.accessToken = res.data.accessToken
userStore.refreshToken = res.data.refreshToken
userStore.isLoggedIn = true
router.push('/home')
} else {
console.log(`Login failed with status code ${res.status} and message ${res.data.message}`)
}
})
.catch((err): void => console.log(err))
}
</script>

<template>
Expand Down

0 comments on commit 9c74002

Please sign in to comment.