resolve conflict

frontend/src/components/Menu/Sidebar.spec.js

@@ -37,66 +37,104 @@ describe('Sidebar', () => {
         expect(wrapper.findAll('.nav-item')).toHaveLength(8)
       })
 
-      it('has first nav-item "navigation.overview" in navbar', () => {
+      describe('navigation Navbar (general elements)', () => {
-        expect(wrapper.findAll('.nav-item').at(0).text()).toEqual('navigation.overview')
+        it('has first nav-item "navigation.overview" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(0).text()).toEqual('navigation.overview')
+        })
+
+        it('has first nav-item "navigation.send" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('navigation.send')
+        })
+
+        it('has first nav-item "navigation.transactions" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(2).text()).toEqual('navigation.transactions')
+        })
+
+        it('has first nav-item "navigation.community" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(3).text()).toContain('navigation.community')
+        })
+
+        it('has first nav-item "navigation.profile" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('navigation.profile')
+        })
+
+        it('has first nav-item "navigation.profile" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.profile')
+        })
       })
 
-      it('has first nav-item "navigation.send" in navbar', () => {
+      describe('navigation Navbar (user has an elopage account)', () => {
-        expect(wrapper.findAll('.nav-item').at(1).text()).toEqual('navigation.send')
+        it('has eight b-nav-item in the navbar', () => {
+          expect(wrapper.findAll('.nav-item')).toHaveLength(8)
+        })
+
+        it('has a link to the members area', () => {
+          expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.members_area')
+          expect(wrapper.findAll('.nav-item').at(5).find('a').attributes('href')).toBe('#')
+        })
+
+        it('has first nav-item "navigation.admin_area" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('navigation.admin_area')
+        })
+
+        it('has first nav-item "navigation.logout" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.logout')
+        })
       })
 
-      it('has first nav-item "navigation.transactions" in navbar', () => {
+      describe('navigation Navbar (user has no elopage account)', () => {
-        expect(wrapper.findAll('.nav-item').at(2).text()).toEqual('navigation.transactions')
+        beforeAll(() => {
+          mocks.$store.state.hasElopage = false
+          wrapper = Wrapper()
+        })
+
+        it('has seven b-nav-item in the navbar', () => {
+          expect(wrapper.findAll('.nav-item')).toHaveLength(7)
+        })
+
+        it('has first nav-item "navigation.admin_area" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.admin_area')
+        })
+
+        it('has first nav-item "community.community" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('community.community')
+        })
+
+        it('has a link to the members area', () => {
+          expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.members_area')
+          expect(wrapper.findAll('.nav-item').at(5).find('a').attributes('href')).toBe('#')
+        })
+
+        it('has first nav-item "navigation.admin_area" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('navigation.admin_area')
+        })
+
+        it('has first nav-item "navigation.logout" in navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.logout')
+        })
       })
 
-      it('has first nav-item "navigation.community" in navbar', () => {
+      describe('navigation Navbar (user has no elopage account)', () => {
-        expect(wrapper.findAll('.nav-item').at(3).text()).toContain('navigation.community')
+        beforeAll(() => {
-      })
+          mocks.$store.state.hasElopage = false
+          wrapper = Wrapper()
+        })
 
-      it('has first nav-item "navigation.profile" in navbar', () => {
+        it('has seven b-nav-item in the navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(4).text()).toEqual('navigation.profile')
+          expect(wrapper.findAll('.nav-item')).toHaveLength(7)
-      })
+        })
-    })
 
-    describe('navigation Navbar (user has an elopage account)', () => {
+        it('has first nav-item "navigation.admin_area" in navbar', () => {
-      it('has eight b-nav-item in the navbar', () => {
+          expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.admin_area')
-        expect(wrapper.findAll('.nav-item')).toHaveLength(8)
+        })
-      })
 
-      it('has a link to the members area', () => {
+        it('has first nav-item "community.community" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.members_area')
+          expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('community.community')
-        expect(wrapper.findAll('.nav-item').at(5).find('a').attributes('href')).toBe('#')
+        })
-      })
 
-      it('has first nav-item "navigation.admin_area" in navbar', () => {
+        it('has first nav-item "navigation.logout" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('navigation.admin_area')
+          expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.logout')
-      })
+        })
-
-      it('has first nav-item "navigation.logout" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.logout')
-      })
-    })
-
-    describe('navigation Navbar (user has no elopage account)', () => {
-      beforeAll(() => {
-        mocks.$store.state.hasElopage = false
-        wrapper = Wrapper()
-      })
-
-      it('has seven b-nav-item in the navbar', () => {
-        expect(wrapper.findAll('.nav-item')).toHaveLength(7)
-      })
-
-      it('has first nav-item "navigation.admin_area" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(5).text()).toEqual('navigation.admin_area')
-      })
-
-      it('has first nav-item "community.community" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(6).text()).toEqual('community.community')
-      })
-      
-      it('has first nav-item "navigation.logout" in navbar', () => {
-        expect(wrapper.findAll('.nav-item').at(7).text()).toEqual('navigation.logout')
       })
     })
   })

frontend/src/components/Menu/Sidebar.vue

@@ -24,6 +24,10 @@
             <b-icon icon="gear" aria-hidden="true"></b-icon>
             {{ $t('navigation.profile') }}
           </b-nav-item>
+          <b-nav-item to="/info" class="mb-3">
+            <b-icon icon="info" aria-hidden="true"></b-icon>
+            {{ $t('navigation.info') }}
+          </b-nav-item>
         </b-nav>
         <hr />
         <b-nav vertical class="w-100">

frontend/src/graphql/queries.js

@@ -176,8 +176,8 @@ export const listContributionLinks = gql`
       maxAmount
     }
   }
- `
+`
- 
+
 export const listContributions = gql`
   query(
     $currentPage: Int = 1

frontend/src/locales/de.json

@@ -28,12 +28,11 @@
     "current-community": "Aktuelle Gemeinschaft",
     "members": "Mitglieder",
     "moderators": "Moderatoren",
+    "myContributions": "Meine Beiträge zum Gemeinwohl",
     "openContributionLinks": "öffentliche Beitragslinklist",
     "openContributionLinkText": "Folgende automatische Schöpfungen werden zur Zeit durch die Gemeinschaft '{_name_}' bereitgestellt.",
     "other-communities": "Weitere Gemeinschaften",
     "statistic": "Statistik",
-    "myContributions": "Meine Beiträge zum Gemeinwohl",
-    "other-communities": "Weitere Gemeinschaften",
     "submitContribution": "Beitrag einreichen",
     "switch-to-this-community": "zu dieser Gemeinschaft wechseln"
   },
@@ -227,6 +226,7 @@
   "navigation": {
     "admin_area": "Adminbereich",
     "community": "Gemeinschaft",
+    "info": "Info",
     "logout": "Abmelden",
     "members_area": "Mitgliederbereich",
     "overview": "Übersicht",

frontend/src/locales/en.json

@@ -28,12 +28,11 @@
     "current-community": "Current community",
     "members": "Members",
     "moderators": "Moderators",
+    "myContributions": "My contributions to the common good",
     "openContributionLinks": "open Contribution links list",
     "openContributionLinkText": "The following automatic creations are currently provided by the '{_name_}' community.",
     "other-communities": "Other communities",
     "statistic": "Statistics",
-    "myContributions": "My contributions to the common good",
-    "other-communities": "Other communities",
     "submitContribution": "Submit contribution",
     "switch-to-this-community": "Switch to this community"
   },
@@ -227,6 +226,7 @@
   "navigation": {
     "admin_area": "Admin Area",
     "community": "Community",
+    "info": "Info",
     "logout": "Logout",
     "members_area": "Members area",
     "overview": "Overview",

frontend/src/pages/Community.vue

@@ -1,59 +1,4 @@
 <template>
-  <div>
-    <b-container>
-      <div class="h3">{{ $t('community.community') }}</div>
-      <div class="h1">{{ CONFIG.COMMUNITY_NAME }}</div>
-      <div>
-        {{ CONFIG.COMMUNITY_DESCRIPTION }}
-      </div>
-      <div>
-        {{ CONFIG.COMMUNITY_URL }}
-      </div>
-    </b-container>
-
-    <hr />
-    <b-container>
-      <div class="h3">{{ $t('community.openContributionLinks') }}</div>
-      <small>
-        {{ $t('community.openContributionLinkText', { _name_: CONFIG.COMMUNITY_NAME }) }}
-      </small>
-      <ul>
-        <li v-for="item in items" v-bind:key="item">{{ item.id }}</li>
-      </ul>
-    </b-container>
-    <hr />
-    <b-container>
-      <div class="h3">{{ $t('community.moderators') }}</div>
-      <ul>
-        <li v-for="item in items" v-bind:key="item">{{ item.id }}</li>
-      </ul>
-      <mail>{{ supportMail }}</mail>
-    </b-container>
-    <hr />
-    <b-container>
-      <div class="h3">{{ $t('community.statistic') }}</div>
-      <div>
-        <div>
-          {{ $t('community.members') }}
-          <span class="h4">{{ membersCount }}</span>
-        </div>
-      </div>
-    </b-container>
-  </div>
-</template>
-<script>
-import CONFIG from '@/config'
-
-export default {
-  name: 'Community',
-  data() {
-    return {
-      CONFIG,
-      items: [{ id: 1 }, { id: 2 }, { id: 3 }],
-      supportMail: 'support@supportemail.de',
-      membersCount: '1203',
-    }
-  },
   <div class="community-page">
     <div>
       <b-tabs v-model="tabIndex" content-class="mt-3" align="center">

frontend/src/pages/InfoStatistic.vue

@@ -0,0 +1,58 @@
+<template>
+  <div>
+    <b-container>
+      <div class="h3">{{ $t('community.community') }}</div>
+      <div class="h1">{{ CONFIG.COMMUNITY_NAME }}</div>
+      <div>
+        {{ CONFIG.COMMUNITY_DESCRIPTION }}
+      </div>
+      <div>
+        {{ CONFIG.COMMUNITY_URL }}
+      </div>
+    </b-container>
+
+    <hr />
+    <b-container>
+      <div class="h3">{{ $t('community.openContributionLinks') }}</div>
+      <small>
+        {{ $t('community.openContributionLinkText', { _name_: CONFIG.COMMUNITY_NAME }) }}
+      </small>
+      <ul>
+        <li v-for="item in items" v-bind:key="item">{{ item.id }}</li>
+      </ul>
+    </b-container>
+    <hr />
+    <b-container>
+      <div class="h3">{{ $t('community.moderators') }}</div>
+      <ul>
+        <li v-for="item in items" v-bind:key="item">{{ item.id }}</li>
+      </ul>
+      <mail>{{ supportMail }}</mail>
+    </b-container>
+    <hr />
+    <b-container>
+      <div class="h3">{{ $t('community.statistic') }}</div>
+      <div>
+        <div>
+          {{ $t('community.members') }}
+          <span class="h4">{{ membersCount }}</span>
+        </div>
+      </div>
+    </b-container>
+  </div>
+</template>
+<script>
+import CONFIG from '@/config'
+
+export default {
+  name: 'InfoStatistic',
+  data() {
+    return {
+      CONFIG,
+      items: [{ id: 1 }, { id: 2 }, { id: 3 }],
+      supportMail: 'support@supportemail.de',
+      membersCount: '1203',
+    }
+  },
+}
+</script>

frontend/src/routes/routes.js

@@ -45,6 +45,13 @@ const routes = [
       requiresAuth: true,
     },
   },
+  {
+    path: '/info',
+    component: () => import('@/pages/InfoStatistic.vue'),
+    meta: {
+      requiresAuth: true,
+    },
+  },
   {
     path: '/login/:code?',
     component: () => import('@/pages/Login.vue'),