-
-
- {{ $store.state.firstName }}
- {{ $store.state.lastName }}
- {{ $store.state.email }}
-
-
+
+
+
+
+
+
+
+
+
+
+
-
-
- {{ $t('navigation.overview') }}
-
-
-
- {{ $t('navigation.send') }}
-
-
-
- {{ $t('navigation.transactions') }}
-
-
-
- {{ $t('gdt.gdt') }}
-
-
-
- {{ $t('navigation.community') }}
-
-
-
- {{ $t('navigation.profile') }}
-
-
-
- {{ $t('navigation.info') }}
-
-
-
-
- {{ $t('navigation.members_area') }}
-
-
-
- {{ $t('navigation.admin_area') }}
-
-
-
- {{ $t('navigation.logout') }}
-
-
-
+
+
+
+
+
+
+
+
+
+
{{ username.username }}
+
+
+ {{ $store.state.email }}
+
+
+
+
+
+
+
-
diff --git a/frontend/src/components/Menu/Sidebar.spec.js b/frontend/src/components/Menu/Sidebar.spec.js
index 612649762..70d145a9e 100644
--- a/frontend/src/components/Menu/Sidebar.spec.js
+++ b/frontend/src/components/Menu/Sidebar.spec.js
@@ -14,7 +14,7 @@ describe('Sidebar', () => {
$store: {
state: {
hasElopage: true,
- isAdmin: true,
+ isAdmin: false,
},
},
}
@@ -29,84 +29,93 @@ describe('Sidebar', () => {
})
it('renders the component', () => {
- expect(wrapper.find('div#component-sidebar').exists()).toBeTruthy()
+ expect(wrapper.find('div#component-sidebar').exists()).toBe(true)
})
- describe('navigation Navbar', () => {
- it('has ten b-nav-item in the navbar', () => {
- expect(wrapper.findAll('.nav-item')).toHaveLength(10)
+ describe('the genaral section', () => {
+ it('has five nav-item', () => {
+ expect(wrapper.findAll('ul').at(0).findAll('.nav-item')).toHaveLength(5)
})
- describe('navigation Navbar (general elements)', () => {
- it('has nav-item "navigation.overview" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(0).text()).toEqual('navigation.overview')
- })
+ it('has nav-item "navigation.overview" in navbar', () => {
+ expect(wrapper.findAll('.nav-item').at(0).text()).toEqual('navigation.overview')
+ })
- it('has nav-item "navigation.send" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('navigation.send')
- })
+ it('has nav-item "navigation.send" in navbar', () => {
+ expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('navigation.send')
+ })
- it('has nav-item "gdt.gdt" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('gdt.gdt')
- })
+ it('has nav-item "navigation.transactions" in navbar', () => {
+ expect(wrapper.findAll('.nav-item').at(2).text()).toEqual('navigation.transactions')
+ })
- it('has nav-item "navigation.community" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(4).text()).toContain('navigation.community')
- })
+ it('has nav-item "gdt.gdt" in navbar', () => {
+ expect(wrapper.findAll('.nav-item').at(3).text()).toEqual('gdt.gdt')
+ })
- it('has nav-item "navigation.profile" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.profile')
+ it('has nav-item "creation" in navbar', () => {
+ expect(wrapper.findAll('.nav-item').at(4).text()).toContain('creation')
+ })
+ })
+
+ describe('the specific section', () => {
+ describe('for standard users', () => {
+ it('has three nav-item', () => {
+ expect(wrapper.findAll('ul').at(1).findAll('.nav-item')).toHaveLength(3)
})
it('has nav-item "navigation.info" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('navigation.info')
- })
- })
-
- describe('navigation Navbar (user has an elopage account)', () => {
- it('has ten b-nav-item in the navbar', () => {
- expect(wrapper.findAll('.nav-item')).toHaveLength(10)
+ expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(0).text()).toEqual(
+ 'navigation.info',
+ )
})
- it('has a link to the members area', () => {
- expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.members_area')
- expect(wrapper.findAll('.nav-item').at(7).find('a').attributes('href')).toBe('#')
- })
-
- it('has nav-item "navigation.admin_area" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('navigation.admin_area')
+ it('has nav-item "navigation.settings" in navbar', () => {
+ expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(1).text()).toEqual(
+ 'navigation.settings',
+ )
})
it('has nav-item "navigation.logout" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('navigation.logout')
+ expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(2).text()).toEqual(
+ 'navigation.logout',
+ )
})
})
- it('has nav-item "navigation.admin_area" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('navigation.admin_area')
- })
+ describe('for admin users', () => {
+ beforeAll(() => {
+ mocks.$store.state.isAdmin = true
+ wrapper = Wrapper()
+ })
- it('has nav-item "navigation.logout" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('navigation.logout')
- })
- })
+ it('has four nav-item', () => {
+ expect(wrapper.findAll('ul').at(1).findAll('.nav-item')).toHaveLength(4)
+ })
- describe('navigation Navbar (user has no elopage account)', () => {
- beforeAll(() => {
- mocks.$store.state.hasElopage = false
- wrapper = Wrapper()
- })
+ it('has nav-item "navigation.info" in navbar', () => {
+ expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(0).text()).toEqual(
+ 'navigation.info',
+ )
+ })
- it('has nine b-nav-item in the navbar', () => {
- expect(wrapper.findAll('.nav-item')).toHaveLength(9)
- })
+ it('has nav-item "navigation.settings" in navbar', () => {
+ expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(1).text()).toEqual(
+ 'navigation.settings',
+ )
+ })
- it('has nav-item "navigation.admin_area" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.admin_area')
- })
+ it('has nav-item "navigation.admin_area" in navbar', () => {
+ expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(2).text()).toEqual(
+ 'navigation.admin_area',
+ )
+ })
- it('has nav-item "navigation.logout" in navbar', () => {
- expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('navigation.logout')
+ it('has nav-item "navigation.logout" in navbar', () => {
+ expect(wrapper.findAll('ul').at(1).findAll('.nav-item').at(3).text()).toEqual(
+ 'navigation.logout',
+ )
+ })
})
})
})
diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index f6abb6fbc..a373e9a74 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -1,56 +1,51 @@