diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js index d53367a66..382615144 100644 --- a/frontend/src/components/Menu/Navbar.spec.js +++ b/frontend/src/components/Menu/Navbar.spec.js @@ -68,6 +68,15 @@ describe('Navbar', () => { it('has first nav-item "members_area" in navbar', () => { expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('members_area') }) + + it('has a link to the members area', () => { + expect(wrapper.findAll('.nav-item').at(7).text()).toContain('members_area') + expect(wrapper.findAll('.nav-item').at(7).find('a').attributes('href')).toBe( + 'https://elopage.com/s/gradido/basic-de/payment?locale=en&prid=111&pid=123&firstName=User&lastName=Example&email=user@example.org', + ) + }) + + it('has first nav-item "admin_area" in navbar', () => { expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('admin_area') }) diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index 574313e4e..97533f9d0 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -49,7 +49,7 @@ {{ $t('site.navbar.my-profil') }}
- + {{ $t('members_area') }} ! @@ -78,6 +78,10 @@ export default { type: Number, required: true, }, + elopageUri: { + type: String, + required: false, + }, }, data() { return { diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 1d7f7ac67..ec3df2015 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -14,7 +14,7 @@
- + {{ $t('members_area') }} ! @@ -35,5 +35,11 @@ diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js index 383c89c17..fd4fffbee 100644 --- a/frontend/src/views/Layout/DashboardLayout_gdd.spec.js +++ b/frontend/src/views/Layout/DashboardLayout_gdd.spec.js @@ -138,9 +138,7 @@ describe('DashboardLayoutGdd', () => { ) }) - it('has a logout button', () => { - expect(wrapper.findAll('ul').at(3).text()).toBe('logout') - }) + describe('logout', () => { beforeEach(async () => { diff --git a/frontend/src/views/Layout/DashboardLayout_gdd.vue b/frontend/src/views/Layout/DashboardLayout_gdd.vue index bb31136f4..e56629275 100755 --- a/frontend/src/views/Layout/DashboardLayout_gdd.vue +++ b/frontend/src/views/Layout/DashboardLayout_gdd.vue @@ -4,19 +4,14 @@ class="main-navbar" :balance="balance" :visible="visible" + :elopageUri="elopageUri" @set-visible="setVisible" - @get-elopage-link="getElopageLink" @admin="admin" @logout="logout" />
- +
@@ -64,6 +59,7 @@ export default { transactionCount: 0, pending: true, visible: false, + elopageUri: this.getElopageLink(), } }, methods: {