From b5b5527b59db7844d40dc3c55142a10d35dc339f Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 28 Jul 2022 15:41:16 +0200 Subject: [PATCH 1/4] Add community item to the mobile device. --- frontend/src/components/Menu/Navbar.vue | 7 ++++--- 1 file changed, 4 insertions(+), 3 deletions(-) diff --git a/frontend/src/components/Menu/Navbar.vue b/frontend/src/components/Menu/Navbar.vue index 1c49a1aa3..ef222fdb4 100644 --- a/frontend/src/components/Menu/Navbar.vue +++ b/frontend/src/components/Menu/Navbar.vue @@ -52,6 +52,10 @@ {{ $t('navigation.transactions') }} + + + {{ $t('navigation.community') }} + {{ $t('navigation.profile') }} @@ -60,9 +64,6 @@ {{ $t('navigation.members_area') }} - - {{ $t('math.exclaim') }} - From ff67e6f3c777527298c85bdacd1ccc0185a62a26 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 28 Jul 2022 15:42:04 +0200 Subject: [PATCH 2/4] Remove exclamaition point for members area item. --- frontend/src/components/Menu/Sidebar.vue | 3 --- 1 file changed, 3 deletions(-) diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue index 0cdab31c3..00243fa49 100644 --- a/frontend/src/components/Menu/Sidebar.vue +++ b/frontend/src/components/Menu/Sidebar.vue @@ -35,9 +35,6 @@ > {{ $t('navigation.members_area') }} - - {{ $t('math.exclaim') }} - From ea6dd83ebcb6ff035f10f9a2d21a8a013f10ba7e Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 28 Jul 2022 15:43:10 +0200 Subject: [PATCH 3/4] Remove exclamaition from locales. --- frontend/src/locales/de.json | 1 - frontend/src/locales/en.json | 1 - 2 files changed, 2 deletions(-) diff --git a/frontend/src/locales/de.json b/frontend/src/locales/de.json index 3a1f27185..422a445bd 100644 --- a/frontend/src/locales/de.json +++ b/frontend/src/locales/de.json @@ -205,7 +205,6 @@ "math": { "aprox": "~", "equal": "=", - "exclaim": "!", "minus": "−", "pipe": "|" }, diff --git a/frontend/src/locales/en.json b/frontend/src/locales/en.json index 0fcb348e3..89c18a106 100644 --- a/frontend/src/locales/en.json +++ b/frontend/src/locales/en.json @@ -205,7 +205,6 @@ "math": { "aprox": "~", "equal": "=", - "exclaim": "!", "minus": "−", "pipe": "|" }, From f1ad2f7a9bb9fc9e14e0324bdf789ebb5313ba42 Mon Sep 17 00:00:00 2001 From: elweyn Date: Thu, 28 Jul 2022 15:58:20 +0200 Subject: [PATCH 4/4] Add item community to the test case. --- frontend/src/components/Menu/Navbar.spec.js | 20 ++++++++++++-------- 1 file changed, 12 insertions(+), 8 deletions(-) diff --git a/frontend/src/components/Menu/Navbar.spec.js b/frontend/src/components/Menu/Navbar.spec.js index 109190e39..3f12682c0 100644 --- a/frontend/src/components/Menu/Navbar.spec.js +++ b/frontend/src/components/Menu/Navbar.spec.js @@ -49,7 +49,7 @@ describe('Navbar', () => { }) it('has ten b-nav-item in the navbar', () => { - expect(wrapper.findAll('.nav-item')).toHaveLength(10) + expect(wrapper.findAll('.nav-item')).toHaveLength(11) }) it('has first nav-item "amount GDD" in navbar', () => { @@ -68,25 +68,29 @@ describe('Navbar', () => { expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.transactions') }) + it('has first nav-item "navigation.transactions" in navbar', () => { + expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('navigation.community') + }) + it('has first nav-item "navigation.profile" in navbar', () => { - expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('navigation.profile') + expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.profile') }) }) describe('navigation Navbar (user has an elopage account)', () => { it('has a link to the members area', () => { - expect(wrapper.findAll('.nav-item').at(7).text()).toContain('navigation.members_area') - expect(wrapper.findAll('.nav-item').at(7).find('a').attributes('href')).toBe( + expect(wrapper.findAll('.nav-item').at(8).text()).toContain('navigation.members_area') + expect(wrapper.findAll('.nav-item').at(8).find('a').attributes('href')).toBe( 'https://elopage.com', ) }) it('has first nav-item "navigation.admin_area" in navbar', () => { - expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('navigation.admin_area') + expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('navigation.admin_area') }) it('has first nav-item "navigation.logout" in navbar', () => { - expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('navigation.logout') + expect(wrapper.findAll('.nav-item').at(10).text()).toEqual('navigation.logout') }) }) @@ -97,11 +101,11 @@ describe('Navbar', () => { }) it('has first nav-item "navigation.admin_area" in navbar', () => { - expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.admin_area') + expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('navigation.admin_area') }) it('has first nav-item "navigation.logout" in navbar', () => { - expect(wrapper.findAll('.nav-item').at(8).text()).toEqual('navigation.logout') + expect(wrapper.findAll('.nav-item').at(9).text()).toEqual('navigation.logout') }) }) })