From 31a4be9375a6dc1c5f4baea7cc79945daa9fa19b Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 27 Oct 2022 08:24:20 +0200
Subject: [PATCH 01/17] add target url dynamic

---
 .../features/PageParamsLink/PageParamsLink.vue  |  2 +-
 webapp/constants/headerMenu.js                  | 17 +++++++++--------
 webapp/constants/links.js                       |  8 ++++----
 3 files changed, 14 insertions(+), 13 deletions(-)

diff --git a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
index ae01dd319..c0ed6a593 100644
--- a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
+++ b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
@@ -6,7 +6,7 @@
   >
     <slot />
   </nuxt-link>
-  <a v-else :href="pageParams.externalLink" target="_blank" :data-test="pageParams.name + '-link'">
+  <a v-else :href="pageParams.externalLink" :target="pageParams.target" :data-test="pageParams.name + '-link'">
     <slot />
   </a>
 </template>
diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js
index 6d0a0afad..6fd66edc3 100644
--- a/webapp/constants/headerMenu.js
+++ b/webapp/constants/headerMenu.js
@@ -1,12 +1,13 @@
 export default {
   MENU: [
-    // {
-    //   nameIdent: 'nameIdent',
-    //   path: '/',
-    // },
-    // {
-    //   nameIdent: 'nameIdent',
-    //   url: 'https://ocelot.social',
-    // },
+    {
+      nameIdent: 'nameIdent',
+      path: '/',
+    },
+    {
+      nameIdent: 'nameIdent',
+      url: 'https://ocelot.social',
+      target: '_blank'
+    },
   ],
 }
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
index c65c9be3c..694d9f522 100644
--- a/webapp/constants/links.js
+++ b/webapp/constants/links.js
@@ -4,7 +4,7 @@ import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
 
 const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
   externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
-
+  target: '_blank',
   internalPage: {
     // footerIdent: 'site.made', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.made', // localized string identifier, if undefined default is used
@@ -18,7 +18,7 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
 const DONATE = defaultPageParamsPages.DONATE.overwrite({
   // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
   externalLink: 'https://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating
-
+  target: '_blank',
   internalPage: {
     // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.donate', // localized string identifier, if undefined default is used
@@ -32,7 +32,7 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({
 const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
   // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
   externalLink: 'https://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating
-
+  target: '_blank',
   internalPage: {
     // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.imprint', // localized string identifier, if undefined default is used
@@ -97,7 +97,7 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({
 })
 const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
   externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
-
+  target: '_blank',
   internalPage: {
     // footerIdent: 'site.support', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.support', // localized string identifier, if undefined default is used

From 1dfdc61220e955437caca93538d66af80e47187d Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 27 Oct 2022 08:48:58 +0200
Subject: [PATCH 02/17] footer links target dynamic

---
 webapp/components/HeaderMenu/HeaderMenu.vue          |  2 +-
 .../_new/features/PageParamsLink/PageParamsLink.vue  |  3 ++-
 webapp/constants/links.js                            | 12 ++++++++----
 3 files changed, 11 insertions(+), 6 deletions(-)

diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue
index 8876338ee..6fb8ca635 100644
--- a/webapp/components/HeaderMenu/HeaderMenu.vue
+++ b/webapp/components/HeaderMenu/HeaderMenu.vue
@@ -27,7 +27,7 @@
           :width="{ base: 'auto' }"
           style="margin-right: 20px"
         >
-          <a v-if="item.url" :href="item.url" target="_blank">
+          <a v-if="item.url" :href="item.url" :target="item.target">
             <ds-text size="large" bold>
               {{ $t(item.nameIdent) }}
             </ds-text>
diff --git a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
index c0ed6a593..fb80975ec 100644
--- a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
+++ b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
@@ -6,9 +6,10 @@
   >
     <slot />
   </nuxt-link>
-  <a v-else :href="pageParams.externalLink" :target="pageParams.target" :data-test="pageParams.name + '-link'">
+  <a v-else :href="pageParams.externalLink" :target="pageParams.internalPage.target" :data-test="pageParams.name + '-link'">
     <slot />
   </a>
+  
 </template>
 
 <script>
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
index 694d9f522..c6f67fa91 100644
--- a/webapp/constants/links.js
+++ b/webapp/constants/links.js
@@ -4,8 +4,9 @@ import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
 
 const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
   externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
-  target: '_blank',
+
   internalPage: {
+    target: '_blank',
     // footerIdent: 'site.made', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.made', // localized string identifier, if undefined default is used
     // headlineIdent: 'site.made', // localized string identifier, on null it's hidden, if undefined default is used
@@ -18,8 +19,9 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
 const DONATE = defaultPageParamsPages.DONATE.overwrite({
   // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
   externalLink: 'https://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating
-  target: '_blank',
+  
   internalPage: {
+    target: '_blank',
     // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.donate', // localized string identifier, if undefined default is used
     // headlineIdent: 'site.donate', // localized string identifier, on null it's hidden, if undefined default is used
@@ -32,8 +34,9 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({
 const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
   // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
   externalLink: 'https://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating
-  target: '_blank',
+
   internalPage: {
+    target: '_blank',
     // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.imprint', // localized string identifier, if undefined default is used
     // headlineIdent: 'site.imprint', // localized string identifier, on null it's hidden, if undefined default is used
@@ -97,8 +100,9 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({
 })
 const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
   externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
-  target: '_blank',
+
   internalPage: {
+    target: '_blank',
     // footerIdent: 'site.support', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.support', // localized string identifier, if undefined default is used
     // headlineIdent: 'site.support', // on null default is used, on empty string it's hidden

From bad97a2fca6aae872fe8b2cb1ba131964d4424b4 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 27 Oct 2022 08:50:37 +0200
Subject: [PATCH 03/17] fix lint

---
 .../_new/features/PageParamsLink/PageParamsLink.vue       | 8 ++++++--
 webapp/constants/headerMenu.js                            | 2 +-
 webapp/constants/links.js                                 | 2 +-
 3 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
index fb80975ec..359e76210 100644
--- a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
+++ b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
@@ -6,10 +6,14 @@
   >
     <slot />
   </nuxt-link>
-  <a v-else :href="pageParams.externalLink" :target="pageParams.internalPage.target" :data-test="pageParams.name + '-link'">
+  <a
+    v-else
+    :href="pageParams.externalLink"
+    :target="pageParams.internalPage.target"
+    :data-test="pageParams.name + '-link'"
+  >
     <slot />
   </a>
-  
 </template>
 
 <script>
diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js
index 6fd66edc3..ac1026463 100644
--- a/webapp/constants/headerMenu.js
+++ b/webapp/constants/headerMenu.js
@@ -7,7 +7,7 @@ export default {
     {
       nameIdent: 'nameIdent',
       url: 'https://ocelot.social',
-      target: '_blank'
+      target: '_blank',
     },
   ],
 }
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
index c6f67fa91..07bbd970b 100644
--- a/webapp/constants/links.js
+++ b/webapp/constants/links.js
@@ -19,7 +19,7 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
 const DONATE = defaultPageParamsPages.DONATE.overwrite({
   // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
   externalLink: 'https://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating
-  
+
   internalPage: {
     target: '_blank',
     // footerIdent: 'site.donate', // localized string identifier, if undefined default is used

From 2ae5e2637648ebc4f1eb316556f0899f56e9b10f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Thu, 27 Oct 2022 08:51:40 +0200
Subject: [PATCH 04/17] comment out unused menu

---
 webapp/constants/headerMenu.js | 18 +++++++++---------
 1 file changed, 9 insertions(+), 9 deletions(-)

diff --git a/webapp/constants/headerMenu.js b/webapp/constants/headerMenu.js
index ac1026463..aa87a598c 100644
--- a/webapp/constants/headerMenu.js
+++ b/webapp/constants/headerMenu.js
@@ -1,13 +1,13 @@
 export default {
   MENU: [
-    {
-      nameIdent: 'nameIdent',
-      path: '/',
-    },
-    {
-      nameIdent: 'nameIdent',
-      url: 'https://ocelot.social',
-      target: '_blank',
-    },
+    // {
+    //   nameIdent: 'nameIdent',
+    //   path: '/',
+    // },
+    // {
+    //   nameIdent: 'nameIdent',
+    //   url: 'https://ocelot.social',
+    //   target: '_blank',
+    // },
   ],
 }

From 0c9fcaa5c6dd68e67247a5e3f9e0cc557b9d731f Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 28 Oct 2022 08:47:55 +0200
Subject: [PATCH 05/17] test coverage to 64%

---
 webapp/components/Group/GroupMember.vue | 7 +++----
 1 file changed, 3 insertions(+), 4 deletions(-)

diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue
index 0a99aa21c..fc7f6e25a 100644
--- a/webapp/components/Group/GroupMember.vue
+++ b/webapp/components/Group/GroupMember.vue
@@ -91,7 +91,6 @@
           v-if="scope.row.myRoleInGroup !== 'owner'"
           size="small"
           primary
-          @click="deleteMember(scope.row.id)"
         >
           <!-- TODO: implement removal of group members -->
           <!--           :disabled="scope.row.myRoleInGroup === 'owner'"
@@ -226,9 +225,9 @@ export default {
     //   this.isOpen = true
     //   this.memberId = row.id
     // },
-    deleteMember(id) {
-      alert('deleteMember: ' + id)
-    },
+    // deleteMember(id) {
+      // alert('deleteMember: ' + id)
+    // },
   },
 }
 </script>

From 709c9b107300f72f9b326abd425d919f1a5d5194 Mon Sep 17 00:00:00 2001
From: ogerly <fridolin@tutanota.com>
Date: Fri, 28 Oct 2022 08:48:29 +0200
Subject: [PATCH 06/17] fix lint

---
 webapp/components/Group/GroupMember.vue | 8 ++------
 1 file changed, 2 insertions(+), 6 deletions(-)

diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue
index fc7f6e25a..4ae07e5f2 100644
--- a/webapp/components/Group/GroupMember.vue
+++ b/webapp/components/Group/GroupMember.vue
@@ -87,11 +87,7 @@
         </ds-chip>
       </template>
       <template #edit="scope">
-        <ds-button
-          v-if="scope.row.myRoleInGroup !== 'owner'"
-          size="small"
-          primary
-        >
+        <ds-button v-if="scope.row.myRoleInGroup !== 'owner'" size="small" primary>
           <!-- TODO: implement removal of group members -->
           <!--           :disabled="scope.row.myRoleInGroup === 'owner'"
  -->
@@ -226,7 +222,7 @@ export default {
     //   this.memberId = row.id
     // },
     // deleteMember(id) {
-      // alert('deleteMember: ' + id)
+    // alert('deleteMember: ' + id)
     // },
   },
 }

From ef97b4c388e9bb7fb0a9b90deee3c388c779adcb Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 09:11:01 +0200
Subject: [PATCH 07/17] Fix a merging left over with header logo click and fix
 functionallity on empty string targets

---
 webapp/components/HeaderMenu/HeaderMenu.vue | 26 +++++++++++++++++++--
 1 file changed, 24 insertions(+), 2 deletions(-)

diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue
index 8876338ee..44d34e5b7 100644
--- a/webapp/components/HeaderMenu/HeaderMenu.vue
+++ b/webapp/components/HeaderMenu/HeaderMenu.vue
@@ -7,7 +7,13 @@
         <ds-flex-item :width="{ base: LOGOS.LOGO_HEADER_WIDTH }" style="margin-right: 20px">
           <a
             v-if="LOGOS.LOGO_HEADER_CLICK.externalLink"
-            :href="LOGOS.LOGO_HEADER_CLICK.externalLink"
+            :href="LOGOS.LOGO_HEADER_CLICK.externalLink.url"
+            :target="
+              LOGOS.LOGO_HEADER_CLICK.externalLink.target ||
+              LOGOS.LOGO_HEADER_CLICK.externalLink.target === ''
+                ? LOGOS.LOGO_HEADER_CLICK.externalLink.target
+                : '_blank'
+            "
           >
             <logo logoType="header" />
           </a>
@@ -91,7 +97,23 @@
         <!-- logo, hamburger-->
         <ds-flex>
           <ds-flex-item :width="{ base: LOGOS.LOGO_HEADER_WIDTH }" style="margin-right: 20px">
-            <nuxt-link :to="{ name: 'index' }" v-scroll-to="'.main-navigation'">
+            <a
+              v-if="LOGOS.LOGO_HEADER_CLICK.externalLink"
+              :href="LOGOS.LOGO_HEADER_CLICK.externalLink.url"
+              :target="
+                LOGOS.LOGO_HEADER_CLICK.externalLink.target ||
+                LOGOS.LOGO_HEADER_CLICK.externalLink.target === ''
+                  ? LOGOS.LOGO_HEADER_CLICK.externalLink.target
+                  : '_blank'
+              "
+            >
+              <logo logoType="header" />
+            </a>
+            <nuxt-link
+              v-else
+              :to="LOGOS.LOGO_HEADER_CLICK.internalPath.to"
+              v-scroll-to="LOGOS.LOGO_HEADER_CLICK.internalPath.scrollTo"
+            >
               <logo logoType="header" />
             </nuxt-link>
           </ds-flex-item>

From 6d3c7f0acb533f1fb54e5e44a9abb104b6befb3a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 10:12:39 +0200
Subject: [PATCH 08/17] Simplify usage of
 'LOGOS.LOGO_HEADER_CLICK.externalLink.target'

---
 webapp/components/HeaderMenu/HeaderMenu.vue | 14 ++------------
 1 file changed, 2 insertions(+), 12 deletions(-)

diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue
index 44d34e5b7..a9340a3be 100644
--- a/webapp/components/HeaderMenu/HeaderMenu.vue
+++ b/webapp/components/HeaderMenu/HeaderMenu.vue
@@ -8,12 +8,7 @@
           <a
             v-if="LOGOS.LOGO_HEADER_CLICK.externalLink"
             :href="LOGOS.LOGO_HEADER_CLICK.externalLink.url"
-            :target="
-              LOGOS.LOGO_HEADER_CLICK.externalLink.target ||
-              LOGOS.LOGO_HEADER_CLICK.externalLink.target === ''
-                ? LOGOS.LOGO_HEADER_CLICK.externalLink.target
-                : '_blank'
-            "
+            :target="LOGOS.LOGO_HEADER_CLICK.externalLink.target"
           >
             <logo logoType="header" />
           </a>
@@ -100,12 +95,7 @@
             <a
               v-if="LOGOS.LOGO_HEADER_CLICK.externalLink"
               :href="LOGOS.LOGO_HEADER_CLICK.externalLink.url"
-              :target="
-                LOGOS.LOGO_HEADER_CLICK.externalLink.target ||
-                LOGOS.LOGO_HEADER_CLICK.externalLink.target === ''
-                  ? LOGOS.LOGO_HEADER_CLICK.externalLink.target
-                  : '_blank'
-              "
+              :target="LOGOS.LOGO_HEADER_CLICK.externalLink.target"
             >
               <logo logoType="header" />
             </a>

From 00c10cc1a7c6339e4bcccec6ae43d9384fcdadad Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 11:12:34 +0200
Subject: [PATCH 09/17] Refine footer links and donation link and fix their
 tests

---
 .../components/PageFooter/PageFooter.spec.js  | 31 +++++++++---
 .../PageParamsLink/PageParamsLink.vue         |  2 +-
 webapp/components/utils/InternalPages.js      | 48 +++++++++++++++----
 webapp/components/utils/PageParams.js         | 13 +++--
 webapp/constants/links.js                     | 39 +++++++++------
 5 files changed, 101 insertions(+), 32 deletions(-)

diff --git a/webapp/components/PageFooter/PageFooter.spec.js b/webapp/components/PageFooter/PageFooter.spec.js
index 95be76630..aecdcf2f7 100644
--- a/webapp/components/PageFooter/PageFooter.spec.js
+++ b/webapp/components/PageFooter/PageFooter.spec.js
@@ -100,21 +100,40 @@ describe('PageFooter.vue', () => {
         const links = {
           ...linksDefault,
           ORGANIZATION: linksDefault.ORGANIZATION.overwrite({
-            externalLink: 'https://ocelot.social',
+            externalLink: {
+              url: 'https://ocelot.social',
+              target: '_blank',
+            },
           }),
           IMPRINT: linksDefault.IMPRINT.overwrite({
-            externalLink: 'https://ocelot.social/IMPRINT',
+            externalLink: {
+              url: 'https://ocelot.social/IMPRINT',
+              target: '_blank',
+            },
           }),
           TERMS_AND_CONDITIONS: linksDefault.TERMS_AND_CONDITIONS.overwrite({
-            externalLink: 'https://ocelot.social/TERMS_AND_CONDITIONS',
+            externalLink: {
+              url: 'https://ocelot.social/TERMS_AND_CONDITIONS',
+              target: '_blank',
+            },
           }),
           CODE_OF_CONDUCT: linksDefault.CODE_OF_CONDUCT.overwrite({
-            externalLink: 'https://ocelot.social/CODE_OF_CONDUCT',
+            externalLink: {
+              url: 'https://ocelot.social/CODE_OF_CONDUCT',
+              target: '_blank',
+            },
           }),
           DATA_PRIVACY: linksDefault.DATA_PRIVACY.overwrite({
-            externalLink: 'https://ocelot.social/DATA_PRIVACY',
+            externalLink: {
+              url: 'https://ocelot.social/DATA_PRIVACY',
+              target: '_blank',
+            },
           }),
-          FAQ: linksDefault.FAQ.overwrite({ externalLink: 'https://ocelot.social/FAQ' }),
+          FAQ: linksDefault.FAQ.overwrite({
+            externalLink: {
+              url: 'https://ocelot.social/FAQ',
+              target: '_blank',
+          } }),
         }
         wrapper = Wrapper()
         wrapper.setData({ links })
diff --git a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
index 359e76210..dc03aa373 100644
--- a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
+++ b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
@@ -8,7 +8,7 @@
   </nuxt-link>
   <a
     v-else
-    :href="pageParams.externalLink"
+    :href="pageParams.externalLink.url"
     :target="pageParams.internalPage.target"
     :data-test="pageParams.name + '-link'"
   >
diff --git a/webapp/components/utils/InternalPages.js b/webapp/components/utils/InternalPages.js
index f45601af9..dfdc04a6e 100644
--- a/webapp/components/utils/InternalPages.js
+++ b/webapp/components/utils/InternalPages.js
@@ -4,7 +4,11 @@ export const defaultPageParamsPages = {
   ORGANIZATION: new PageParams({
     name: 'organization',
 
-    externalLink: null, // if string is defined and not empty it's dominating
+    // externalLink: {
+    //   url: 'https://ocelot.social',
+    //   target: '_blank',
+    // },
+    externalLink: null, // if defined it's dominating
 
     internalPage: {
       pageRoute: '/organization', // static, don't change! internal page in case no external is defined
@@ -21,7 +25,11 @@ export const defaultPageParamsPages = {
   DONATE: new PageParams({
     name: 'donate',
 
-    externalLink: null, // if string is defined and not empty it's dominating
+    // externalLink: {
+    //   url: 'https://ocelot.social',
+    //   target: '_blank',
+    // },
+    externalLink: null, // if defined it's dominating
 
     internalPage: {
       pageRoute: '/donate', // static, don't change! internal page in case no external is defined
@@ -38,7 +46,11 @@ export const defaultPageParamsPages = {
   IMPRINT: new PageParams({
     name: 'imprint',
 
-    externalLink: null, // if string is defined and not empty it's dominating
+    // externalLink: {
+    //   url: 'https://ocelot.social',
+    //   target: '_blank',
+    // },
+    externalLink: null, // if defined it's dominating
 
     internalPage: {
       pageRoute: '/imprint', // static, don't change! internal page in case no external is defined
@@ -55,7 +67,11 @@ export const defaultPageParamsPages = {
   TERMS_AND_CONDITIONS: new PageParams({
     name: 'terms-and-conditions',
 
-    externalLink: null, // if string is defined and not empty it's dominating
+    // externalLink: {
+    //   url: 'https://ocelot.social',
+    //   target: '_blank',
+    // },
+    externalLink: null, // if defined it's dominating
 
     internalPage: {
       pageRoute: '/terms-and-conditions', // static, don't change! internal page in case no external is defined
@@ -72,7 +88,11 @@ export const defaultPageParamsPages = {
   CODE_OF_CONDUCT: new PageParams({
     name: 'code-of-conduct',
 
-    externalLink: null, // if string is defined and not empty it's dominating
+    // externalLink: {
+    //   url: 'https://ocelot.social',
+    //   target: '_blank',
+    // },
+    externalLink: null, // if defined it's dominating
 
     internalPage: {
       pageRoute: '/code-of-conduct', // static, don't change! internal page in case no external is defined
@@ -89,7 +109,11 @@ export const defaultPageParamsPages = {
   DATA_PRIVACY: new PageParams({
     name: 'data-privacy',
 
-    externalLink: null, // if string is defined and not empty it's dominating
+    // externalLink: {
+    //   url: 'https://ocelot.social',
+    //   target: '_blank',
+    // },
+    externalLink: null, // if defined it's dominating
 
     internalPage: {
       pageRoute: '/data-privacy', // static, don't change! internal page in case no external is defined
@@ -106,7 +130,11 @@ export const defaultPageParamsPages = {
   FAQ: new PageParams({
     name: 'faq',
 
-    externalLink: null, // if string is defined and not empty it's dominating
+    // externalLink: {
+    //   url: 'https://ocelot.social',
+    //   target: '_blank',
+    // },
+    externalLink: null, // if defined it's dominating
 
     internalPage: {
       pageRoute: '/faq', // static, don't change! internal page in case no external is defined
@@ -123,7 +151,11 @@ export const defaultPageParamsPages = {
   SUPPORT: new PageParams({
     name: 'support',
 
-    externalLink: null,
+    // externalLink: {
+    //   url: 'https://ocelot.social',
+    //   target: '_blank',
+    // },
+    externalLink: null, // if defined it's dominating
 
     internalPage: {
       pageRoute: '/support', // static, don't change '*/support'! internal page in case no external is defined
diff --git a/webapp/components/utils/PageParams.js b/webapp/components/utils/PageParams.js
index 9d1fc6dfe..50b58a18f 100644
--- a/webapp/components/utils/PageParams.js
+++ b/webapp/components/utils/PageParams.js
@@ -24,18 +24,25 @@ export class PageParams {
   }
 
   get isInternalPage() {
-    return this.noStringDefined(this.externalLink)
+    return !(this.externalLink && !this.noStringDefined(this.externalLink.url))
   }
 
   get link() {
-    return this.isInternalPage ? this.internalPage.pageRoute : this.externalLink
+    return this.isInternalPage ? this.internalPage.pageRoute : this.externalLink.url
   }
 
   redirectToPage(thisComponent) {
     if (this.isInternalPage) {
       thisComponent.$router.push(this.internalPage.pageRoute)
     } else if (typeof window !== 'undefined') {
-      window.location.href = this.externalLink
+      if (this.externalLink.target === '_blank') {
+        window.open(
+          this.externalLink.url,
+          this.externalLink.target,
+        )
+      } else {
+        window.location.href = this.externalLink.url
+      }
     }
   }
 }
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
index 07bbd970b..3af64d374 100644
--- a/webapp/constants/links.js
+++ b/webapp/constants/links.js
@@ -3,10 +3,13 @@
 import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
 
 const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
-  externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
+  // if defined it's dominating
+  externalLink: {
+    url: 'https://ocelot.social',
+    target: '_blank',
+  },
 
   internalPage: {
-    target: '_blank',
     // footerIdent: 'site.made', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.made', // localized string identifier, if undefined default is used
     // headlineIdent: 'site.made', // localized string identifier, on null it's hidden, if undefined default is used
@@ -17,11 +20,14 @@ const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
   },
 })
 const DONATE = defaultPageParamsPages.DONATE.overwrite({
-  // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-  externalLink: 'https://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating
+  // if defined it's dominating
+  externalLink: {
+    // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
+    url: 'https://ocelot-social.herokuapp.com/donations',
+    target: '_blank',
+  },
 
   internalPage: {
-    target: '_blank',
     // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.donate', // localized string identifier, if undefined default is used
     // headlineIdent: 'site.donate', // localized string identifier, on null it's hidden, if undefined default is used
@@ -32,11 +38,13 @@ const DONATE = defaultPageParamsPages.DONATE.overwrite({
   },
 })
 const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
-  // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-  externalLink: 'https://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating
+  externalLink: {
+    // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
+    url: 'https://ocelot-social.herokuapp.com/imprint',
+    target: '_blank',
+  },
 
   internalPage: {
-    target: '_blank',
     // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.imprint', // localized string identifier, if undefined default is used
     // headlineIdent: 'site.imprint', // localized string identifier, on null it's hidden, if undefined default is used
@@ -47,7 +55,7 @@ const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
   },
 })
 const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwrite({
-  // externalLink: null, // if string is defined and not empty it's dominating
+  // externalLink: null, // if defined it's dominating
 
   internalPage: {
     // footerIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
@@ -60,7 +68,7 @@ const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwri
   },
 })
 const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
-  // externalLink: null, // if string is defined and not empty it's dominating
+  // externalLink: null, // if defined it's dominating
 
   internalPage: {
     // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
@@ -73,7 +81,7 @@ const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
   },
 })
 const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
-  // externalLink: null, // if string is defined and not empty it's dominating
+  // externalLink: null, // if defined it's dominating
 
   internalPage: {
     // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used
@@ -86,7 +94,7 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
   },
 })
 const FAQ = defaultPageParamsPages.FAQ.overwrite({
-  // externalLink: null, // if string is defined and not empty it's dominating
+  // externalLink: null, // if defined it's dominating
 
   internalPage: {
     // footerIdent: 'site.faq', // localized string identifier, if undefined default is used
@@ -99,10 +107,13 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({
   },
 })
 const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
-  externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
+  // if defined it's dominating
+  externalLink: {
+    url: 'https://ocelot.social',
+    target: '_blank',
+  },
 
   internalPage: {
-    target: '_blank',
     // footerIdent: 'site.support', // localized string identifier, if undefined default is used
     // headTitleIdent: 'site.support', // localized string identifier, if undefined default is used
     // headlineIdent: 'site.support', // on null default is used, on empty string it's hidden

From f5f3fbeadbe62a6e202d7a726a76150e70467b4d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 12:05:45 +0200
Subject: [PATCH 10/17] Fix linting

---
 webapp/components/PageFooter/PageFooter.spec.js | 3 ++-
 webapp/components/utils/PageParams.js           | 5 +----
 2 files changed, 3 insertions(+), 5 deletions(-)

diff --git a/webapp/components/PageFooter/PageFooter.spec.js b/webapp/components/PageFooter/PageFooter.spec.js
index aecdcf2f7..53302192a 100644
--- a/webapp/components/PageFooter/PageFooter.spec.js
+++ b/webapp/components/PageFooter/PageFooter.spec.js
@@ -133,7 +133,8 @@ describe('PageFooter.vue', () => {
             externalLink: {
               url: 'https://ocelot.social/FAQ',
               target: '_blank',
-          } }),
+            },
+          }),
         }
         wrapper = Wrapper()
         wrapper.setData({ links })
diff --git a/webapp/components/utils/PageParams.js b/webapp/components/utils/PageParams.js
index 50b58a18f..539034a1c 100644
--- a/webapp/components/utils/PageParams.js
+++ b/webapp/components/utils/PageParams.js
@@ -36,10 +36,7 @@ export class PageParams {
       thisComponent.$router.push(this.internalPage.pageRoute)
     } else if (typeof window !== 'undefined') {
       if (this.externalLink.target === '_blank') {
-        window.open(
-          this.externalLink.url,
-          this.externalLink.target,
-        )
+        window.open(this.externalLink.url, this.externalLink.target)
       } else {
         window.location.href = this.externalLink.url
       }

From b45545decf345c9578d0140ca4feba2ebcfe960d Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 12:06:16 +0200
Subject: [PATCH 11/17] Adjust 'internalPageMixins'

---
 webapp/mixins/internalPageMixins.js | 5 +----
 1 file changed, 1 insertion(+), 4 deletions(-)

diff --git a/webapp/mixins/internalPageMixins.js b/webapp/mixins/internalPageMixins.js
index 2c2a517c4..922d64f95 100644
--- a/webapp/mixins/internalPageMixins.js
+++ b/webapp/mixins/internalPageMixins.js
@@ -16,10 +16,7 @@ export function internalPageMixins(pageParams) {
     },
     created() {
       if (!this.pageParams.isInternalPage) {
-        // to avoid possible errors, because 'window' is only defined on browser side but not in NodeJS on client side. check for 'typeof window' is neccessary, because if it's not defined at all you can't check for 'window !== undefined' without the same error 'window is undefined'
-        if (typeof window !== 'undefined') {
-          window.location.href = this.pageParams.externalLink
-        }
+        this.pageParams.redirectToPage(this)
       }
     },
   }

From ffb508806bce1a2e0317fedeac62a1f3f9342abd Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 12:10:57 +0200
Subject: [PATCH 12/17] Disable remove group member button, because this
 doesn't work yet

---
 webapp/components/Group/GroupMember.vue | 1 +
 1 file changed, 1 insertion(+)

diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue
index 0a99aa21c..f0e8a9c69 100644
--- a/webapp/components/Group/GroupMember.vue
+++ b/webapp/components/Group/GroupMember.vue
@@ -91,6 +91,7 @@
           v-if="scope.row.myRoleInGroup !== 'owner'"
           size="small"
           primary
+          disabled
           @click="deleteMember(scope.row.id)"
         >
           <!-- TODO: implement removal of group members -->

From b20b797d60b127e1b65d2668ec7e13803ef8ae44 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 12:48:27 +0200
Subject: [PATCH 13/17] Fix target property in 'PageParamsLink.vue'

---
 .../components/_new/features/PageParamsLink/PageParamsLink.vue  | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
index dc03aa373..391c4722e 100644
--- a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
+++ b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
@@ -9,7 +9,7 @@
   <a
     v-else
     :href="pageParams.externalLink.url"
-    :target="pageParams.internalPage.target"
+    :target="pageParams.externalLink.target"
     :data-test="pageParams.name + '-link'"
   >
     <slot />

From ed48656d8a83dc4bcd584a5b5c90299d48135285 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 12:48:58 +0200
Subject: [PATCH 14/17] Revert to have header menu groups button again

---
 webapp/components/HeaderMenu/HeaderMenu.vue | 21 +++++++++++++++++++--
 1 file changed, 19 insertions(+), 2 deletions(-)

diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue
index 167f3b224..26b085e22 100644
--- a/webapp/components/HeaderMenu/HeaderMenu.vue
+++ b/webapp/components/HeaderMenu/HeaderMenu.vue
@@ -78,8 +78,12 @@
                   <invite-button placement="top" />
                 </client-only>
               </div>
+              <!-- group button -->
+              <client-only v-if="SHOW_GROUP_BUTTON_IN_HEADER">
+                <group-button />
+              </client-only>
+              <!-- avatar-menu -->
               <client-only>
-                <!-- avatar-menu -->
                 <avatar-menu placement="top" />
               </client-only>
             </template>
@@ -154,9 +158,18 @@
               <invite-button placement="top" />
             </client-only>
           </ds-flex-item>
+          <!-- group button -->
+          <ds-flex-item
+            :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
+            style="text-align: center"
+          >
+            <client-only v-if="SHOW_GROUP_BUTTON_IN_HEADER">
+              <group-button />
+            </client-only>
+          </ds-flex-item>
+          <!-- avatar-menu mobile-->
           <ds-flex-item :class="{ 'hide-mobile-menu': !toggleMobileMenu }" style="text-align: end">
             <client-only>
-              <!-- avatar-menu mobile-->
               <avatar-menu placement="top" />
             </client-only>
           </ds-flex-item>
@@ -193,10 +206,12 @@
 </template>
 <script>
 import { mapGetters } from 'vuex'
+import { SHOW_GROUP_BUTTON_IN_HEADER } from '~/constants/groups.js'
 import LOGOS from '~/constants/logos.js'
 import headerMenu from '~/constants/headerMenu.js'
 import AvatarMenu from '~/components/AvatarMenu/AvatarMenu'
 import FilterMenu from '~/components/FilterMenu/FilterMenu.vue'
+import GroupButton from '~/components/Group/GroupButton'
 import InviteButton from '~/components/InviteButton/InviteButton'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
@@ -209,6 +224,7 @@ export default {
   components: {
     AvatarMenu,
     FilterMenu,
+    GroupButton,
     InviteButton,
     LocaleSwitch,
     Logo,
@@ -223,6 +239,7 @@ export default {
     return {
       links,
       LOGOS,
+      SHOW_GROUP_BUTTON_IN_HEADER,
       isHeaderMenu: headerMenu.MENU.length > 0,
       menu: headerMenu.MENU,
       mobileSearchVisible: false,

From 27589a64baa41b7fe7c45e702fe70767bd83ce32 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 13:08:39 +0200
Subject: [PATCH 15/17] Fix target property in 'HeaderMenu.vue'

---
 webapp/components/HeaderMenu/HeaderMenu.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/HeaderMenu/HeaderMenu.vue b/webapp/components/HeaderMenu/HeaderMenu.vue
index 26b085e22..352e0b3f5 100644
--- a/webapp/components/HeaderMenu/HeaderMenu.vue
+++ b/webapp/components/HeaderMenu/HeaderMenu.vue
@@ -178,7 +178,7 @@
           <!-- dynamic branding menu  -->
           <ul v-if="isHeaderMenu" class="dynamic-branding-mobil">
             <li v-for="item in menu" :key="item.name">
-              <a v-if="item.url" :href="item.url" target="_blank">
+              <a v-if="item.url" :href="item.url" :target="item.target">
                 <ds-text size="large" bold>
                   {{ $t(item.nameIdent) }}
                 </ds-text>

From 48d6bf6bd1b5d6d60e95acb84e8fcaa544e72059 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 13:14:55 +0200
Subject: [PATCH 16/17] Remove commented 'deleteMember'

---
 webapp/components/Group/GroupMember.vue | 8 --------
 1 file changed, 8 deletions(-)

diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue
index 7ba3b506d..82dbb291d 100644
--- a/webapp/components/Group/GroupMember.vue
+++ b/webapp/components/Group/GroupMember.vue
@@ -221,14 +221,6 @@ export default {
       } finally {
       }
     },
-    // TODO: implement removal of group members
-    // openModal(row) {
-    //   this.isOpen = true
-    //   this.memberId = row.id
-    // },
-    // deleteMember(id) {
-    // alert('deleteMember: ' + id)
-    // },
   },
 }
 </script>

From f7cc020febe20bd302c302a1f99a52d4f5d23c61 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Fri, 28 Oct 2022 13:15:44 +0200
Subject: [PATCH 17/17] Fix linting

---
 webapp/components/Group/GroupMember.vue | 7 +------
 1 file changed, 1 insertion(+), 6 deletions(-)

diff --git a/webapp/components/Group/GroupMember.vue b/webapp/components/Group/GroupMember.vue
index 82dbb291d..db5635c1f 100644
--- a/webapp/components/Group/GroupMember.vue
+++ b/webapp/components/Group/GroupMember.vue
@@ -87,12 +87,7 @@
         </ds-chip>
       </template>
       <template #edit="scope">
-        <ds-button
-          v-if="scope.row.myRoleInGroup !== 'owner'"
-          size="small"
-          primary
-          disabled
-        >
+        <ds-button v-if="scope.row.myRoleInGroup !== 'owner'" size="small" primary disabled>
           <!-- TODO: implement removal of group members -->
           <!--           :disabled="scope.row.myRoleInGroup === 'owner'"
  -->