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] 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