IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2025-12-13 07:45:54 +00:00
Code Issues Packages Projects Releases Wiki Activity

add emit for logout on Navbar and Sidebar

Browse Source
This commit is contained in:
ogerly 2021-12-09 09:02:50 +01:00
parent adadbf2720
commit bcc66691ef
3 changed files with 10 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/components/Menu/Navbar.vue
View File

@ -7,28 +7,29 @@
</router-link> </router-link>
</div> </div>
<b-nav-text center>{{ balance }} GDD</b-nav-text> <b-nav-text center>{{ balance }} GDD</b-nav-text>
<b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
<b-collapse id="nav-collapse">
<b-navbar-nav class="d-none d-md-flex d-sm-flex"> <b-collapse id="nav-collapse" is-nav>
<b-navbar-nav >
<b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item> <b-nav-item to="/overview">{{ $t('overview') }}</b-nav-item>
<b-nav-item to="/send">{{ $t('send') }}</b-nav-item> <b-nav-item to="/send">{{ $t('send') }}</b-nav-item>
<b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item> <b-nav-item to="/transactions">{{ $t('transactions') }}</b-nav-item>
<b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item> <b-nav-item to="/profile">{{ $t('site.navbar.my-profil') }}</b-nav-item>
<hr /> <hr />
<b-nav-item to="/#" class="mb-3" @click="this.$emit('get-elopage-link')" target="_blank"> <b-nav-item to="#" class="mb-3" @click="this.$emit('get-elopage-link')" target="_blank">
{{ $t('members_area') }} {{ $t('members_area') }}
<b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge> <b-badge v-if="!$store.state.hasElopage" pill variant="danger">!</b-badge>
</b-nav-item> </b-nav-item>
<b-nav-item <b-nav-item
v-if="$store.state.isAdmin" v-if="$store.state.isAdmin"
to="/#" to="#"
class="mb-3" class="mb-3"
@click="this.$emit('admin')" @click="this.$emit('admin')"
target="_blank" target="_blank"
> >
{{ $t('admin_area') }} {{ $t('admin_area') }}
</b-nav-item> </b-nav-item>
<b-nav-item to="/#" class="mb-3" @click="this.$emit('logout')"> <b-nav-item class="mb-3" @click="$emit('logout')">
{{ $t('logout') }} {{ $t('logout') }}
</b-nav-item> </b-nav-item>
</b-navbar-nav> </b-navbar-nav>
@ -49,15 +50,12 @@
<b-dropdown-item @click="this.$emit('admin')" target="_blank"> <b-dropdown-item @click="this.$emit('admin')" target="_blank">
{{ $t('admin_area') }} {{ $t('admin_area') }}
</b-dropdown-item> </b-dropdown-item>
<b-dropdown-item href="/#" @click="this.$emit('logout')"> <b-dropdown-item @click="$emit('logout')">
{{ $t('logout') }} {{ $t('logout') }}
</b-dropdown-item> </b-dropdown-item>
</b-nav-item-dropdown> </b-nav-item-dropdown>
</b-navbar-nav> </b-navbar-nav>
</b-collapse> </b-collapse>
<b-navbar-toggle target="nav-collapse"></b-navbar-toggle>
</b-navbar> </b-navbar>
</div> </div>
</template> </template>

2
frontend/src/components/Menu/Sidebar.vue
View File

@ -16,7 +16,7 @@
<b-nav-item class="mb-3" active>Active</b-nav-item> <b-nav-item class="mb-3" active>Active</b-nav-item>
<b-nav-item class="mb-3">Link</b-nav-item> <b-nav-item class="mb-3">Link</b-nav-item>
<b-nav-item class="mb-3">Another Link</b-nav-item> <b-nav-item class="mb-3">Another Link</b-nav-item>
<b-nav-item class="mb-3" disabled>Disabled</b-nav-item> <b-nav-item class="mb-3" @click="$emit('logout')">{{ $t('logout') }}</b-nav-item>
</b-nav> </b-nav>
</div> </div>
</div> </div>

4
frontend/src/views/Layout/DashboardLayout_gdd.vue
View File

@ -1,6 +1,6 @@
<template> <template>
<div> <div>
<navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout"/> <navbar :balance="balance" @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
<div style="display: inline-flex"> <div style="display: inline-flex">
<div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px"> <div class="d-none d-sm-none d-md-none d-lg-flex shadow-lg" style="width: 300px">
<sidebar @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" /> <sidebar @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
@ -59,12 +59,10 @@ export default {
query: logout, query: logout,
}) })
.then(() => { .then(() => {
this.$sidebar.displaySidebar(false)
this.$store.dispatch('logout') this.$store.dispatch('logout')
this.$router.push('/login') this.$router.push('/login')
}) })
.catch(() => { .catch(() => {
this.$sidebar.displaySidebar(false)
this.$store.dispatch('logout') this.$store.dispatch('logout')
if (this.$router.currentRoute.path !== '/login') this.$router.push('/login') if (this.$router.currentRoute.path !== '/login') this.$router.push('/login')
}) })