IT4Change/gradido
3
0
Fork 0
mirror of https://github.com/IT4Change/gradido.git synced 2026-02-06 09:56:05 +00:00
Code Issues Packages Projects Releases Wiki Activity

Merge branch 'master' into humhub_login_link

Browse Source
This commit is contained in:
einhornimmond 2024-05-10 14:32:06 +02:00 committed by GitHub
commit bf920e9821
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
2 changed files with 18 additions and 14 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

18
frontend/src/components/Menu/Sidebar.spec.js
View File

@ -17,6 +17,9 @@ describe('Sidebar', () => {
roles: [],
},
},
$route: {
path: '/',
},
}
const Wrapper = () => {
@ -33,8 +36,9 @@ describe('Sidebar', () => {
})
describe('the general section', () => {
it('has eight nav-items', () => {
expect(wrapper.findAll('ul').at(0).findAll('.nav-item')).toHaveLength(8)
it('has seven nav-items', () => {
expect(wrapper.findAll('ul').at(0).findAll('.nav-item')).toHaveLength(7)
})
it('has nav-item "navigation.overview" in navbar', () => {
@ -53,20 +57,16 @@ describe('Sidebar', () => {
expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('creation')
})
it('has nav-item "GDT" in navbar', () => {
expect(wrapper.findAll('.nav-item').at(4).text()).toContain('GDT')
})
it('has nav-item "navigation.info" in navbar', () => {
expect(wrapper.findAll('.nav-item').at(5).text()).toContain('navigation.info')
expect(wrapper.findAll('.nav-item').at(4).text()).toContain('navigation.info')
})
it('has nav-item "navigation.circles" in navbar', () => {
expect(wrapper.findAll('.nav-item').at(6).text()).toContain('navigation.circles')
expect(wrapper.findAll('.nav-item').at(5).text()).toContain('navigation.circles')
})
it('has nav-item "navigation.usersearch" in navbar', () => {
expect(wrapper.findAll('.nav-item').at(7).text()).toContain('navigation.usersearch')
expect(wrapper.findAll('.nav-item').at(6).text()).toContain('navigation.usersearch')
})
})

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

@ -16,7 +16,7 @@
<b-icon icon="cash" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('navigation.send') }}</span>
</b-nav-item>
<b-nav-item to="/transactions" class="mb-3" active-class="activeRoute">
<b-nav-item to="/transactions" :class="transactionClass" active-class="activeRoute">
<b-img src="/img/svg/transaction.svg" height="20" class="svg-icon" />
<span class="ml-2">{{ $t('navigation.transactions') }}</span>
</b-nav-item>
@ -24,10 +24,6 @@
<b-img src="/img/svg/community.svg" height="20" class="svg-icon" />
<span class="ml-2">{{ $t('creation') }}</span>
</b-nav-item>
<b-nav-item to="/gdt" class="mb-3" active-class="activeRoute">
<b-icon icon="layers" aria-hidden="true"></b-icon>
<span class="ml-2">{{ $t('GDT') }}</span>
</b-nav-item>
<b-nav-item to="/information" class="mb-3" active-class="activeRoute">
<b-img src="/img/svg/info.svg" height="20" class="svg-icon" />
<span class="ml-2">{{ $t('navigation.info') }}</span>
@ -86,6 +82,14 @@ export default {
props: {
shadow: { type: Boolean, required: false, default: true },
},
computed: {
transactionClass() {
if (this.$route.path === '/gdt') {
return 'mb-3 activeRoute'
}
return 'mb-3'
},
},
}
</script>
<style>