Merge pull request #2102 from gradido/fix-navbar-community-item

Fix navbar community item

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')
       })
     })
   })

frontend/src/components/Menu/Navbar.vue

@@ -52,6 +52,10 @@
           <b-icon icon="layout-text-sidebar-reverse" aria-hidden="true"></b-icon>
           {{ $t('navigation.transactions') }}
         </b-nav-item>
+        <b-nav-item to="/community" class="mb-3">
+          <b-icon icon="people" aria-hidden="true"></b-icon>
+          {{ $t('navigation.community') }}
+        </b-nav-item>
         <b-nav-item to="/profile" class="mb-3">
           <b-icon icon="gear" aria-hidden="true"></b-icon>
           {{ $t('navigation.profile') }}
@@ -60,9 +64,6 @@
         <b-nav-item v-if="$store.state.hasElopage" :href="elopageUri" class="mb-3" target="_blank">
           <b-icon icon="link45deg" aria-hidden="true"></b-icon>
           {{ $t('navigation.members_area') }}
-          <b-badge v-if="!$store.state.hasElopage" pill variant="danger">
-            {{ $t('math.exclaim') }}
-          </b-badge>
         </b-nav-item>
         <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
           <b-icon icon="shield-check" aria-hidden="true"></b-icon>

frontend/src/components/Menu/Sidebar.vue

@@ -35,9 +35,6 @@
           >
             <b-icon icon="link45deg" aria-hidden="true"></b-icon>
             {{ $t('navigation.members_area') }}
-            <b-badge v-if="!$store.state.hasElopage" pill variant="danger">
-              {{ $t('math.exclaim') }}
-            </b-badge>
           </b-nav-item>
           <b-nav-item class="mb-3" v-if="$store.state.isAdmin" @click="$emit('admin')">
             <b-icon icon="shield-check" aria-hidden="true"></b-icon>

frontend/src/locales/de.json

@@ -205,7 +205,6 @@
   "math": {
     "aprox": "~",
     "equal": "=",
-    "exclaim": "!",
     "minus": "−",
     "pipe": "|"
   },

frontend/src/locales/en.json

@@ -205,7 +205,6 @@
   "math": {
     "aprox": "~",
     "equal": "=",
-    "exclaim": "!",
     "minus": "−",
     "pipe": "|"
   },