From 9fbc9e78195241cc29968ff1d5394f780cec0364 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 9 Jan 2023 12:27:50 +0100
Subject: [PATCH 1/4] Creation menu is highlighted on all submenus

---
 frontend/src/components/Menu/Sidebar.vue | 2 +-
 frontend/src/pages/Community.vue         | 1 +
 2 files changed, 2 insertions(+), 1 deletion(-)

diff --git a/frontend/src/components/Menu/Sidebar.vue b/frontend/src/components/Menu/Sidebar.vue
index a373e9a74..864d42906 100644
--- a/frontend/src/components/Menu/Sidebar.vue
+++ b/frontend/src/components/Menu/Sidebar.vue
@@ -19,7 +19,7 @@
             <b-icon icon="layers" aria-hidden="true"></b-icon>
             <span class="ml-2">{{ $t('gdt.gdt') }}</span>
           </b-nav-item>
-          <b-nav-item to="/community#my" class="" active-class="activeRoute">
+          <b-nav-item to="/community" class="" active-class="activeRoute">
             <b-icon icon="people" aria-hidden="true"></b-icon>
             <span class="ml-2">{{ $t('creation') }}</span>
           </b-nav-item>
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 16af01ce3..177f7f592 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -315,6 +315,7 @@ export default {
     })
     this.updateTransactions(0)
     this.tabIndex = 1
+    this.$router.push({ path: '#my' })
   },
 }
 </script>

From c728d08b81900e3a064274d4bbb157ad4968a4f7 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Mon, 9 Jan 2023 12:47:51 +0100
Subject: [PATCH 2/4] remove padding on menu on creation navbar

---
 .../components/Template/ContentHeader/NavCommunity.vue    | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/frontend/src/components/Template/ContentHeader/NavCommunity.vue b/frontend/src/components/Template/ContentHeader/NavCommunity.vue
index 20361e82c..63f53722d 100644
--- a/frontend/src/components/Template/ContentHeader/NavCommunity.vue
+++ b/frontend/src/components/Template/ContentHeader/NavCommunity.vue
@@ -1,19 +1,19 @@
 <template>
-  <div class="nav-community">
+  <div class="nav-community container">
     <b-row class="nav-row">
-      <b-col cols="12" lg="4" md="4">
+      <b-col cols="12" lg="4" md="4" class="px-0">
         <b-btn active-class="btn-active" block variant="link" to="#edit">
           <b-icon icon="pencil" class="mr-2" />
           {{ $t('community.submitContribution') }}
         </b-btn>
       </b-col>
-      <b-col cols="12" lg="4" md="4">
+      <b-col cols="12" lg="4" md="4" class="px-0">
         <b-btn active-class="btn-active" block variant="link" to="#my">
           <b-icon icon="person" class="mr-2" />
           {{ $t('community.myContributions') }}
         </b-btn>
       </b-col>
-      <b-col cols="12" lg="4" md="4">
+      <b-col cols="12" lg="4" md="4" class="px-0">
         <b-btn active-class="btn-active" block variant="link" to="#all">
           <b-icon icon="people" class="mr-2" />
           {{ $t('community.community') }}

From 7cde62b8433a207a5f24d71af764057af7cfdce3 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Tue, 10 Jan 2023 08:44:33 +0100
Subject: [PATCH 3/4] change path in /community

---
 .../src/components/Template/ContentHeader/NavCommunity.vue  | 6 +++---
 frontend/src/pages/Community.vue                            | 4 ++--
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/frontend/src/components/Template/ContentHeader/NavCommunity.vue b/frontend/src/components/Template/ContentHeader/NavCommunity.vue
index 63f53722d..31a839af4 100644
--- a/frontend/src/components/Template/ContentHeader/NavCommunity.vue
+++ b/frontend/src/components/Template/ContentHeader/NavCommunity.vue
@@ -2,19 +2,19 @@
   <div class="nav-community container">
     <b-row class="nav-row">
       <b-col cols="12" lg="4" md="4" class="px-0">
-        <b-btn active-class="btn-active" block variant="link" to="#edit">
+        <b-btn active-class="btn-active" block variant="link" to="/community#edit">
           <b-icon icon="pencil" class="mr-2" />
           {{ $t('community.submitContribution') }}
         </b-btn>
       </b-col>
       <b-col cols="12" lg="4" md="4" class="px-0">
-        <b-btn active-class="btn-active" block variant="link" to="#my">
+        <b-btn active-class="btn-active" block variant="link" to="/community#my">
           <b-icon icon="person" class="mr-2" />
           {{ $t('community.myContributions') }}
         </b-btn>
       </b-col>
       <b-col cols="12" lg="4" md="4" class="px-0">
-        <b-btn active-class="btn-active" block variant="link" to="#all">
+        <b-btn active-class="btn-active" block variant="link" to="/community#all">
           <b-icon icon="people" class="mr-2" />
           {{ $t('community.community') }}
         </b-btn>
diff --git a/frontend/src/pages/Community.vue b/frontend/src/pages/Community.vue
index 177f7f592..cb367689c 100644
--- a/frontend/src/pages/Community.vue
+++ b/frontend/src/pages/Community.vue
@@ -259,7 +259,7 @@ export default {
           if (this.items.find((item) => item.state === 'IN_PROGRESS')) {
             this.tabIndex = 1
             if (this.$route.hash !== '#my') {
-              this.$router.push({ path: '#my' })
+              this.$router.push({ path: '/community#my' })
             }
             this.toastInfo('Du hast eine Rückfrage auf eine Contribution. Bitte beantworte diese!')
           }
@@ -315,7 +315,7 @@ export default {
     })
     this.updateTransactions(0)
     this.tabIndex = 1
-    this.$router.push({ path: '#my' })
+    this.$router.push({ path: '/community#my' })
   },
 }
 </script>

From 456b48650b68aca4bdf376b0583d6f7af2c61e4d Mon Sep 17 00:00:00 2001
From: Moriz Wahl <moriz.wahl@gmx.de>
Date: Tue, 10 Jan 2023 12:33:06 +0100
Subject: [PATCH 4/4] mock  and  instead of using vue router

---
 frontend/src/pages/Community.spec.js | 27 ++++++---------------------
 1 file changed, 6 insertions(+), 21 deletions(-)

diff --git a/frontend/src/pages/Community.spec.js b/frontend/src/pages/Community.spec.js
index 62ed46cbb..04cce68e6 100644
--- a/frontend/src/pages/Community.spec.js
+++ b/frontend/src/pages/Community.spec.js
@@ -4,32 +4,12 @@ import { toastErrorSpy, toastSuccessSpy } from '@test/testSetup'
 import { createContribution, updateContribution, deleteContribution } from '@/graphql/mutations'
 import { listContributions, listAllContributions, verifyLogin } from '@/graphql/queries'
 
-import VueRouter from 'vue-router'
-import routes from '../routes/routes'
-
 const localVue = global.localVue
-localVue.use(VueRouter)
 
 const mockStoreDispach = jest.fn()
 const apolloQueryMock = jest.fn()
 const apolloMutationMock = jest.fn()
 
-const router = new VueRouter({
-  base: '/',
-  routes,
-  linkActiveClass: 'active',
-  mode: 'history',
-  // scrollBehavior: (to, from, savedPosition) => {
-  //   if (savedPosition) {
-  //     return savedPosition
-  //   }
-  //   if (to.hash) {
-  //     return { selector: to.hash }
-  //   }
-  //   return { x: 0, y: 0 }
-  // },
-})
-
 describe('Community', () => {
   let wrapper
 
@@ -49,12 +29,17 @@ describe('Community', () => {
     $i18n: {
       locale: 'en',
     },
+    $router: {
+      push: jest.fn(),
+    },
+    $route: {
+      hash: 'my',
+    },
   }
 
   const Wrapper = () => {
     return mount(Community, {
       localVue,
-      router,
       mocks,
     })
   }