From 7162f2b1be31219ee169af493f9aec4f6584a31d Mon Sep 17 00:00:00 2001
From: "dependabot-preview[bot]"
 <27856297+dependabot-preview[bot]@users.noreply.github.com>
Date: Tue, 4 May 2021 05:20:41 +0000
Subject: [PATCH 01/31] Bump codecov from 3.7.1 to 3.8.2

Bumps [codecov](https://github.com/codecov/codecov-node) from 3.7.1 to 3.8.2.
- [Release notes](https://github.com/codecov/codecov-node/releases)
- [Changelog](https://github.com/codecov/codecov-node/blob/master/CHANGELOG.md)
- [Commits](https://github.com/codecov/codecov-node/compare/v3.7.1...v3.8.2)

Signed-off-by: dependabot-preview[bot] <support@dependabot.com>
---
 package.json |  2 +-
 yarn.lock    | 61 ++++++++++++++++++++++++++++------------------------
 2 files changed, 34 insertions(+), 29 deletions(-)

diff --git a/package.json b/package.json
index 937b0a6bc..325bdfe74 100644
--- a/package.json
+++ b/package.json
@@ -27,7 +27,7 @@
     "@babel/register": "^7.12.10",
     "auto-changelog": "^2.2.1",
     "bcryptjs": "^2.4.3",
-    "codecov": "^3.7.1",
+    "codecov": "^3.8.2",
     "cross-env": "^7.0.2",
     "cucumber": "^6.0.5",
     "cypress": "^7.0.1",
diff --git a/yarn.lock b/yarn.lock
index 15394a334..b91561b1c 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1397,11 +1397,6 @@ acorn@^6.0.2:
   resolved "https://registry.yarnpkg.com/acorn/-/acorn-6.4.1.tgz#531e58ba3f51b9dacb9a6646ca4debf5b14ca474"
   integrity sha512-ZVA9k326Nwrj3Cj9jlh3wGFutC2ZornPNARZwsNYqQYgN0EsV2d53w5RN/co65Ohn4sUAUtb1rSUAOD6XN9idA==
 
-agent-base@5:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-5.1.1.tgz#e8fb3f242959db44d63be665db7a8e739537a32c"
-  integrity sha512-TMeqbNl2fMW0nMjTEPOwe3J/PRFP4vqeoNuQMG0HlMrtm5QxKqdvAkZ1pRBQ/ulIyDD5Yq0nJ7YbdD8ey0TO3g==
-
 agent-base@6:
   version "6.0.0"
   resolved "https://registry.yarnpkg.com/agent-base/-/agent-base-6.0.0.tgz#5d0101f19bbfaed39980b22ae866de153b93f09a"
@@ -2143,15 +2138,15 @@ code-point-at@^1.0.0:
   resolved "https://registry.yarnpkg.com/code-point-at/-/code-point-at-1.1.0.tgz#0d070b4d043a5bea33a2f1a40e2edb3d9a4ccf77"
   integrity sha1-DQcLTQQ6W+ozovGkDi7bPZpMz3c=
 
-codecov@^3.7.1:
-  version "3.7.1"
-  resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.7.1.tgz#434cb8d55f18ef01672e5739d3d266696bebc202"
-  integrity sha512-JHWxyPTkMLLJn9SmKJnwAnvY09kg2Os2+Ux+GG7LwZ9g8gzDDISpIN5wAsH1UBaafA/yGcd3KofMaorE8qd6Lw==
+codecov@^3.8.2:
+  version "3.8.2"
+  resolved "https://registry.yarnpkg.com/codecov/-/codecov-3.8.2.tgz#ab24f18783998c39e809ea210af899f8dbcc790e"
+  integrity sha512-6w/kt/xvmPsWMfDFPE/T054txA9RTgcJEw36PNa6MYX+YV29jCHCRFXwbQ3QZBTOgnex1J2WP8bo2AT8TWWz9g==
   dependencies:
     argv "0.0.2"
     ignore-walk "3.0.3"
-    js-yaml "3.13.1"
-    teeny-request "6.0.1"
+    js-yaml "3.14.1"
+    teeny-request "7.0.1"
     urlgrey "0.4.4"
 
 coffeeify@3.0.1:
@@ -3483,12 +3478,12 @@ https-browserify@^1.0.0:
   resolved "https://registry.yarnpkg.com/https-browserify/-/https-browserify-1.0.0.tgz#ec06c10e0a34c0f2faf199f7fd7fc78fffd03c73"
   integrity sha1-7AbBDgo0wPL68Zn3/X/Hj//QPHM=
 
-https-proxy-agent@^4.0.0:
-  version "4.0.0"
-  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-4.0.0.tgz#702b71fb5520a132a66de1f67541d9e62154d82b"
-  integrity sha512-zoDhWrkR3of1l9QAL8/scJZyLu8j/gBkcwcaQOZh7Gyh/+uJQzGVETdgT30akuwkpL8HTRfssqI3BZuV18teDg==
+https-proxy-agent@^5.0.0:
+  version "5.0.0"
+  resolved "https://registry.yarnpkg.com/https-proxy-agent/-/https-proxy-agent-5.0.0.tgz#e2a90542abb68a762e0a0850f6c9edadfd8506b2"
+  integrity sha512-EkYm5BcKUGiduxzSt3Eppko+PiNWNEpa4ySk9vTC6wDsQJW9rHSa+UhGNJoRYp7bz6Ht1eaRIa6QaJqO5rCFbA==
   dependencies:
-    agent-base "5"
+    agent-base "6"
     debug "4"
 
 human-signals@^1.1.1:
@@ -3906,10 +3901,10 @@ js-string-escape@^1.0.1:
   resolved "https://registry.yarnpkg.com/js-tokens/-/js-tokens-4.0.0.tgz#19203fb59991df98e3a287050d4647cdeaf32499"
   integrity sha512-RdJUflcE3cUzKiMqQgsCu06FPu9UdIJO0beYbPhHN4k6apgJtifcoCtT9bcxOpYBtpD2kCM6Sbzg4CausW/PKQ==
 
-js-yaml@3.13.1, js-yaml@^3.9.0:
-  version "3.13.1"
-  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.13.1.tgz#aff151b30bfdfa8e49e05da22e7415e9dfa37847"
-  integrity sha512-YfbcO7jXDdyj0DGxYVSlSeQNHbD7XPWvrVWeVUujrQEoZzWJIRrCPoyk6kL6IAjAG2IolMK4T0hNUe0HOUs5Jw==
+js-yaml@3.14.1, js-yaml@^3.9.0:
+  version "3.14.1"
+  resolved "https://registry.yarnpkg.com/js-yaml/-/js-yaml-3.14.1.tgz#dae812fdb3825fa306609a8717383c50c36a0537"
+  integrity sha512-okMH7OXXJ7YrN9Ok3/SXrnu4iX9yOk+25nqX4imS2npuvTYDmo/QEZoqwZkYaIDk3jVvBOTOIEgEhaLOynBS9g==
   dependencies:
     argparse "^1.0.7"
     esprima "^4.0.0"
@@ -4534,11 +4529,16 @@ node-fetch@2.1.2:
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
   integrity sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=
 
-node-fetch@^2.2.0, node-fetch@^2.6.0:
+node-fetch@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
   integrity sha512-8dG4H5ujfvFiqDmVu9fQ5bOHUC15JMjMY/Zumv26oOvvVJjM67KF8koCWIabKQ1GJIa9r2mMZscBq/TbdOcmNA==
 
+node-fetch@^2.6.1:
+  version "2.6.1"
+  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.1.tgz#045bd323631f76ed2e2b55573394416b639a0052"
+  integrity sha512-V4aYg89jEoVRxRb2fJdAg8FHvI7cEyYdVAh94HH0UIK8oJxUfkjlDQN9RbMx+bEjP7+ggMiFRprSti032Oipxw==
+
 node-modules-regexp@^1.0.0:
   version "1.0.0"
   resolved "https://registry.yarnpkg.com/node-modules-regexp/-/node-modules-regexp-1.0.0.tgz#8d9dbe28964a4ac5712e9131642107c71e90ec40"
@@ -5823,16 +5823,16 @@ tar@^4:
     safe-buffer "^5.1.2"
     yallist "^3.0.2"
 
-teeny-request@6.0.1:
-  version "6.0.1"
-  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-6.0.1.tgz#9b1f512cef152945827ba7e34f62523a4ce2c5b0"
-  integrity sha512-TAK0c9a00ELOqLrZ49cFxvPVogMUFaWY8dUsQc/0CuQPGF+BOxOQzXfE413BAk2kLomwNplvdtMpeaeGWmoc2g==
+teeny-request@7.0.1:
+  version "7.0.1"
+  resolved "https://registry.yarnpkg.com/teeny-request/-/teeny-request-7.0.1.tgz#bdd41fdffea5f8fbc0d29392cb47bec4f66b2b4c"
+  integrity sha512-sasJmQ37klOlplL4Ia/786M5YlOcoLGQyq2TE4WHSRupbAuDaQW0PfVxV4MtdBtRJ4ngzS+1qim8zP6Zp35qCw==
   dependencies:
     http-proxy-agent "^4.0.0"
-    https-proxy-agent "^4.0.0"
-    node-fetch "^2.2.0"
+    https-proxy-agent "^5.0.0"
+    node-fetch "^2.6.1"
     stream-events "^1.0.5"
-    uuid "^3.3.2"
+    uuid "^8.0.0"
 
 text-encoding-utf-8@^1.0.2:
   version "1.0.2"
@@ -6142,6 +6142,11 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
+uuid@^8.0.0:
+  version "8.3.2"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
+  integrity sha512-+NYs2QeMWy+GWFOEm9xnn6HCDp0l7QBD7ml8zLUmJ+93Q5NF0NocErnwkTkXVFNiX3/fpC6afS8Dhb/gz7R7eg==
+
 validate-npm-package-license@^3.0.1:
   version "3.0.4"
   resolved "https://registry.yarnpkg.com/validate-npm-package-license/-/validate-npm-package-license-3.0.4.tgz#fc91f6b9c7ba15c857f4cb2c5defeec39d4f410a"

From f22fa367943aa1450b1f767ceca18798a831cb95 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sun, 25 Jul 2021 14:49:37 +0200
Subject: [PATCH 02/31] Revert wrong version changes

---
 package.json | 13 +++++++------
 1 file changed, 7 insertions(+), 6 deletions(-)

diff --git a/package.json b/package.json
index 325bdfe74..1abb95233 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social",
-  "version": "1.0.2",
+  "version": "1.0.4",
   "description": "Fullstack and API tests with cypress and cucumber for ocelot.social",
   "author": "ocelot.social Community",
   "license": "MIT",
@@ -28,26 +28,27 @@
     "auto-changelog": "^2.2.1",
     "bcryptjs": "^2.4.3",
     "codecov": "^3.8.2",
-    "cross-env": "^7.0.2",
+    "cross-env": "^7.0.3",
     "cucumber": "^6.0.5",
     "cypress": "^7.0.1",
     "cypress-cucumber-preprocessor": "^2.2.1",
     "cypress-file-upload": "^3.5.3",
-    "date-fns": "^2.12.0",
+    "date-fns": "^2.22.1",
     "dotenv": "^8.2.0",
     "expect": "^25.3.0",
     "faker": "Marak/faker.js#master",
-    "graphql-request": "^1.8.2",
+    "graphql-request": "^2.0.0",
     "import": "^0.0.6",
     "jsonwebtoken": "^8.5.1",
     "mock-socket": "^9.0.3",
     "neo4j-driver": "^4.0.2",
-    "neode": "^0.3.7",
+    "neode": "^0.4.7",
     "npm-run-all": "^4.1.5",
     "rosie": "^2.0.1",
     "slug": "^2.1.1"
   },
   "resolutions": {
     "set-value": "^2.0.1"
-  }
+  },
+  "dependencies": {}
 }

From ff93e1d4ba02dad3c609bb6a909575e8bd067be9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sun, 25 Jul 2021 14:53:44 +0200
Subject: [PATCH 03/31] Create yarn.lock in main folder again after version
 corrections

---
 yarn.lock | 121 +++++++++++++++++++++++++++---------------------------
 1 file changed, 61 insertions(+), 60 deletions(-)

diff --git a/yarn.lock b/yarn.lock
index b91561b1c..e5448e588 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -1253,31 +1253,26 @@
   resolved "https://registry.yarnpkg.com/@hapi/address/-/address-2.0.0.tgz#9f05469c88cb2fd3dcd624776b54ee95c312126a"
   integrity sha512-mV6T0IYqb0xL1UALPFplXYQmR0twnXG0M6jUswpquqT2sD12BOiCiLy3EvMp/Fy7s3DZElC4/aPjEjo2jeZpvw==
 
-"@hapi/hoek@6.x.x":
-  version "6.2.4"
-  resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-6.2.4.tgz#4b95fbaccbfba90185690890bdf1a2fbbda10595"
-  integrity sha512-HOJ20Kc93DkDVvjwHyHawPwPkX44sIrbXazAUDiUXaY2R9JwQGo2PhFfnQtdrsIe4igjG2fPgMra7NYw7qhy0A==
+"@hapi/bourne@1.x.x":
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/@hapi/bourne/-/bourne-1.3.2.tgz#0a7095adea067243ce3283e1b56b8a8f453b242a"
+  integrity sha512-1dVNHT76Uu5N3eJNTYcvxee+jzX4Z9lfciqRRHCU27ihbUcYi+iSc2iml5Ke1LXe1SyJCLA0+14Jh4tXJgOppA==
 
 "@hapi/hoek@8.x.x":
   version "8.1.0"
   resolved "https://registry.yarnpkg.com/@hapi/hoek/-/hoek-8.1.0.tgz#8f7627b23ed9bf67088fc7f9669e48c63ad421bd"
   integrity sha512-b1J4jxYnW+n6lC91V6Pqg9imP9BZq0HNCeM+3sbXg05rQsE9cGYrKFpZjyztVesGmNRE6R+QaEoWGATeIiUVjA==
 
-"@hapi/joi@^15.1.0":
-  version "15.1.0"
-  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.0.tgz#940cb749b5c55c26ab3b34ce362e82b6162c8e7a"
-  integrity sha512-n6kaRQO8S+kepUTbXL9O/UOL788Odqs38/VOfoCrATDtTvyfiO3fgjlSRaNkHabpTLgM7qru9ifqXlXbXk8SeQ==
+"@hapi/joi@^15.1.1":
+  version "15.1.1"
+  resolved "https://registry.yarnpkg.com/@hapi/joi/-/joi-15.1.1.tgz#c675b8a71296f02833f8d6d243b34c57b8ce19d7"
+  integrity sha512-entf8ZMOK8sc+8YfeOlM8pCfg3b5+WZIKBfUaaJT8UsjAAPjartzxIYm3TIbjvA4u+u++KbcXD38k682nVHDAQ==
   dependencies:
     "@hapi/address" "2.x.x"
-    "@hapi/hoek" "6.x.x"
-    "@hapi/marker" "1.x.x"
+    "@hapi/bourne" "1.x.x"
+    "@hapi/hoek" "8.x.x"
     "@hapi/topo" "3.x.x"
 
-"@hapi/marker@1.x.x":
-  version "1.0.0"
-  resolved "https://registry.yarnpkg.com/@hapi/marker/-/marker-1.0.0.tgz#65b0b2b01d1be06304886ce9b4b77b1bfb21a769"
-  integrity sha512-JOfdekTXnJexfE8PyhZFyHvHjt81rBFSAbTIRAhF2vv/2Y1JzoKsGqxH/GpZJoF7aEfYok8JVcAHmSz1gkBieA==
-
 "@hapi/topo@3.x.x":
   version "3.1.2"
   resolved "https://registry.yarnpkg.com/@hapi/topo/-/topo-3.1.2.tgz#57cc1317be1a8c5f47c124f9b0e3c49cd78424d2"
@@ -2369,21 +2364,13 @@ create-hmac@^1.1.0, create-hmac@^1.1.2, create-hmac@^1.1.4:
     safe-buffer "^5.0.1"
     sha.js "^2.4.8"
 
-cross-env@^7.0.2:
-  version "7.0.2"
-  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.2.tgz#bd5ed31339a93a3418ac4f3ca9ca3403082ae5f9"
-  integrity sha512-KZP/bMEOJEDCkDQAyRhu3RL2ZO/SUVrxQVI0G3YEQ+OLbRA3c6zgixe8Mq8a/z7+HKlNEjo8oiLUs8iRijY2Rw==
+cross-env@^7.0.3:
+  version "7.0.3"
+  resolved "https://registry.yarnpkg.com/cross-env/-/cross-env-7.0.3.tgz#865264b29677dc015ba8418918965dd232fc54cf"
+  integrity sha512-+/HKd6EgcQCJGh2PSjZuUitQBQynKor4wrFbRg4DtAgS1aWO+gU52xpH7M9ScGgXSYmAVS9bIJ8EzuaGw0oNAw==
   dependencies:
     cross-spawn "^7.0.1"
 
-cross-fetch@2.2.2:
-  version "2.2.2"
-  resolved "https://registry.yarnpkg.com/cross-fetch/-/cross-fetch-2.2.2.tgz#a47ff4f7fc712daba8f6a695a11c948440d45723"
-  integrity sha1-pH/09/xxLauo9qaVoRyUhEDUVyM=
-  dependencies:
-    node-fetch "2.1.2"
-    whatwg-fetch "2.0.4"
-
 cross-spawn@^6.0.5:
   version "6.0.5"
   resolved "https://registry.yarnpkg.com/cross-spawn/-/cross-spawn-6.0.5.tgz#4a5ec7c64dfae22c3a14124dbacdee846d80cbc4"
@@ -2622,10 +2609,10 @@ date-fns@^1.27.2:
   resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-1.30.1.tgz#2e71bf0b119153dbb4cc4e88d9ea5acfb50dc05c"
   integrity sha512-hBSVCvSmWC+QypYObzwGOd9wqdDpOt+0wl0KbU+R+uuZBS1jN8VsD1ss3irQDknRj5NvxiTF6oj/nDRnN/UQNw==
 
-date-fns@^2.12.0:
-  version "2.12.0"
-  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.12.0.tgz#01754c8a2f3368fc1119cf4625c3dad8c1845ee6"
-  integrity sha512-qJgn99xxKnFgB1qL4jpxU7Q2t0LOn1p8KMIveef3UZD7kqjT3tpFNNdXJelEHhE+rUgffriXriw/sOSU+cS1Hw==
+date-fns@^2.22.1:
+  version "2.23.0"
+  resolved "https://registry.yarnpkg.com/date-fns/-/date-fns-2.23.0.tgz#4e886c941659af0cf7b30fafdd1eaa37e88788a9"
+  integrity sha512-5ycpauovVyAk0kXNZz6ZoB9AYMZB4DObse7P3BPWmyEjXNORTI8EJ6X0uaSAq4sCHzM1uajzrkr6HnsLQpxGXA==
 
 date-now@^0.1.4:
   version "0.1.4"
@@ -3325,12 +3312,10 @@ graceful-fs@^4.2.0:
   resolved "https://registry.yarnpkg.com/graceful-fs/-/graceful-fs-4.2.3.tgz#4a12ff1b60376ef09862c2093edd908328be8423"
   integrity sha512-a30VEBm4PEdx1dRB7MFK7BejejvCvBronbLjht+sHuGYj8PHs7M/5Z+rt5lw551vZ7yfTCj4Vuyy3mSJytDWRQ==
 
-graphql-request@^1.8.2:
-  version "1.8.2"
-  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-1.8.2.tgz#398d10ae15c585676741bde3fc01d5ca948f8fbe"
-  integrity sha512-dDX2M+VMsxXFCmUX0Vo0TopIZIX4ggzOtiCsThgtrKR4niiaagsGTDIHj3fsOMFETpa064vzovI+4YV4QnMbcg==
-  dependencies:
-    cross-fetch "2.2.2"
+graphql-request@^2.0.0:
+  version "2.0.0"
+  resolved "https://registry.yarnpkg.com/graphql-request/-/graphql-request-2.0.0.tgz#8dd12cf1eb2ce0c80f4114fd851741e091134862"
+  integrity sha512-Ww3Ax+G3l2d+mPT8w7HC9LfrKjutnCKtnDq7ZZp2ghVk5IQDjwAk3/arRF1ix17Ky15rm0hrSKVKxRhIVlSuoQ==
 
 handlebars@^4.7.3:
   version "4.7.3"
@@ -4478,14 +4463,18 @@ neo-async@^2.6.0:
   resolved "https://registry.yarnpkg.com/neo-async/-/neo-async-2.6.1.tgz#ac27ada66167fa8849a6addd837f6b189ad2081c"
   integrity sha512-iyam8fBuCUpWeKPGpaNMetEocMt364qkCsfL9JuhjXX6dRnguRVOfk2GZaDpPjcOKiiXCPINZC1GczQ7iTq3Zw==
 
-neo4j-driver@^1.7.6:
-  version "1.7.6"
-  resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-1.7.6.tgz#eccb135a71eba9048c68717444593a6424cffc49"
-  integrity sha512-6c3ALO3vYDfUqNoCy8OFzq+fQ7q/ab3LCuJrmm8P04M7RmyRCCnUtJ8IzSTGbiZvyhcehGK+azNDAEJhxPV/hA==
+neo4j-driver-bolt-connection@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/neo4j-driver-bolt-connection/-/neo4j-driver-bolt-connection-4.3.1.tgz#bbaf0d2287d9be61a480397067c57e82e431fac9"
+  integrity sha512-xE7tHgoqcHM1qlXKWWxcOag2F+5OgNVeKDW9W+DKLQ7g3YGvutxcUzp1WrAc8hpFGM2IWVSNEeUt5c5SIXlHCg==
   dependencies:
-    "@babel/runtime" "^7.5.5"
+    neo4j-driver-core "^4.3.1"
     text-encoding-utf-8 "^1.0.2"
-    uri-js "^4.2.2"
+
+neo4j-driver-core@^4.3.1:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/neo4j-driver-core/-/neo4j-driver-core-4.3.1.tgz#5d92ae3f9ee48e3af2b4a085503368b15a195a98"
+  integrity sha512-FV194GxpPvgNpettGUMit6hxbMOkBR42j1K6xwfLvm25XYaZJMJzE0ezqS0Vp0G6etUqhUQChh7WYLdTMIztpQ==
 
 neo4j-driver@^4.0.2:
   version "4.0.2"
@@ -4497,15 +4486,25 @@ neo4j-driver@^4.0.2:
     text-encoding-utf-8 "^1.0.2"
     uri-js "^4.2.2"
 
-neode@^0.3.7:
-  version "0.3.7"
-  resolved "https://registry.yarnpkg.com/neode/-/neode-0.3.7.tgz#766105307e138b1212957aceba538e89e3d784cb"
-  integrity sha512-XnRJyD6bZx4HyHBmnLHuVUKtSD3FhBPXYdh7/rqiFAwBDMOSySjMFjFCYmop+sF8IBZmliowDs8zkSHt27U1kw==
+neo4j-driver@^4.2.2:
+  version "4.3.1"
+  resolved "https://registry.yarnpkg.com/neo4j-driver/-/neo4j-driver-4.3.1.tgz#897c812abf631b5a520162bb1d71d6a1b320d231"
+  integrity sha512-7MguiDpGWoj10wfQvi7HRLBif39Sz67w5zOyhaDG8OcHfJbU+onlnGfE81AOlOlYSj/JSv196K1RcFXuJMZv8Q==
   dependencies:
-    "@hapi/joi" "^15.1.0"
+    "@babel/runtime" "^7.5.5"
+    neo4j-driver-bolt-connection "^4.3.1"
+    neo4j-driver-core "^4.3.1"
+    rxjs "^6.6.3"
+
+neode@^0.4.7:
+  version "0.4.7"
+  resolved "https://registry.yarnpkg.com/neode/-/neode-0.4.7.tgz#033007b57a2ee167e9ee5537493086db08d005eb"
+  integrity sha512-YXlc187JRpeKCBcUIkY6nimXXG+Tvlopfe71/FPno2THrwmYt5mm0RPHZ+mXF2O1Xg6zvjKvOpCpDz2vHBfroQ==
+  dependencies:
+    "@hapi/joi" "^15.1.1"
     dotenv "^4.0.0"
-    neo4j-driver "^1.7.6"
-    uuid "^3.3.2"
+    neo4j-driver "^4.2.2"
+    uuid "^3.4.0"
 
 next-tick@^1.0.0:
   version "1.0.0"
@@ -4524,11 +4523,6 @@ no-case@^2.2.0:
   dependencies:
     lower-case "^1.1.1"
 
-node-fetch@2.1.2:
-  version "2.1.2"
-  resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.1.2.tgz#ab884e8e7e57e38a944753cec706f788d1768bb5"
-  integrity sha1-q4hOjn5X44qUR1POxwb3iNF2i7U=
-
 node-fetch@^2.6.0:
   version "2.6.0"
   resolved "https://registry.yarnpkg.com/node-fetch/-/node-fetch-2.6.0.tgz#e633456386d4aa55863f676a7ab0daa8fdecb0fd"
@@ -5308,6 +5302,13 @@ rxjs@^6.3.3, rxjs@^6.5.2:
   dependencies:
     tslib "^1.9.0"
 
+rxjs@^6.6.3:
+  version "6.6.7"
+  resolved "https://registry.yarnpkg.com/rxjs/-/rxjs-6.6.7.tgz#90ac018acabf491bf65044235d5863c4dab804c9"
+  integrity sha512-hTdwr+7yYNIT5n4AMYp85KA6yw2Va0FLa3Rguvbpa4W3I5xynaBZo41cM3XM+4Q6fRMj3sBYIR1VAmZMXYJvRQ==
+  dependencies:
+    tslib "^1.9.0"
+
 safe-buffer@^5.0.1, safe-buffer@^5.1.0, safe-buffer@^5.1.1, safe-buffer@^5.1.2, safe-buffer@~5.1.0, safe-buffer@~5.1.1:
   version "5.1.2"
   resolved "https://registry.yarnpkg.com/safe-buffer/-/safe-buffer-5.1.2.tgz#991ec69d296e0313747d59bdfd2b745c35f8828d"
@@ -6142,6 +6143,11 @@ uuid@^3.3.2:
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.3.2.tgz#1b4af4955eb3077c501c23872fc6513811587131"
   integrity sha512-yXJmeNaw3DnnKAOKJE51sL/ZaYfWJRl1pK9dr19YFCu0ObS231AB1/LbqTKRAQ5kw8A90rA6fr4riOUpTZvQZA==
 
+uuid@^3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/uuid/-/uuid-3.4.0.tgz#b23e4358afa8a202fe7a100af1f5f883f02007ee"
+  integrity sha512-HjSDRw6gZE5JMggctHBcjVak08+KEVhSIiDzFnT9S9aegmp85S/bReBVTb4QTFaRNptJ9kuYaNhnbNEOkbKb/A==
+
 uuid@^8.0.0:
   version "8.3.2"
   resolved "https://registry.yarnpkg.com/uuid/-/uuid-8.3.2.tgz#80d5b5ced271bb9af6c445f21a1a04c606cefbe2"
@@ -6182,11 +6188,6 @@ watchify@3.11.1:
     through2 "^2.0.0"
     xtend "^4.0.0"
 
-whatwg-fetch@2.0.4:
-  version "2.0.4"
-  resolved "https://registry.yarnpkg.com/whatwg-fetch/-/whatwg-fetch-2.0.4.tgz#dde6a5df315f9d39991aa17621853d720b85566f"
-  integrity sha512-dcQ1GWpOD/eEQ97k66aiEVpNnapVj90/+R+SXTPYGHpYBBypfKJEQjLrvMZ7YXbKm21gXd4NcuxUTjiv1YtLng==
-
 which@^1.2.9:
   version "1.3.1"
   resolved "https://registry.yarnpkg.com/which/-/which-1.3.1.tgz#a45043d54f5805316da8d62f9f50918d3da70b0a"

From 51ce357118b5531bf7213de97704603fb4b66207 Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Tue, 27 Jul 2021 08:32:34 +0000
Subject: [PATCH 04/31] Bump nodemailer-html-to-text from 3.1.0 to 3.2.0 in
 /backend

Bumps [nodemailer-html-to-text](https://github.com/andris9/nodemailer-html-to-text) from 3.1.0 to 3.2.0.
- [Release notes](https://github.com/andris9/nodemailer-html-to-text/releases)
- [Changelog](https://github.com/andris9/nodemailer-html-to-text/blob/master/CHANGELOG.md)
- [Commits](https://github.com/andris9/nodemailer-html-to-text/compare/v3.1.0...v3.2.0)

---
updated-dependencies:
- dependency-name: nodemailer-html-to-text
  dependency-type: direct:production
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 backend/package.json |  2 +-
 backend/yarn.lock    | 68 +++++++++++++++++++++++++++++++++++---------
 2 files changed, 55 insertions(+), 15 deletions(-)

diff --git a/backend/package.json b/backend/package.json
index ac5c1d2f8..1b22a594a 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -107,7 +107,7 @@
     "neode": "^0.3.7",
     "node-fetch": "~2.6.1",
     "nodemailer": "^6.4.4",
-    "nodemailer-html-to-text": "^3.1.0",
+    "nodemailer-html-to-text": "^3.2.0",
     "npm-run-all": "~4.1.5",
     "request": "~2.88.2",
     "sanitize-html": "~1.22.0",
diff --git a/backend/yarn.lock b/backend/yarn.lock
index e01df5c33..22ce4ec77 100644
--- a/backend/yarn.lock
+++ b/backend/yarn.lock
@@ -3630,6 +3630,15 @@ dom-serializer@^0.2.1:
     domelementtype "^2.0.1"
     entities "^2.0.0"
 
+dom-serializer@^1.0.1:
+  version "1.3.2"
+  resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-1.3.2.tgz#6206437d32ceefaec7161803230c7a20bc1b4d91"
+  integrity sha512-5c54Bk5Dw4qAxNOI1pFEizPSjVsx5+bpJKmL2kPn8JhBUq2q09tTCa3mjijun2NfK78NMouDYNMBkOrPZiS+ig==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.2.0"
+    entities "^2.0.0"
+
 dom-serializer@~0.1.1:
   version "0.1.1"
   resolved "https://registry.yarnpkg.com/dom-serializer/-/dom-serializer-0.1.1.tgz#1ec4059e284babed36eec2941d4a970a189ce7c0"
@@ -3648,6 +3657,11 @@ domelementtype@^2.0.1:
   resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.0.1.tgz#1f8bdfe91f5a78063274e803b4bdcedf6e94f94d"
   integrity sha512-5HOHUDsYZWV8FGWN0Njbr/Rn7f/eWSQi1v7+HsUVwXgn8nWWlL64zKDkS0n8ZmQ3mlWOMuXOnR+7Nx/5tMO5AQ==
 
+domelementtype@^2.2.0:
+  version "2.2.0"
+  resolved "https://registry.yarnpkg.com/domelementtype/-/domelementtype-2.2.0.tgz#9a0b6c2782ed6a1c7323d42267183df9bd8b1d57"
+  integrity sha512-DtBMo82pv1dFtUmHyr48beiuq792Sxohr+8Hm9zoxklYPfa6n0Z3Byjj2IV7bmr2IyqClnqEQhfgHJJ5QF0R5A==
+
 domexception@^1.0.1:
   version "1.0.1"
   resolved "https://registry.yarnpkg.com/domexception/-/domexception-1.0.1.tgz#937442644ca6a31261ef36e3ec677fe805582c90"
@@ -3669,6 +3683,13 @@ domhandler@^3.0.0:
   dependencies:
     domelementtype "^2.0.1"
 
+domhandler@^4.0.0, domhandler@^4.2.0:
+  version "4.2.0"
+  resolved "https://registry.yarnpkg.com/domhandler/-/domhandler-4.2.0.tgz#f9768a5f034be60a89a27c2e4d0f74eba0d8b059"
+  integrity sha512-zk7sgt970kzPks2Bf+dwT/PLzghLnsivb9CcxkvR8Mzr66Olr0Ofd8neSbglHJHaHa2MadfoSdNlKYAaafmWfA==
+  dependencies:
+    domelementtype "^2.2.0"
+
 domutils@1.5.1:
   version "1.5.1"
   resolved "https://registry.yarnpkg.com/domutils/-/domutils-1.5.1.tgz#dcd8488a26f563d61079e48c9f7b7e32373682cf"
@@ -3694,6 +3715,15 @@ domutils@^2.0.0:
     domelementtype "^2.0.1"
     domhandler "^3.0.0"
 
+domutils@^2.5.2:
+  version "2.7.0"
+  resolved "https://registry.yarnpkg.com/domutils/-/domutils-2.7.0.tgz#8ebaf0c41ebafcf55b0b72ec31c56323712c5442"
+  integrity sha512-8eaHa17IwJUPAiB+SoTYBo5mCdeMgdcAoXJ59m6DT1vw+5iLS3gNoqYaRowaBKtGVrOF1Jz4yDTgYKLK2kvfJg==
+  dependencies:
+    dom-serializer "^1.0.1"
+    domelementtype "^2.2.0"
+    domhandler "^4.2.0"
+
 dont-sniff-mimetype@1.1.0:
   version "1.1.0"
   resolved "https://registry.yarnpkg.com/dont-sniff-mimetype/-/dont-sniff-mimetype-1.1.0.tgz#c7d0427f8bcb095762751252af59d148b0a623b2"
@@ -5095,17 +5125,17 @@ html-escaper@^2.0.0:
   resolved "https://registry.yarnpkg.com/html-escaper/-/html-escaper-2.0.0.tgz#71e87f931de3fe09e56661ab9a29aadec707b491"
   integrity sha512-a4u9BeERWGu/S8JiWEAQcdrg9v4QArtP9keViQjGMdff20fBdd8waotXaNmODqBe6uZ3Nafi7K/ho4gCQHV3Ig==
 
-html-to-text@^5.1.1:
-  version "5.1.1"
-  resolved "https://registry.yarnpkg.com/html-to-text/-/html-to-text-5.1.1.tgz#2d89db7bf34bc7bcb7d546b1b228991a16926e87"
-  integrity sha512-Bci6bD/JIfZSvG4s0gW/9mMKwBRoe/1RWLxUME/d6WUSZCdY7T60bssf/jFf7EYXRyqU4P5xdClVqiYU0/ypdA==
+html-to-text@7.1.1:
+  version "7.1.1"
+  resolved "https://registry.yarnpkg.com/html-to-text/-/html-to-text-7.1.1.tgz#69de8d85b91646b4bc14fdf4f850e9e046efff15"
+  integrity sha512-c9QWysrfnRZevVpS8MlE7PyOdSuIOjg8Bt8ZE10jMU/BEngA6j3llj4GRfAmtQzcd1FjKE0sWu5IHXRUH9YxIQ==
   dependencies:
+    deepmerge "^4.2.2"
     he "^1.2.0"
-    htmlparser2 "^3.10.1"
-    lodash "^4.17.11"
-    minimist "^1.2.0"
+    htmlparser2 "^6.1.0"
+    minimist "^1.2.5"
 
-htmlparser2@^3.10.1, htmlparser2@^3.9.1:
+htmlparser2@^3.9.1:
   version "3.10.1"
   resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-3.10.1.tgz#bd679dc3f59897b6a34bb10749c855bb53a9392f"
   integrity sha512-IgieNijUMbkDovyoKObU1DUhm1iwNYE/fuifEoEHfd1oZKZDaONBSkal7Y01shxsM49R4XaMdGez3WnF9UfiCQ==
@@ -5127,6 +5157,16 @@ htmlparser2@^4.1.0:
     domutils "^2.0.0"
     entities "^2.0.0"
 
+htmlparser2@^6.1.0:
+  version "6.1.0"
+  resolved "https://registry.yarnpkg.com/htmlparser2/-/htmlparser2-6.1.0.tgz#c4d762b6c3371a05dbe65e94ae43a9f845fb8fb7"
+  integrity sha512-gyyPk6rgonLFEDGoeRgQNaEUvdJ4ktTmmUh/h2t7s+M8oPpIPxgNACWa+6ESR57kXstwqPiCut0V8NRpcwgU7A==
+  dependencies:
+    domelementtype "^2.0.1"
+    domhandler "^4.0.0"
+    domutils "^2.5.2"
+    entities "^2.0.0"
+
 http-cache-semantics@^4.0.0:
   version "4.0.3"
   resolved "https://registry.yarnpkg.com/http-cache-semantics/-/http-cache-semantics-4.0.3.tgz#495704773277eeef6e43f9ab2c2c7d259dda25c5"
@@ -6503,7 +6543,7 @@ lodash@4.17.15:
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.15.tgz#b447f6670a0455bbfeedd11392eff330ea097548"
   integrity sha512-8xOcRHvCjnocdS5cpwXQXVzmmh5e5+saE2QGoeQmbKmRS6J3VQppPOIt0MnmE+4xlZoumy0GPG0D0MVIQbNA1A==
 
-lodash@^4.15.0, lodash@^4.17.11, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.11, lodash@~4.17.14, lodash@~4.17.15, lodash@~4.17.20:
+lodash@^4.15.0, lodash@^4.17.13, lodash@^4.17.14, lodash@^4.17.15, lodash@^4.17.5, lodash@~4.17.11, lodash@~4.17.14, lodash@~4.17.15, lodash@~4.17.20:
   version "4.17.20"
   resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.20.tgz#b44a9b6297bcb698f1c51a3545a2b3b368d59c52"
   integrity sha512-PlhdFcillOINfeV7Ni6oF1TAEayyZBoZ8bcshTHqOYJYlrqzRK5hagpagky5o4HfCzzd1TRkXPMFq6cKk9rGmA==
@@ -7184,12 +7224,12 @@ node-releases@^1.1.71:
   resolved "https://registry.yarnpkg.com/node-releases/-/node-releases-1.1.72.tgz#14802ab6b1039a79a0c7d662b610a5bbd76eacbe"
   integrity sha512-LLUo+PpH3dU6XizX3iVoubUNheF/owjXCZZ5yACDxNnPtgFuludV1ZL3ayK1kVep42Rmm0+R9/Y60NQbZ2bifw==
 
-nodemailer-html-to-text@^3.1.0:
-  version "3.1.0"
-  resolved "https://registry.yarnpkg.com/nodemailer-html-to-text/-/nodemailer-html-to-text-3.1.0.tgz#11e4e435eb03e4f3b439aaf294b1bd1377e7f789"
-  integrity sha512-AijyAZgcFb6b53g1oMwdCKyLYQVJzbgZKbs3Bma8zR5hPR1gkajQKGGZbwtuA5JhUqnyC8pjp+tiaS7CkQ8TRg==
+nodemailer-html-to-text@^3.2.0:
+  version "3.2.0"
+  resolved "https://registry.yarnpkg.com/nodemailer-html-to-text/-/nodemailer-html-to-text-3.2.0.tgz#91b959491fef8f7d91796047abb728aa86d4a12b"
+  integrity sha512-RJUC6640QV1PzTHHapOrc6IzrAJUZtk2BdVdINZ9VTLm+mcQNyBO9LYyhrnufkzqiD9l8hPLJ97rSyK4WanPNg==
   dependencies:
-    html-to-text "^5.1.1"
+    html-to-text "7.1.1"
 
 nodemailer@^6.4.4:
   version "6.4.5"

From 5ffa2f027574ec0c200e360fdc7ea9dbd2e7073d Mon Sep 17 00:00:00 2001
From: "dependabot[bot]" <49699333+dependabot[bot]@users.noreply.github.com>
Date: Wed, 28 Jul 2021 10:12:12 +0000
Subject: [PATCH 05/31] Bump eslint-plugin-prettier from 3.1.4 to 3.4.0 in
 /webapp

Bumps [eslint-plugin-prettier](https://github.com/prettier/eslint-plugin-prettier) from 3.1.4 to 3.4.0.
- [Release notes](https://github.com/prettier/eslint-plugin-prettier/releases)
- [Changelog](https://github.com/prettier/eslint-plugin-prettier/blob/master/CHANGELOG.md)
- [Commits](https://github.com/prettier/eslint-plugin-prettier/commits)

---
updated-dependencies:
- dependency-name: eslint-plugin-prettier
  dependency-type: direct:development
  update-type: version-update:semver-minor
...

Signed-off-by: dependabot[bot] <support@github.com>
---
 webapp/package.json | 2 +-
 webapp/yarn.lock    | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/webapp/package.json b/webapp/package.json
index 3e102648f..d107f5833 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -132,7 +132,7 @@
     "eslint-plugin-import": "~2.20.2",
     "eslint-plugin-jest": "~24.4.0",
     "eslint-plugin-node": "~11.1.0",
-    "eslint-plugin-prettier": "~3.1.4",
+    "eslint-plugin-prettier": "~3.4.0",
     "eslint-plugin-promise": "~4.3.1",
     "eslint-plugin-standard": "~5.0.0",
     "eslint-plugin-vue": "~6.2.2",
diff --git a/webapp/yarn.lock b/webapp/yarn.lock
index b3d8ed6c0..c8aefde09 100644
--- a/webapp/yarn.lock
+++ b/webapp/yarn.lock
@@ -9821,10 +9821,10 @@ eslint-plugin-node@~11.1.0:
     resolve "^1.10.1"
     semver "^6.1.0"
 
-eslint-plugin-prettier@~3.1.4:
-  version "3.1.4"
-  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.1.4.tgz#168ab43154e2ea57db992a2cd097c828171f75c2"
-  integrity sha512-jZDa8z76klRqo+TdGDTFJSavwbnWK2ZpqGKNZ+VvweMW516pDUMmQ2koXvxEE4JhzNvTv+radye/bWGBmA6jmg==
+eslint-plugin-prettier@~3.4.0:
+  version "3.4.0"
+  resolved "https://registry.yarnpkg.com/eslint-plugin-prettier/-/eslint-plugin-prettier-3.4.0.tgz#cdbad3bf1dbd2b177e9825737fe63b476a08f0c7"
+  integrity sha512-UDK6rJT6INSfcOo545jiaOwB701uAIt2/dR7WnFQoGCVl1/EMqdANBmwUaqqQ45aXprsTGzSa39LI1PyuRBxxw==
   dependencies:
     prettier-linter-helpers "^1.0.0"
 

From 0bdedfc5bc19de08a6f28a215c9317cdd8612267 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 28 Jul 2021 15:15:59 +0200
Subject: [PATCH 06/31] Create sender.fm internal organization page

---
 webapp/locales/html/de/organization.html | 77 +++++++++++++++++++++++-
 webapp/locales/html/en/organization.html | 77 +++++++++++++++++++++++-
 2 files changed, 152 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/html/de/organization.html b/webapp/locales/html/de/organization.html
index e3c2811f4..c63df9929 100644
--- a/webapp/locales/html/de/organization.html
+++ b/webapp/locales/html/de/organization.html
@@ -2,4 +2,79 @@
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
 <br>
-<p>Hier wird das Netzwerk beschrieben.</p>
+<h1 class="h3-headline-big">
+  sender.fm
+</h1>
+<!-- <img class="logo" alt="ocelot.social Header" src="/img/custom/logo-horizontal.svg" style="width: 360px;"><br> -->
+<p class="paragraph">
+  Hier wird sender.fm in Zukunft vorgestellt …
+</p>
+<p class="link">
+  <a href="/login" target="_blank">
+    Zum Login …
+  </a><br>
+</p>
+<br>
+<h3 class="h3-headline">
+  Unser Radio-Stream
+</h3>
+<br>
+<!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
+<iframe class="player" id="embed_player" frameborder="0" width="350" height="396" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
+<br>
+<h4 class="h4-headline">
+  Sende-Wochenplan
+</h4>
+<iframe class="weekly-plan" height="400px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
+<br>
+<br>
+
+<!-- Stream Url:  
+https://senderfm.out.airtime.pro/senderfm_a -->
+
+<style type="text/css">
+  .logo {
+    margin-top: 48px;
+    margin-bottom: 48px;
+  }
+
+  .h3-headline-big {
+    font-size: 64px;
+    margin-top: 12px;
+    margin-bottom: 8px;
+  }
+
+  .h3-headline {
+    font-size: 24px;
+    margin-top: 12px;
+    margin-bottom: 8px;
+  }
+
+  .h4-headline {
+    font-size: 18px;
+    margin-top: 12px;
+    margin-bottom: 8px;
+  }
+
+  .paragraph {
+    font-size: 16px;
+    margin-top: 0px;
+    margin-bottom: 8px;
+  }
+
+  .link {
+    margin-top: 4px;
+    margin-bottom: 8px;
+  }
+
+  .player {
+    margin-top: 0px;
+    margin-bottom: 12px;
+  }
+
+  .weekly-plan {
+    margin-top: 0px;
+    margin-bottom: 0px;
+    margin-left: -20px;
+  }
+</style>
diff --git a/webapp/locales/html/en/organization.html b/webapp/locales/html/en/organization.html
index 377fb0ba6..3ae6a69b8 100644
--- a/webapp/locales/html/en/organization.html
+++ b/webapp/locales/html/en/organization.html
@@ -2,4 +2,79 @@
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
 <br>
-<p>Here the network is described.</p>
+<h1 class="h3-headline-big">
+  sender.fm
+</h1>
+<!-- <img class="logo" alt="ocelot.social Header" src="/img/custom/logo-horizontal.svg" style="width: 360px;"><br> -->
+<p class="paragraph">
+  Here sender.fm will be described in the future …
+</p>
+<p class="link">
+  <a href="/login" target="_blank">
+    Login …
+  </a><br>
+</p>
+<br>
+<h3 class="h3-headline">
+  Our Radio Stream
+</h3>
+<br>
+<!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
+<iframe class="player" id="embed_player" frameborder="0" width="350" height="396" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
+<br>
+<h4 class="h4-headline">
+  Radio Weekly Plan
+</h4>
+<iframe class="weekly-plan" height="400px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
+<br>
+<br>
+
+<!-- Stream Url:  
+https://senderfm.out.airtime.pro/senderfm_a -->
+
+<style type="text/css">
+  .logo {
+    margin-top: 48px;
+    margin-bottom: 48px;
+  }
+
+  .h3-headline-big {
+    font-size: 64px;
+    margin-top: 12px;
+    margin-bottom: 8px;
+  }
+
+  .h3-headline {
+    font-size: 24px;
+    margin-top: 12px;
+    margin-bottom: 8px;
+  }
+
+  .h4-headline {
+    font-size: 18px;
+    margin-top: 12px;
+    margin-bottom: 8px;
+  }
+
+  .paragraph {
+    font-size: 16px;
+    margin-top: 0px;
+    margin-bottom: 8px;
+  }
+
+  .link {
+    margin-top: 4px;
+    margin-bottom: 8px;
+  }
+
+  .player {
+    margin-top: 0px;
+    margin-bottom: 12px;
+  }
+
+  .weekly-plan {
+    margin-top: 0px;
+    margin-bottom: 0px;
+    margin-left: -20px;
+  }
+</style>

From 0b1bdc495fb6f1231af560e7bedded1a8b591dc0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 29 Jul 2021 16:54:20 +0200
Subject: [PATCH 07/31] Implement configuration of internal pages

---
 backend/src/config/links.js        |   3 +-
 webapp/constants/links.js          | 140 ++++++++++++++++++++++++++---
 webapp/locales/de.json             |   1 +
 webapp/locales/en.json             |   1 +
 webapp/locales/html/de/donate.html |   5 ++
 webapp/locales/html/de/index.js    |   2 +
 webapp/locales/html/en/donate.html |   5 ++
 webapp/locales/html/en/index.js    |   2 +
 webapp/nuxt.config.js              |   1 +
 webapp/pages/donate.spec.js        |  38 ++++++++
 webapp/pages/donate.vue            |  21 +++++
 11 files changed, 207 insertions(+), 12 deletions(-)
 create mode 100644 webapp/locales/html/de/donate.html
 create mode 100644 webapp/locales/html/en/donate.html
 create mode 100644 webapp/pages/donate.spec.js
 create mode 100644 webapp/pages/donate.vue

diff --git a/backend/src/config/links.js b/backend/src/config/links.js
index b111726f3..07b97aa60 100644
--- a/backend/src/config/links.js
+++ b/backend/src/config/links.js
@@ -1,6 +1,7 @@
 // this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
 export default {
-  LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
+  // Wolle LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
+  LANDING_PAGE: '/organization', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
 
   // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
 
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
index b111726f3..aa96fc2f3 100644
--- a/webapp/constants/links.js
+++ b/webapp/constants/links.js
@@ -1,17 +1,135 @@
 // this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
-export default {
-  LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
 
-  // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
+const ORGANIZATION = {
+  name: 'organization',
+
+  // Wolle externalLink: 'https://ocelot.social',
+  externalLink: null, // if string is defined and not empty it's dominating
+
+  // in case internal page content is here 'webapp/locales/html/'
+  internalLink: '/organization', // static, don't change! internal page in case no external is defined
+  internalPage: {
+    footerIdent: 'site.made', // localized string identifier
+    // Wolle headlineIdent: null, // on null default is used, on empty string it's hidden
+    headlineIdent: '', // localized string identifier. on null default is used, on empty string it's hidden
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+  },
+}
+const DONATE = {
+  name: 'donate',
+
+  // Wolle externalLink: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
+  externalLink: '', // if string is defined and not empty it's dominating
+
+  // in case internal page content is here 'webapp/locales/html/'
+  internalLink: '/donate', // static, don't change! internal page in case no external is defined
+  internalPage: {
+    footerIdent: 'site.donate', // localized string identifier
+    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+  },
+}
+const IMPRINT = {
+  name: 'imprint',
+
+  // Wolle externalLink: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
+  externalLink: '', // if string is defined and not empty it's dominating
+
+  // in case internal page content is here 'webapp/locales/html/'
+  internalLink: '/imprint', // static, don't change! internal page in case no external is defined
+  internalPage: {
+    footerIdent: 'site.imprint', // localized string identifier
+    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+  },
+}
+const TERMS_AND_CONDITIONS = {
+  name: 'terms-and-conditions',
+
+  externalLink: null, // if string is defined and not empty it's dominating
+
+  // in case internal page content is here 'webapp/locales/html/'
+  internalLink: '/terms-and-conditions', // static, don't change! internal page in case no external is defined
+  internalPage: {
+    footerIdent: 'site.termsAndConditions', // localized string identifier
+    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+  },
+}
+const CODE_OF_CONDUCT = {
+  name: 'code-of-conduct',
+
+  externalLink: null, // if string is defined and not empty it's dominating
+
+  // in case internal page content is here 'webapp/locales/html/'
+  internalLink: '/code-of-conduct', // static, don't change! internal page in case no external is defined
+  internalPage: {
+    footerIdent: 'site.code-of-conduct', // localized string identifier
+    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+  },
+}
+const DATA_PRIVACY = {
+  name: 'data-privacy',
+
+  externalLink: null, // if string is defined and not empty it's dominating
+
+  // in case internal page content is here 'webapp/locales/html/'
+  internalLink: '/data-privacy', // static, don't change! internal page in case no external is defined
+  internalPage: {
+    footerIdent: 'site.data-privacy', // localized string identifier
+    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+  },
+}
+const FAQ = {
+  name: 'faq',
+
+  // Wolle externalLink: 'https://ocelot.social',
+  externalLink: null, // if string is defined and not empty it's dominating
+
+  // in case internal page content is here 'webapp/locales/html/'
+  internalLink: '/faq', // static, don't change! internal page in case no external is defined
+  internalPage: {
+    footerIdent: 'site.faq', // localized string identifier
+    // Wolle headlineIdent: null, // on null default is used, on empty string it's hidden
+    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+  },
+}
+
+export default {
+  // Wolle LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
+  LANDING_PAGE: '/organization', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
+
+  // you can find and store templates for 👇🏼 at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
 
   SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support'. set a full URL please, because it is used in e-mails as well!
 
-  // on null or empty strings internal pages are used, see 'webapp/locales/html/'
-  ORGANIZATION: 'https://ocelot.social',
-  DONATE: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-  IMPRINT: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-  TERMS_AND_CONDITIONS: null,
-  CODE_OF_CONDUCT: null,
-  DATA_PRIVACY: null,
-  FAQ: 'https://ocelot.social',
+  ORGANIZATION,
+  DONATE,
+  IMPRINT,
+  TERMS_AND_CONDITIONS,
+  CODE_OF_CONDUCT,
+  DATA_PRIVACY,
+  FAQ,
+
+  FOOTER_LINK_LIST: [
+    ORGANIZATION,
+    TERMS_AND_CONDITIONS,
+    CODE_OF_CONDUCT,
+    DATA_PRIVACY,
+    FAQ,
+    // DONATE,
+    // Wolle
+    DONATE,
+    IMPRINT,
+  ],
 }
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index de8e98888..aa63d455a 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -781,6 +781,7 @@
     "contact": "Kontakt",
     "data-privacy": "Datenschutzerklärung",
     "director": "Geschäftsführer",
+    "donate": "Spenden",
     "error-occurred": "Ein Fehler ist aufgetreten.",
     "faq": "FAQ",
     "germany": "Deutschland",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 0ad660272..06086f04d 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -781,6 +781,7 @@
     "contact": "Contact",
     "data-privacy": "Data privacy",
     "director": "Managing Director",
+    "donate": "Donate",
     "error-occurred": "An error occurred.",
     "faq": "FAQ",
     "germany": "Germany",
diff --git a/webapp/locales/html/de/donate.html b/webapp/locales/html/de/donate.html
new file mode 100644
index 000000000..773c5db32
--- /dev/null
+++ b/webapp/locales/html/de/donate.html
@@ -0,0 +1,5 @@
+<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
+<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
+
+<br>
+<p>Hier steht was zu den Spenden.</p>
diff --git a/webapp/locales/html/de/index.js b/webapp/locales/html/de/index.js
index 4daae480e..341ab9bdd 100644
--- a/webapp/locales/html/de/index.js
+++ b/webapp/locales/html/de/index.js
@@ -5,6 +5,7 @@ import codeOfConduct from './code-of-conduct.html'
 import dataPrivacy from './data-privacy.html'
 import faq from './faq.html'
 import imprint from './imprint.html'
+import donate from './donate.html'
 
 export default {
   organization,
@@ -14,4 +15,5 @@ export default {
   dataPrivacy,
   faq,
   imprint,
+  donate,
 }
diff --git a/webapp/locales/html/en/donate.html b/webapp/locales/html/en/donate.html
new file mode 100644
index 000000000..c82001587
--- /dev/null
+++ b/webapp/locales/html/en/donate.html
@@ -0,0 +1,5 @@
+<!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
+<!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
+
+<br>
+<p>Here's what it says about donations.</p>
diff --git a/webapp/locales/html/en/index.js b/webapp/locales/html/en/index.js
index 4daae480e..341ab9bdd 100644
--- a/webapp/locales/html/en/index.js
+++ b/webapp/locales/html/en/index.js
@@ -5,6 +5,7 @@ import codeOfConduct from './code-of-conduct.html'
 import dataPrivacy from './data-privacy.html'
 import faq from './faq.html'
 import imprint from './imprint.html'
+import donate from './donate.html'
 
 export default {
   organization,
@@ -14,4 +15,5 @@ export default {
   dataPrivacy,
   faq,
   imprint,
+  donate,
 }
diff --git a/webapp/nuxt.config.js b/webapp/nuxt.config.js
index 08eb66989..b4fc3aa7c 100644
--- a/webapp/nuxt.config.js
+++ b/webapp/nuxt.config.js
@@ -45,6 +45,7 @@ export default {
       'imprint',
       'data-privacy',
       'faq',
+      'donate',
     ],
     // pages to keep alive
     keepAlivePages: ['index'],
diff --git a/webapp/pages/donate.spec.js b/webapp/pages/donate.spec.js
new file mode 100644
index 000000000..2fae9d67a
--- /dev/null
+++ b/webapp/pages/donate.spec.js
@@ -0,0 +1,38 @@
+import { mount } from '@vue/test-utils'
+import Donate from './donate.vue'
+import VueMeta from 'vue-meta'
+
+const localVue = global.localVue
+localVue.use(VueMeta, { keyName: 'head' })
+
+describe('donate.vue', () => {
+  let wrapper
+  let mocks
+
+  beforeEach(() => {
+    mocks = {
+      $t: (t) => t,
+    }
+  })
+
+  describe('mount', () => {
+    const Wrapper = () => {
+      return mount(Donate, {
+        mocks,
+        localVue,
+      })
+    }
+
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders', () => {
+      expect(wrapper.is('div')).toBe(true)
+    })
+
+    it('has correct <head> content', () => {
+      expect(wrapper.vm.$metaInfo.title).toBe('site.donate')
+    })
+  })
+})
diff --git a/webapp/pages/donate.vue b/webapp/pages/donate.vue
new file mode 100644
index 000000000..a3e25bb46
--- /dev/null
+++ b/webapp/pages/donate.vue
@@ -0,0 +1,21 @@
+<template>
+  <div>
+    <ds-space margin="small">
+      <ds-heading tag="h2">{{ $t('site.donate') }}</ds-heading>
+    </ds-space>
+    <ds-container>
+      <div v-html="$t('html.donate')" />
+    </ds-container>
+  </div>
+</template>
+
+<script>
+export default {
+  layout: 'basic',
+  head() {
+    return {
+      title: this.$t('site.donate'),
+    }
+  },
+}
+</script>

From 59dd7ba104008754827464ea0bdcd585849a9d38 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 29 Jul 2021 16:54:52 +0200
Subject: [PATCH 08/31] Implement configuration of footer link list

---
 .../components/PageFooter/PageFooter.spec.js  | 30 +++----
 webapp/components/PageFooter/PageFooter.vue   | 89 ++++---------------
 webapp/components/utils/InternalPages.js      |  7 ++
 3 files changed, 40 insertions(+), 86 deletions(-)
 create mode 100644 webapp/components/utils/InternalPages.js

diff --git a/webapp/components/PageFooter/PageFooter.spec.js b/webapp/components/PageFooter/PageFooter.spec.js
index a7349496b..d82d03982 100644
--- a/webapp/components/PageFooter/PageFooter.spec.js
+++ b/webapp/components/PageFooter/PageFooter.spec.js
@@ -56,12 +56,12 @@ describe('PageFooter.vue', () => {
       beforeEach(async () => {
         const links = {
           ...linksDefault,
-          ORGANIZATION: null,
-          IMPRINT: null,
-          TERMS_AND_CONDITIONS: null,
-          CODE_OF_CONDUCT: null,
-          DATA_PRIVACY: null,
-          FAQ: null,
+          ORGANIZATION: { ...linksDefault.ORGANIZATION, externalLink: null },
+          IMPRINT: { ...linksDefault.IMPRINT, externalLink: null },
+          TERMS_AND_CONDITIONS: { ...linksDefault.TERMS_AND_CONDITIONS, externalLink: null },
+          CODE_OF_CONDUCT: { ...linksDefault.CODE_OF_CONDUCT, externalLink: null },
+          DATA_PRIVACY: { ...linksDefault.DATA_PRIVACY, externalLink: null },
+          FAQ: { ...linksDefault.FAQ, externalLink: null },
         }
         wrapper = Wrapper()
         wrapper.setData({ links })
@@ -77,15 +77,15 @@ describe('PageFooter.vue', () => {
       })
 
       it('renders TERMS_AND_CONDITIONS as nuxt-link', () => {
-        expect(wrapper.find('span[data-test="terms-nuxt-link"]').exists()).toBeTruthy()
+        expect(wrapper.find('span[data-test="terms-and-conditions-nuxt-link"]').exists()).toBeTruthy()
       })
 
       it('renders CODE_OF_CONDUCT as nuxt-link', () => {
-        expect(wrapper.find('span[data-test="code-nuxt-link"]').exists()).toBeTruthy()
+        expect(wrapper.find('span[data-test="code-of-conduct-nuxt-link"]').exists()).toBeTruthy()
       })
 
       it('renders DATA_PRIVACY as nuxt-link', () => {
-        expect(wrapper.find('span[data-test="data-nuxt-link"]').exists()).toBeTruthy()
+        expect(wrapper.find('span[data-test="data-privacy-nuxt-link"]').exists()).toBeTruthy()
       })
 
       it('renders FAQ as nuxt-link', () => {
@@ -97,12 +97,12 @@ describe('PageFooter.vue', () => {
       beforeEach(async () => {
         const links = {
           ...linksDefault,
-          ORGANIZATION: 'https://ocelot.social',
-          IMPRINT: 'https://ocelot.social/IMPRINT',
-          TERMS_AND_CONDITIONS: 'https://ocelot.social/TERMS_AND_CONDITIONS',
-          CODE_OF_CONDUCT: 'https://ocelot.social/CODE_OF_CONDUCT',
-          DATA_PRIVACY: 'https://ocelot.social/DATA_PRIVACY',
-          FAQ: 'https://ocelot.social/FAQ',
+          ORGANIZATION: { ...linksDefault.ORGANIZATION, externalLink: 'https://ocelot.social' },
+          IMPRINT: { ...linksDefault.IMPRINT, externalLink: 'https://ocelot.social/IMPRINT' },
+          TERMS_AND_CONDITIONS: { ...linksDefault.TERMS_AND_CONDITIONS, externalLink: 'https://ocelot.social/TERMS_AND_CONDITIONS' },
+          CODE_OF_CONDUCT: { ...linksDefault.CODE_OF_CONDUCT, externalLink: 'https://ocelot.social/CODE_OF_CONDUCT' },
+          DATA_PRIVACY: { ...linksDefault.DATA_PRIVACY, externalLink: 'https://ocelot.social/DATA_PRIVACY' },
+          FAQ: { ...linksDefault.FAQ, externalLink: 'https://ocelot.social/FAQ' },
         }
         wrapper = Wrapper()
         wrapper.setData({ links })
diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
index 6bf049b05..89e2d60d3 100644
--- a/webapp/components/PageFooter/PageFooter.vue
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -1,69 +1,19 @@
 <template>
   <div id="footer" class="ds-footer">
-    <!-- made with ❤️ -->
-    <nuxt-link
-      v-if="noLinkDefined(links.ORGANIZATION)"
-      to="/organization"
-      data-test="organization-nuxt-link"
-    >
-      {{ $t('site.made') }}
-    </nuxt-link>
-    <a v-else :href="links.ORGANIZATION" target="_blank" data-test="organization-link">
-      {{ $t('site.made') }}
-    </a>
-    <span>-</span>
-    <!-- imprint -->
-    <nuxt-link v-if="noLinkDefined(links.IMPRINT)" to="/imprint" data-test="imprint-nuxt-link">
-      {{ $t('site.imprint') }}
-    </nuxt-link>
-    <a v-else :href="links.IMPRINT" target="_blank">
-      {{ $t('site.imprint') }}
-    </a>
-    <span>-</span>
-    <!-- terms and conditions -->
-    <nuxt-link
-      v-if="noLinkDefined(links.TERMS_AND_CONDITIONS)"
-      to="/terms-and-conditions"
-      data-test="terms-nuxt-link"
-    >
-      {{ $t('site.termsAndConditions') }}
-    </nuxt-link>
-    <a v-else :href="links.TERMS_AND_CONDITIONS" target="_blank">
-      {{ $t('site.termsAndConditions') }}
-    </a>
-    <span>-</span>
-    <!-- code of conduct -->
-    <nuxt-link
-      v-if="noLinkDefined(links.CODE_OF_CONDUCT)"
-      to="/code-of-conduct"
-      data-test="code-nuxt-link"
-    >
-      {{ $t('site.code-of-conduct') }}
-    </nuxt-link>
-    <a v-else :href="links.CODE_OF_CONDUCT" target="_blank">
-      {{ $t('site.code-of-conduct') }}
-    </a>
-    <span>-</span>
-    <!-- data privacy -->
-    <nuxt-link
-      v-if="noLinkDefined(links.DATA_PRIVACY)"
-      to="/data-privacy"
-      data-test="data-nuxt-link"
-    >
-      {{ $t('site.data-privacy') }}
-    </nuxt-link>
-    <a v-else :href="links.DATA_PRIVACY" target="_blank">
-      {{ $t('site.data-privacy') }}
-    </a>
-    <span>-</span>
-    <!-- faq -->
-    <nuxt-link v-if="noLinkDefined(links.FAQ)" to="/faq" data-test="faq-nuxt-link">
-      {{ $t('site.faq') }}
-    </nuxt-link>
-    <a v-else :href="links.FAQ" target="_blank">
-      {{ $t('site.faq') }}
-    </a>
-    <span>-</span>
+    <!-- links to internal or external pages -->
+    <span v-for="pageParams in links.FOOTER_LINK_LIST" :key="pageParams.name">
+      <nuxt-link
+        v-if="isInternalPage(pageParams)"
+        :to="pageParams.internalLink"
+        :data-test="pageParams.name + '-nuxt-link'"
+      >
+        {{ $t(pageParams.internalPage.footerIdent) }}
+      </nuxt-link>
+      <a v-else :href="pageParams.externalLink" target="_blank" :data-test="pageParams.name + '-link'">
+        {{ $t(pageParams.internalPage.footerIdent) }}
+      </a>
+      <span class="division-line">-</span>
+    </span>
     <!-- version -->
     <a
       href="https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/CHANGELOG.md"
@@ -76,16 +26,12 @@
 </template>
 
 <script>
+import { isInternalPage } from '~/components/utils/InternalPages.js'
 import links from '~/constants/links.js'
 
 export default {
   data() {
-    return { links, version: `v${this.$env.VERSION}` }
-  },
-  methods: {
-    noLinkDefined(link) {
-      return !link || link.length === 0
-    },
+    return { isInternalPage, links, version: `v${this.$env.VERSION}` }
   },
 }
 </script>
@@ -101,7 +47,8 @@ export default {
   padding: 10px 10px;
   box-shadow: 0px -6px 12px -4px rgba(0, 0, 0, 0.1);
 }
-span {
+.division-line {
+  margin-left: 0.2rem;
   margin-right: 0.2rem;
 }
 </style>
diff --git a/webapp/components/utils/InternalPages.js b/webapp/components/utils/InternalPages.js
new file mode 100644
index 000000000..41879051d
--- /dev/null
+++ b/webapp/components/utils/InternalPages.js
@@ -0,0 +1,7 @@
+export function isInternalPage(pageParams) {
+  return noStringDefined(pageParams.externalLink)
+}
+
+export function noStringDefined(string) {
+  return !string || string === 0
+}

From df1e6220949f664e02626af17e74123e10b525a6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 2 Aug 2021 13:48:57 +0200
Subject: [PATCH 09/31] Implement internal page component, first step

---
 webapp/components/PageFooter/PageFooter.vue   |  4 +-
 .../Registration/RegistrationSlider.vue       |  4 +-
 .../features/InternalPage/InternalPage.vue    | 84 +++++++++++++++++++
 webapp/components/utils/InternalPages.js      |  4 +
 webapp/constants/links.js                     | 26 ++++--
 webapp/locales/html/de/organization.html      | 35 +++++---
 webapp/locales/html/en/organization.html      | 14 ++--
 webapp/pages/organization.vue                 | 28 +++++--
 8 files changed, 160 insertions(+), 39 deletions(-)
 create mode 100644 webapp/components/_new/features/InternalPage/InternalPage.vue

diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
index 89e2d60d3..d4b563167 100644
--- a/webapp/components/PageFooter/PageFooter.vue
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -26,12 +26,12 @@
 </template>
 
 <script>
-import { isInternalPage } from '~/components/utils/InternalPages.js'
 import links from '~/constants/links.js'
+import { isInternalPage } from '~/components/utils/InternalPages.js'
 
 export default {
   data() {
-    return { isInternalPage, links, version: `v${this.$env.VERSION}` }
+    return { links, isInternalPage, version: `v${this.$env.VERSION}` }
   },
 }
 </script>
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index 2e297bc86..818f6c5e9 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -2,7 +2,7 @@
   <section class="login-form">
     <base-card>
       <template #imageColumn>
-        <a :href="links.ORGANIZATION" :title="$t('login.moreInfo', metadata)" target="_blank">
+        <a :href="pageLink(links.ORGANIZATION)" :title="$t('login.moreInfo', metadata)" target="_blank">
           <logo logoType="signup" />
         </a>
       </template>
@@ -45,6 +45,7 @@
 <script>
 import links from '~/constants/links.js'
 import metadata from '~/constants/metadata.js'
+import { pageLink } from '~/components/utils/InternalPages.js'
 import ComponentSlider from '~/components/ComponentSlider/ComponentSlider'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
@@ -161,6 +162,7 @@ export default {
     }
 
     return {
+      pageLink,
       links,
       metadata,
       sliderData: {
diff --git a/webapp/components/_new/features/InternalPage/InternalPage.vue b/webapp/components/_new/features/InternalPage/InternalPage.vue
new file mode 100644
index 000000000..0d071c3f1
--- /dev/null
+++ b/webapp/components/_new/features/InternalPage/InternalPage.vue
@@ -0,0 +1,84 @@
+<template>
+  <div>
+    <ds-space margin="small">
+      <ds-heading v-if="pageParams.internalPage.headlineIdent !== null" tag="h2">{{ $t(pageParams.internalPage.headlineIdent === '' ? pageValues.defaultHeadlineIdent : pageParams.internalPage.headlineIdent) }}</ds-heading>
+    </ds-space>
+    <ds-container v-if="pageParams.internalPage.hasContainer">
+      <div v-if="!pageParams.internalPage.hasBaseCard">
+        <br>
+        <div v-html="$t(pageValues.htmlIdent)" />
+      </div>
+      <base-card v-else>
+        <div v-html="$t(pageValues.htmlIdent)" />
+      </base-card>
+    </ds-container>
+    <div v-else-if="!pageParams.internalPage.hasBaseCard">
+      <br>
+      <div v-html="$t(pageValues.htmlIdent)" />
+    </div>
+    <base-card v-else>
+      <div v-html="$t(pageValues.htmlIdent)" />
+    </base-card>
+  </div>
+</template>
+
+<script>
+// import links from '~/constants/links.js'
+// import { pageLink } from '~/components/utils/InternalPages.js'
+// import Logo from '~/components/Logo/Logo'
+
+export default {
+  name: 'InternalPage',
+  head() {
+    return {
+      title: this.$t(this.pageParams.internalPage.headTitleIdent),
+    }
+  },
+  // layout: 'basic',
+  // components: {
+  //   Logo,
+  // },
+  props: {
+    pageParams: { type: Object, required: true },
+  },
+  // data() {
+  //   return { links, pageLink }
+  // },
+  computed: {
+    pageValues() {
+      let values = {}
+      switch (this.pageParams.name) {
+        case 'organization':
+          values.defaultHeadlineIdent = 'site.made'
+          values.htmlIdent = 'html.organization'
+          break;
+        case 'donate':
+          values.defaultHeadlineIdent = 'site.donate'
+          values.htmlIdent = 'html.donate'
+          break;
+        case 'imprint':
+          values.defaultHeadlineIdent = 'site.imprint'
+          values.htmlIdent = 'html.imprint'
+          break;
+        case 'terms-and-conditions':
+          values.defaultHeadlineIdent = 'site.termsAndConditions'
+          values.htmlIdent = 'html.termsAndConditions'
+          break;
+        case 'code-of-conduct':
+          values.defaultHeadlineIdent = 'site.code-of-conduct'
+          values.htmlIdent = 'html.codeOfConduct'
+          break;
+        case 'data-privacy':
+          values.defaultHeadlineIdent = 'site.data-privacy'
+          values.htmlIdent = 'html.dataPrivacy'
+          break;
+        case 'faq':
+          values.defaultHeadlineIdent = 'site.faq'
+          values.htmlIdent = 'html.faq'
+          break;
+      }
+      return values
+    },
+  },
+}
+</script>
diff --git a/webapp/components/utils/InternalPages.js b/webapp/components/utils/InternalPages.js
index 41879051d..78bb4527f 100644
--- a/webapp/components/utils/InternalPages.js
+++ b/webapp/components/utils/InternalPages.js
@@ -5,3 +5,7 @@ export function isInternalPage(pageParams) {
 export function noStringDefined(string) {
   return !string || string === 0
 }
+
+export function pageLink(pageParams) {
+  return isInternalPage(pageParams) ? pageParams.internalLink : pageParams.externalLink
+}
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
index aa96fc2f3..a0191b70b 100644
--- a/webapp/constants/links.js
+++ b/webapp/constants/links.js
@@ -10,9 +10,11 @@ const ORGANIZATION = {
   internalLink: '/organization', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.made', // localized string identifier
-    // Wolle headlineIdent: null, // on null default is used, on empty string it's hidden
-    headlineIdent: '', // localized string identifier. on null default is used, on empty string it's hidden
-    hasBaseCard: true,
+    headTitleIdent: 'site.made', // localized string identifier
+    // Wolle headlineIdent: 'site.made', // localized string identifier. on null it's hidden, on empty string default is used
+    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
+    hasContainer: true,
+    hasBaseCard: true, // no baseCard without a container
     hasLoginInHeader: true,
   },
 }
@@ -26,7 +28,8 @@ const DONATE = {
   internalLink: '/donate', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.donate', // localized string identifier
-    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    headTitleIdent: 'site.donate', // localized string identifier
+    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
@@ -41,7 +44,8 @@ const IMPRINT = {
   internalLink: '/imprint', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.imprint', // localized string identifier
-    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    headTitleIdent: 'site.imprint', // localized string identifier
+    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
@@ -55,7 +59,8 @@ const TERMS_AND_CONDITIONS = {
   internalLink: '/terms-and-conditions', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.termsAndConditions', // localized string identifier
-    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    headTitleIdent: 'site.termsAndConditions', // localized string identifier
+    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
@@ -69,7 +74,8 @@ const CODE_OF_CONDUCT = {
   internalLink: '/code-of-conduct', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.code-of-conduct', // localized string identifier
-    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    headTitleIdent: 'site.code-of-conduct', // localized string identifier
+    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
@@ -83,7 +89,8 @@ const DATA_PRIVACY = {
   internalLink: '/data-privacy', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.data-privacy', // localized string identifier
-    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    headTitleIdent: 'site.data-privacy', // localized string identifier
+    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
@@ -98,8 +105,9 @@ const FAQ = {
   internalLink: '/faq', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.faq', // localized string identifier
+    headTitleIdent: 'site.faq', // localized string identifier
     // Wolle headlineIdent: null, // on null default is used, on empty string it's hidden
-    headlineIdent: null, // localized string identifier. on null default is used, on empty string it's hidden
+    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
diff --git a/webapp/locales/html/de/organization.html b/webapp/locales/html/de/organization.html
index c63df9929..c1eec4273 100644
--- a/webapp/locales/html/de/organization.html
+++ b/webapp/locales/html/de/organization.html
@@ -1,31 +1,31 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
-<h1 class="h3-headline-big">
+<!-- <br> -->
+<!-- <h1 class="h3-headline-big">
   sender.fm
-</h1>
+</h1> -->
 <!-- <img class="logo" alt="ocelot.social Header" src="/img/custom/logo-horizontal.svg" style="width: 360px;"><br> -->
-<p class="paragraph">
+<!-- <p class="paragraph">
   Hier wird sender.fm in Zukunft vorgestellt …
-</p>
-<p class="link">
+</p> -->
+<!-- <p class="link">
   <a href="/login" target="_blank">
     Zum Login …
   </a><br>
 </p>
-<br>
-<h3 class="h3-headline">
+<br> -->
+<h1 class="h1-headline">
   Unser Radio-Stream
-</h3>
+</h1>
 <br>
 <!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
-<iframe class="player" id="embed_player" frameborder="0" width="350" height="396" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
+<iframe class="player" id="embed_player" frameborder="0" width="510px" height="396px" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
 <br>
-<h4 class="h4-headline">
+<h3 class="h3-headline">
   Sende-Wochenplan
 </h4>
-<iframe class="weekly-plan" height="400px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
+<iframe class="weekly-plan" height="802px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
 <br>
 <br>
 
@@ -38,6 +38,12 @@ https://senderfm.out.airtime.pro/senderfm_a -->
     margin-bottom: 48px;
   }
 
+  .h1-headline {
+    font-size: 48px;
+    margin-top: 12px;
+    margin-bottom: 8px;
+  }
+
   .h3-headline-big {
     font-size: 64px;
     margin-top: 12px;
@@ -45,7 +51,7 @@ https://senderfm.out.airtime.pro/senderfm_a -->
   }
 
   .h3-headline {
-    font-size: 24px;
+    font-size: 32px;
     margin-top: 12px;
     margin-bottom: 8px;
   }
@@ -77,4 +83,7 @@ https://senderfm.out.airtime.pro/senderfm_a -->
     margin-bottom: 0px;
     margin-left: -20px;
   }
+  .schedule.current, .schedule_content {
+    max-height: 900px;
+  }
 </style>
diff --git a/webapp/locales/html/en/organization.html b/webapp/locales/html/en/organization.html
index 3ae6a69b8..19e9ebf9a 100644
--- a/webapp/locales/html/en/organization.html
+++ b/webapp/locales/html/en/organization.html
@@ -1,20 +1,20 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
-<h1 class="h3-headline-big">
+<!-- <br> -->
+<!-- <h1 class="h3-headline-big">
   sender.fm
-</h1>
+</h1> -->
 <!-- <img class="logo" alt="ocelot.social Header" src="/img/custom/logo-horizontal.svg" style="width: 360px;"><br> -->
-<p class="paragraph">
+<!-- <p class="paragraph">
   Here sender.fm will be described in the future …
-</p>
-<p class="link">
+</p> -->
+<!-- <p class="link">
   <a href="/login" target="_blank">
     Login …
   </a><br>
 </p>
-<br>
+<br> -->
 <h3 class="h3-headline">
   Our Radio Stream
 </h3>
diff --git a/webapp/pages/organization.vue b/webapp/pages/organization.vue
index 32add9fbb..6478caca3 100644
--- a/webapp/pages/organization.vue
+++ b/webapp/pages/organization.vue
@@ -1,21 +1,35 @@
 <template>
-  <div>
+  <internal-page
+    :pageParams="links.ORGANIZATION"
+  />
+  <!-- Wolle <div>
     <ds-space margin="small">
       <ds-heading tag="h2">{{ $t('site.made') }}</ds-heading>
     </ds-space>
     <ds-container>
       <div v-html="$t('html.organization')" />
     </ds-container>
-  </div>
+  </div> -->
 </template>
 
 <script>
+import links from '~/constants/links.js'
+import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+
 export default {
-  layout: 'basic',
-  head() {
-    return {
-      title: this.$t('site.made'),
-    }
+  components: {
+    InternalPage,
   },
+  // Wolle 
+  layout: 'basic',
+  data() {
+    // Wolle console.log(links.ORGANIZATION)
+    return { links }
+  },
+  // Wolle head() {
+  //   return {
+  //     title: this.$t('site.made'),
+  //   }
+  // },
 }
 </script>

From a3d3656bf156a637524b7473e7cd385084f160a9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 2 Aug 2021 16:17:35 +0200
Subject: [PATCH 10/31] Implement login-button

---
 .../LoginButton/LoginButton.spec.js           | 53 ++++++++++++++
 webapp/components/LoginButton/LoginButton.vue | 54 ++++++++++++++
 .../features/InternalPage/InternalPage.vue    |  1 -
 webapp/layouts/basic.vue                      | 70 ++++++++++++++++++-
 webapp/locales/html/de/organization.html      |  5 +-
 webapp/locales/html/en/organization.html      | 18 +++--
 webapp/pages/organization.vue                 |  3 +-
 7 files changed, 189 insertions(+), 15 deletions(-)
 create mode 100644 webapp/components/LoginButton/LoginButton.spec.js
 create mode 100644 webapp/components/LoginButton/LoginButton.vue

diff --git a/webapp/components/LoginButton/LoginButton.spec.js b/webapp/components/LoginButton/LoginButton.spec.js
new file mode 100644
index 000000000..f28045612
--- /dev/null
+++ b/webapp/components/LoginButton/LoginButton.spec.js
@@ -0,0 +1,53 @@
+import { config, mount } from '@vue/test-utils'
+import InviteButton from './InviteButton.vue'
+
+config.stubs['v-popover'] = '<span><slot /></span>'
+
+describe('InviteButton.vue', () => {
+  let wrapper
+  let mocks
+  let propsData
+
+  beforeEach(() => {
+    mocks = {
+      $t: jest.fn(),
+      navigator: {
+        clipboard: {
+          writeText: jest.fn(),
+        },
+      },
+    }
+    propsData = {}
+  })
+
+  describe('mount', () => {
+    const Wrapper = () => {
+      return mount(InviteButton, { mocks, propsData })
+    }
+
+    beforeEach(() => {
+      wrapper = Wrapper()
+    })
+
+    it('renders', () => {
+      expect(wrapper.contains('.invite-button')).toBe(true)
+    })
+
+    it('open popup', () => {
+      wrapper.find('.base-button').trigger('click')
+      expect(wrapper.contains('.invite-button')).toBe(true)
+    })
+
+    it('invite codes not available', async () => {
+      wrapper.find('.base-button').trigger('click') // open popup
+      wrapper.find('.invite-button').trigger('click') // click copy button
+      expect(mocks.$t).toHaveBeenCalledWith('invite-codes.not-available')
+    })
+
+    it.skip('invite codes copied to clipboard', async () => {
+      wrapper.find('.base-button').trigger('click') // open popup
+      wrapper.find('.invite-button').trigger('click') // click copy button
+      expect(mocks.$t).toHaveBeenCalledWith('invite-codes.not-available')
+    })
+  })
+})
diff --git a/webapp/components/LoginButton/LoginButton.vue b/webapp/components/LoginButton/LoginButton.vue
new file mode 100644
index 000000000..39f0fa4ae
--- /dev/null
+++ b/webapp/components/LoginButton/LoginButton.vue
@@ -0,0 +1,54 @@
+<template>
+  <dropdown class="login-button" offset="8" :placement="placement">
+    <template #default="{ toggleMenu }">
+      <base-button icon="sign-in" circle ghost @click.prevent="toggleMenu" />
+    </template>
+    <template #popover>
+      <div class="login-button-menu-popover">
+        <nuxt-link class="login-link" :to="{ name: 'login' }">
+          <base-icon name="sign-in" />
+          {{ $t('login.login') }}
+        </nuxt-link>
+      </div>
+    </template>
+  </dropdown>
+</template>
+
+<script>
+import Dropdown from '~/components/Dropdown'
+
+export default {
+  components: {
+    Dropdown,
+  },
+  props: {
+    placement: { type: String, default: 'top-end' },
+  },
+}
+</script>
+
+<style lang="scss" scope>
+.login-button {
+  color: $color-secondary;
+}
+
+.login-button-menu-popover {
+  padding-top: $space-x-small;
+  padding-bottom: $space-x-small;
+  hr {
+    color: $color-neutral-90;
+    background-color: $color-neutral-90;
+  }
+  .login-link {
+    color: $text-color-base;
+    padding-top: $space-xx-small;
+    &:hover {
+      color: $text-color-link-active;
+    }
+  }
+}
+
+.invite-code {
+  left: 50%;
+}
+</style>
diff --git a/webapp/components/_new/features/InternalPage/InternalPage.vue b/webapp/components/_new/features/InternalPage/InternalPage.vue
index 0d071c3f1..389ecc01c 100644
--- a/webapp/components/_new/features/InternalPage/InternalPage.vue
+++ b/webapp/components/_new/features/InternalPage/InternalPage.vue
@@ -34,7 +34,6 @@ export default {
       title: this.$t(this.pageParams.internalPage.headTitleIdent),
     }
   },
-  // layout: 'basic',
   // components: {
   //   Logo,
   // },
diff --git a/webapp/layouts/basic.vue b/webapp/layouts/basic.vue
index 01872868e..a14ae4f3c 100644
--- a/webapp/layouts/basic.vue
+++ b/webapp/layouts/basic.vue
@@ -10,7 +10,17 @@
             </a>
           </ds-flex-item>
           <ds-flex-item width="20%" style="flex-grow: 0">
-            <locale-switch class="topbar-locale-switch" placement="top" offset="16" />
+            <div
+              class="main-navigation-right"
+              style="flex-basis: auto"
+            >
+              <locale-switch class="topbar-locale-switch" placement="top" offset="8" />
+              <template v-if="!isLoggedIn">
+                <client-only>
+                  <login-button placement="top" />
+                </client-only>
+              </template>
+            </div>
           </ds-flex-item>
         </ds-flex>
       </ds-container>
@@ -26,18 +36,26 @@
 </template>
 
 <script>
+import { mapGetters } from 'vuex'
+import seo from '~/mixins/seo'
 import Logo from '~/components/Logo/Logo'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
-import seo from '~/mixins/seo'
+import LoginButton from '~/components/LoginButton/LoginButton'
 import PageFooter from '~/components/PageFooter/PageFooter'
 
 export default {
   components: {
     Logo,
     LocaleSwitch,
+    LoginButton,
     PageFooter,
   },
   mixins: [seo],
+  computed: {
+    ...mapGetters({
+      isLoggedIn: 'auth/isLoggedIn',
+    }),
+  },
   methods: {
     redirectToRoot() {
       this.$router.replace('/')
@@ -45,3 +63,51 @@ export default {
   },
 }
 </script>
+
+<style lang="scss">
+// Wolle .topbar-locale-switch {
+//   display: flex;
+//   margin-right: $space-xx-small;
+//   align-self: center;
+//   display: inline-flex;
+// }
+// .main-container {
+//   padding-top: 6rem;
+//   padding-bottom: 5rem;
+// }
+
+// .main-navigation-flex {
+//   align-items: center;
+// }
+
+// .main-navigation {
+//   a {
+//     color: $text-color-soft;
+//   }
+// }
+.main-navigation-right {
+  display: flex;
+  justify-content: flex-end;
+}
+.main-navigation-right .desktop-view {
+  float: right;
+}
+// Wolle .ds-flex-item.mobile-hamburger-menu {
+//   margin-left: auto;
+//   text-align: right;
+// }
+// @media only screen and (min-width: 730px) {
+//   .mobile-hamburger-menu {
+//     display: none;
+//   }
+// }
+// @media only screen and (max-width: 730px) {
+//   #nav-search-box,
+//   .main-navigation-right {
+//     margin: 10px 0px;
+//   }
+//   .hide-mobile-menu {
+//     display: none;
+//   }
+// }
+</style>
diff --git a/webapp/locales/html/de/organization.html b/webapp/locales/html/de/organization.html
index c1eec4273..2ffdd90b5 100644
--- a/webapp/locales/html/de/organization.html
+++ b/webapp/locales/html/de/organization.html
@@ -24,7 +24,7 @@
 <br>
 <h3 class="h3-headline">
   Sende-Wochenplan
-</h4>
+</h3>
 <iframe class="weekly-plan" height="802px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
 <br>
 <br>
@@ -83,7 +83,4 @@ https://senderfm.out.airtime.pro/senderfm_a -->
     margin-bottom: 0px;
     margin-left: -20px;
   }
-  .schedule.current, .schedule_content {
-    max-height: 900px;
-  }
 </style>
diff --git a/webapp/locales/html/en/organization.html b/webapp/locales/html/en/organization.html
index 19e9ebf9a..7a3316eb2 100644
--- a/webapp/locales/html/en/organization.html
+++ b/webapp/locales/html/en/organization.html
@@ -15,17 +15,17 @@
   </a><br>
 </p>
 <br> -->
-<h3 class="h3-headline">
+<h1 class="h1-headline">
   Our Radio Stream
-</h3>
+</h1>
 <br>
 <!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
 <iframe class="player" id="embed_player" frameborder="0" width="350" height="396" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
 <br>
-<h4 class="h4-headline">
+<h3 class="h3-headline">
   Radio Weekly Plan
-</h4>
-<iframe class="weekly-plan" height="400px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
+</h3>
+<iframe class="weekly-plan" height="802px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
 <br>
 <br>
 
@@ -38,6 +38,12 @@ https://senderfm.out.airtime.pro/senderfm_a -->
     margin-bottom: 48px;
   }
 
+  .h1-headline {
+    font-size: 48px;
+    margin-top: 12px;
+    margin-bottom: 8px;
+  }
+
   .h3-headline-big {
     font-size: 64px;
     margin-top: 12px;
@@ -45,7 +51,7 @@ https://senderfm.out.airtime.pro/senderfm_a -->
   }
 
   .h3-headline {
-    font-size: 24px;
+    font-size: 32px;
     margin-top: 12px;
     margin-bottom: 8px;
   }
diff --git a/webapp/pages/organization.vue b/webapp/pages/organization.vue
index 6478caca3..0447fff4f 100644
--- a/webapp/pages/organization.vue
+++ b/webapp/pages/organization.vue
@@ -17,11 +17,10 @@ import links from '~/constants/links.js'
 import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
 
 export default {
+  layout: 'basic',
   components: {
     InternalPage,
   },
-  // Wolle 
-  layout: 'basic',
   data() {
     // Wolle console.log(links.ORGANIZATION)
     return { links }

From 97fdb7cd5c972584c8ccffa6a3503a204da37130 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 3 Aug 2021 15:30:58 +0200
Subject: [PATCH 11/31] Refactor pageParams

---
 webapp/components/LoginForm/LoginForm.vue     |   2 +-
 webapp/components/PageFooter/PageFooter.vue   |   2 +
 .../Registration/RegistrationSlider.vue       |   4 +-
 .../features/InternalPage/InternalPage.vue    |  93 +++++-----
 webapp/components/utils/InternalPages.js      | 165 ++++++++++++++++++
 webapp/constants/links.js                     |  48 +++--
 webapp/locales/html/en/organization.html      |   2 +-
 7 files changed, 249 insertions(+), 67 deletions(-)

diff --git a/webapp/components/LoginForm/LoginForm.vue b/webapp/components/LoginForm/LoginForm.vue
index 57429baa3..d9e218a2b 100644
--- a/webapp/components/LoginForm/LoginForm.vue
+++ b/webapp/components/LoginForm/LoginForm.vue
@@ -6,7 +6,7 @@
     </blockquote>
     <base-card>
       <template #imageColumn>
-        <a :href="links.ORGANIZATION" :title="$t('login.moreInfo', metadata)" target="_blank">
+        <a :href="links.ORGANIZATION.link" :title="$t('login.moreInfo', metadata)" target="_blank">
           <logo logoType="welcome" />
         </a>
       </template>
diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
index d4b563167..cb8c2a424 100644
--- a/webapp/components/PageFooter/PageFooter.vue
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -7,9 +7,11 @@
         :to="pageParams.internalLink"
         :data-test="pageParams.name + '-nuxt-link'"
       >
+        {{ pageParams.link }}
         {{ $t(pageParams.internalPage.footerIdent) }}
       </nuxt-link>
       <a v-else :href="pageParams.externalLink" target="_blank" :data-test="pageParams.name + '-link'">
+        {{ pageParams.link }}
         {{ $t(pageParams.internalPage.footerIdent) }}
       </a>
       <span class="division-line">-</span>
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index 818f6c5e9..b860bf2a2 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -2,7 +2,7 @@
   <section class="login-form">
     <base-card>
       <template #imageColumn>
-        <a :href="pageLink(links.ORGANIZATION)" :title="$t('login.moreInfo', metadata)" target="_blank">
+        <a :href="links.ORGANIZATION.link" :title="$t('login.moreInfo', metadata)" target="_blank">
           <logo logoType="signup" />
         </a>
       </template>
@@ -45,7 +45,6 @@
 <script>
 import links from '~/constants/links.js'
 import metadata from '~/constants/metadata.js'
-import { pageLink } from '~/components/utils/InternalPages.js'
 import ComponentSlider from '~/components/ComponentSlider/ComponentSlider'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
@@ -162,7 +161,6 @@ export default {
     }
 
     return {
-      pageLink,
       links,
       metadata,
       sliderData: {
diff --git a/webapp/components/_new/features/InternalPage/InternalPage.vue b/webapp/components/_new/features/InternalPage/InternalPage.vue
index 389ecc01c..ab47d90f7 100644
--- a/webapp/components/_new/features/InternalPage/InternalPage.vue
+++ b/webapp/components/_new/features/InternalPage/InternalPage.vue
@@ -1,29 +1,34 @@
 <template>
   <div>
     <ds-space margin="small">
-      <ds-heading v-if="pageParams.internalPage.headlineIdent !== null" tag="h2">{{ $t(pageParams.internalPage.headlineIdent === '' ? pageValues.defaultHeadlineIdent : pageParams.internalPage.headlineIdent) }}</ds-heading>
+      <!-- Wolle <ds-heading v-if="pageParams.internalPage.headlineIdent !== null" tag="h2">{{ $t(pageParams.internalPage.headlineIdent === '' ? pageValues.defaultHeadlineIdent : pageParams.internalPage.headlineIdent) }}</ds-heading> -->
+      <ds-heading v-if="pageParams.internalPage.headlineIdent !== null" tag="h2">{{ $t(pageParams.internalPage.headlineIdent === '' ? pageParams.internalPage.defaultHeadlineIdent : pageParams.internalPage.headlineIdent) }}</ds-heading>
     </ds-space>
     <ds-container v-if="pageParams.internalPage.hasContainer">
       <div v-if="!pageParams.internalPage.hasBaseCard">
         <br>
-        <div v-html="$t(pageValues.htmlIdent)" />
+        <!-- Wolle <div v-html="$t(pageValues.htmlIdent)" /> -->
+        <div v-html="$t(pageParams.internalPage.htmlIdent)" />
       </div>
       <base-card v-else>
-        <div v-html="$t(pageValues.htmlIdent)" />
+        <!-- Wolle <div v-html="$t(pageValues.htmlIdent)" /> -->
+        <div v-html="$t(pageParams.internalPage.htmlIdent)" />
       </base-card>
     </ds-container>
     <div v-else-if="!pageParams.internalPage.hasBaseCard">
       <br>
-      <div v-html="$t(pageValues.htmlIdent)" />
+      <!-- Wolle <div v-html="$t(pageValues.htmlIdent)" /> -->
+      <div v-html="$t(pageParams.internalPage.htmlIdent)" />
     </div>
     <base-card v-else>
-      <div v-html="$t(pageValues.htmlIdent)" />
+      <!-- Wolle <div v-html="$t(pageValues.htmlIdent)" /> -->
+      <div v-html="$t(pageParams.internalPage.htmlIdent)" />
     </base-card>
   </div>
 </template>
 
 <script>
-// import links from '~/constants/links.js'
+// Wolle import links from '~/constants/links.js'
 // import { pageLink } from '~/components/utils/InternalPages.js'
 // import Logo from '~/components/Logo/Logo'
 
@@ -34,50 +39,50 @@ export default {
       title: this.$t(this.pageParams.internalPage.headTitleIdent),
     }
   },
-  // components: {
+  // Wolle components: {
   //   Logo,
   // },
   props: {
     pageParams: { type: Object, required: true },
   },
-  // data() {
+  // Wolle data() {
   //   return { links, pageLink }
   // },
-  computed: {
-    pageValues() {
-      let values = {}
-      switch (this.pageParams.name) {
-        case 'organization':
-          values.defaultHeadlineIdent = 'site.made'
-          values.htmlIdent = 'html.organization'
-          break;
-        case 'donate':
-          values.defaultHeadlineIdent = 'site.donate'
-          values.htmlIdent = 'html.donate'
-          break;
-        case 'imprint':
-          values.defaultHeadlineIdent = 'site.imprint'
-          values.htmlIdent = 'html.imprint'
-          break;
-        case 'terms-and-conditions':
-          values.defaultHeadlineIdent = 'site.termsAndConditions'
-          values.htmlIdent = 'html.termsAndConditions'
-          break;
-        case 'code-of-conduct':
-          values.defaultHeadlineIdent = 'site.code-of-conduct'
-          values.htmlIdent = 'html.codeOfConduct'
-          break;
-        case 'data-privacy':
-          values.defaultHeadlineIdent = 'site.data-privacy'
-          values.htmlIdent = 'html.dataPrivacy'
-          break;
-        case 'faq':
-          values.defaultHeadlineIdent = 'site.faq'
-          values.htmlIdent = 'html.faq'
-          break;
-      }
-      return values
-    },
-  },
+  // computed: {
+  //   pageValues() {
+  //     let values = {}
+  //     switch (this.pageParams.name) {
+  //       case 'organization':
+  //         values.defaultHeadlineIdent = 'site.made'
+  //         values.htmlIdent = 'html.organization'
+  //         break;
+  //       case 'donate':
+  //         values.defaultHeadlineIdent = 'site.donate'
+  //         values.htmlIdent = 'html.donate'
+  //         break;
+  //       case 'imprint':
+          // values.defaultHeadlineIdent = 'site.imprint'
+          // values.htmlIdent = 'html.imprint'
+  //         break;
+  //       case 'terms-and-conditions':
+  //         values.defaultHeadlineIdent = 'site.termsAndConditions'
+  //         values.htmlIdent = 'html.termsAndConditions'
+  //         break;
+  //       case 'code-of-conduct':
+  //         values.defaultHeadlineIdent = 'site.code-of-conduct'
+  //         values.htmlIdent = 'html.codeOfConduct'
+  //         break;
+  //       case 'data-privacy':
+  //         values.defaultHeadlineIdent = 'site.data-privacy'
+  //         values.htmlIdent = 'html.dataPrivacy'
+  //         break;
+  //       case 'faq':
+  //         values.defaultHeadlineIdent = 'site.faq'
+  //         values.htmlIdent = 'html.faq'
+  //         break;
+  //     }
+  //     return values
+  //   },
+  // },
 }
 </script>
diff --git a/webapp/components/utils/InternalPages.js b/webapp/components/utils/InternalPages.js
index 78bb4527f..e508d4af9 100644
--- a/webapp/components/utils/InternalPages.js
+++ b/webapp/components/utils/InternalPages.js
@@ -9,3 +9,168 @@ export function noStringDefined(string) {
 export function pageLink(pageParams) {
   return isInternalPage(pageParams) ? pageParams.internalLink : pageParams.externalLink
 }
+
+export const defaultInternalPagesSettings = {
+  ORGANIZATION: {
+    name: 'organization',
+
+    externalLink: null, // if string is defined and not empty it's dominating
+
+    // in case internal page content is here 'webapp/locales/html/'
+    internalLink: '/organization', // static, don't change! internal page in case no external is defined
+    internalPage: {
+      footerIdent: 'site.made', // localized string identifier
+      headTitleIdent: 'site.made', // localized string identifier
+      headlineIdent: 'site.made', // localized string identifier. on null it's hidden, on empty string default is used
+      hasContainer: true,
+      hasBaseCard: true,
+      hasLoginInHeader: true,
+
+      defaultHeadlineIdent: 'site.made',
+      htmlIdent: 'html.organization',
+    },
+
+    get link() {
+      return pageLink(this)
+    },
+  },
+  DONATE: {
+    name: 'donate',
+
+    externalLink: null, // if string is defined and not empty it's dominating
+
+    // in case internal page content is here 'webapp/locales/html/'
+    internalLink: '/donate', // static, don't change! internal page in case no external is defined
+    internalPage: {
+      footerIdent: 'site.donate', // localized string identifier
+      headTitleIdent: 'site.donate', // localized string identifier
+      headlineIdent: 'site.donate', // localized string identifier. on null it's hidden, on empty string default is used
+      hasContainer: true,
+      hasBaseCard: true,
+      hasLoginInHeader: true,
+
+      defaultHeadlineIdent: 'site.donate',
+      htmlIdent: 'html.donate',
+    },
+
+    get link() {
+      return pageLink(this)
+    },
+  },
+  IMPRINT: {
+    name: 'imprint',
+
+    externalLink: null, // if string is defined and not empty it's dominating
+
+    // in case internal page content is here 'webapp/locales/html/'
+    internalLink: '/imprint', // static, don't change! internal page in case no external is defined
+    internalPage: {
+      footerIdent: 'site.imprint', // localized string identifier
+      headTitleIdent: 'site.imprint', // localized string identifier
+      headlineIdent: 'site.imprint', // localized string identifier. on null it's hidden, on empty string default is used
+      hasContainer: true,
+      hasBaseCard: true,
+      hasLoginInHeader: true,
+
+      defaultHeadlineIdent: 'site.imprint',
+      htmlIdent: 'html.imprint',
+    },
+
+    get link() {
+      return pageLink(this)
+    },
+  },
+  TERMS_AND_CONDITIONS: {
+    name: 'terms-and-conditions',
+
+    externalLink: null, // if string is defined and not empty it's dominating
+
+    // in case internal page content is here 'webapp/locales/html/'
+    internalLink: '/terms-and-conditions', // static, don't change! internal page in case no external is defined
+    internalPage: {
+      footerIdent: 'site.termsAndConditions', // localized string identifier
+      headTitleIdent: 'site.termsAndConditions', // localized string identifier
+      headlineIdent: 'site.termsAndConditions', // localized string identifier. on null it's hidden, on empty string default is used
+      hasContainer: true,
+      hasBaseCard: true,
+      hasLoginInHeader: true,
+
+      defaultHeadlineIdent: 'site.termsAndConditions',
+      htmlIdent: 'html.termsAndConditions',
+    },
+
+    get link() {
+      return pageLink(this)
+    },
+  },
+  CODE_OF_CONDUCT: {
+    name: 'code-of-conduct',
+
+    externalLink: null, // if string is defined and not empty it's dominating
+
+    // in case internal page content is here 'webapp/locales/html/'
+    internalLink: '/code-of-conduct', // static, don't change! internal page in case no external is defined
+    internalPage: {
+      footerIdent: 'site.code-of-conduct', // localized string identifier
+      headTitleIdent: 'site.code-of-conduct', // localized string identifier
+      headlineIdent: 'site.code-of-conduct', // localized string identifier. on null it's hidden, on empty string default is used
+      hasContainer: true,
+      hasBaseCard: true,
+      hasLoginInHeader: true,
+
+      defaultHeadlineIdent: 'site.code-of-conduct',
+      htmlIdent: 'html.codeOfConduct',
+    },
+
+    get link() {
+      return pageLink(this)
+    },
+  },
+  DATA_PRIVACY: {
+    name: 'data-privacy',
+
+    externalLink: null, // if string is defined and not empty it's dominating
+
+    // in case internal page content is here 'webapp/locales/html/'
+    internalLink: '/data-privacy', // static, don't change! internal page in case no external is defined
+    internalPage: {
+      footerIdent: 'site.data-privacy', // localized string identifier
+      headTitleIdent: 'site.data-privacy', // localized string identifier
+      headlineIdent: 'site.data-privacy', // localized string identifier. on null it's hidden, on empty string default is used
+      hasContainer: true,
+      hasBaseCard: true,
+      hasLoginInHeader: true,
+
+      defaultHeadlineIdent: 'site.data-privacy',
+      htmlIdent: 'html.dataPrivacy',
+    },
+
+    get link() {
+      return pageLink(this)
+    },
+  },
+  FAQ: {
+    name: 'faq',
+
+    // Wolle externalLink: 'https://ocelot.social',
+    externalLink: null, // if string is defined and not empty it's dominating
+
+    // in case internal page content is here 'webapp/locales/html/'
+    internalLink: '/faq', // static, don't change! internal page in case no external is defined
+    internalPage: {
+      footerIdent: 'site.faq', // localized string identifier
+      headTitleIdent: 'site.faq', // localized string identifier
+      headlineIdent: 'site.faq', // localized string identifier. on null it's hidden, on empty string default is used
+      hasContainer: true,
+      hasBaseCard: true,
+      hasLoginInHeader: true,
+
+      defaultHeadlineIdent: 'site.faq',
+      htmlIdent: 'html.faq',
+    },
+
+    get link() {
+      return pageLink(this)
+    },
+  },
+}
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
index a0191b70b..32c6fc5e2 100644
--- a/webapp/constants/links.js
+++ b/webapp/constants/links.js
@@ -1,31 +1,38 @@
 // this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
 
-const ORGANIZATION = {
-  name: 'organization',
+import { defaultInternalPagesSettings } from '~/components/utils/InternalPages.js'
 
-  // Wolle externalLink: 'https://ocelot.social',
-  externalLink: null, // if string is defined and not empty it's dominating
+const ORGANIZATION = {
+  ...defaultInternalPagesSettings.ORGANIZATION,
+  // Wolle name: 'organization',
+
+  // Wolle 
+  externalLink: 'https://ocelot.social',
+  // externalLink: null, // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  internalLink: '/organization', // static, don't change! internal page in case no external is defined
+  // Wolle internalLink: '/organization', // static, don't change! internal page in case no external is defined
   internalPage: {
+    ...defaultInternalPagesSettings.ORGANIZATION.internalPage,
+
     footerIdent: 'site.made', // localized string identifier
     headTitleIdent: 'site.made', // localized string identifier
     // Wolle headlineIdent: 'site.made', // localized string identifier. on null it's hidden, on empty string default is used
     headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
     hasContainer: true,
-    hasBaseCard: true, // no baseCard without a container
+    hasBaseCard: true,
     hasLoginInHeader: true,
   },
 }
 const DONATE = {
-  name: 'donate',
+  ...defaultInternalPagesSettings.DONATE,
+  // Wolle name: 'donate',
 
   // Wolle externalLink: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
   externalLink: '', // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  internalLink: '/donate', // static, don't change! internal page in case no external is defined
+  // Wolle internalLink: '/donate', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.donate', // localized string identifier
     headTitleIdent: 'site.donate', // localized string identifier
@@ -35,13 +42,14 @@ const DONATE = {
   },
 }
 const IMPRINT = {
-  name: 'imprint',
+  ...defaultInternalPagesSettings.IMPRINT,
+  // Wolle name: 'imprint',
 
   // Wolle externalLink: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
   externalLink: '', // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  internalLink: '/imprint', // static, don't change! internal page in case no external is defined
+  // Wolle internalLink: '/imprint', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.imprint', // localized string identifier
     headTitleIdent: 'site.imprint', // localized string identifier
@@ -51,12 +59,13 @@ const IMPRINT = {
   },
 }
 const TERMS_AND_CONDITIONS = {
-  name: 'terms-and-conditions',
+  ...defaultInternalPagesSettings.TERMS_AND_CONDITIONS,
+  // Wolle name: 'terms-and-conditions',
 
   externalLink: null, // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  internalLink: '/terms-and-conditions', // static, don't change! internal page in case no external is defined
+  // Wolle internalLink: '/terms-and-conditions', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.termsAndConditions', // localized string identifier
     headTitleIdent: 'site.termsAndConditions', // localized string identifier
@@ -66,12 +75,13 @@ const TERMS_AND_CONDITIONS = {
   },
 }
 const CODE_OF_CONDUCT = {
-  name: 'code-of-conduct',
+  ...defaultInternalPagesSettings.CODE_OF_CONDUCT,
+  // Wolle name: 'code-of-conduct',
 
   externalLink: null, // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  internalLink: '/code-of-conduct', // static, don't change! internal page in case no external is defined
+  // Wolle internalLink: '/code-of-conduct', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.code-of-conduct', // localized string identifier
     headTitleIdent: 'site.code-of-conduct', // localized string identifier
@@ -81,12 +91,13 @@ const CODE_OF_CONDUCT = {
   },
 }
 const DATA_PRIVACY = {
-  name: 'data-privacy',
+  ...defaultInternalPagesSettings.DATA_PRIVACY,
+  // Wolle name: 'data-privacy',
 
   externalLink: null, // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  internalLink: '/data-privacy', // static, don't change! internal page in case no external is defined
+  // Wolle internalLink: '/data-privacy', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.data-privacy', // localized string identifier
     headTitleIdent: 'site.data-privacy', // localized string identifier
@@ -96,13 +107,14 @@ const DATA_PRIVACY = {
   },
 }
 const FAQ = {
-  name: 'faq',
+  ...defaultInternalPagesSettings.FAQ,
+  // Wolle name: 'faq',
 
   // Wolle externalLink: 'https://ocelot.social',
   externalLink: null, // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  internalLink: '/faq', // static, don't change! internal page in case no external is defined
+  // Wolle internalLink: '/faq', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.faq', // localized string identifier
     headTitleIdent: 'site.faq', // localized string identifier
diff --git a/webapp/locales/html/en/organization.html b/webapp/locales/html/en/organization.html
index 7a3316eb2..61172ba8e 100644
--- a/webapp/locales/html/en/organization.html
+++ b/webapp/locales/html/en/organization.html
@@ -20,7 +20,7 @@
 </h1>
 <br>
 <!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
-<iframe class="player" id="embed_player" frameborder="0" width="350" height="396" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
+<iframe class="player" id="embed_player" frameborder="0" width="510px" height="396px" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
 <br>
 <h3 class="h3-headline">
   Radio Weekly Plan

From e8a0a5d13c0610066c50c98d5e0d661ee8139217 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 3 Aug 2021 20:05:05 +0200
Subject: [PATCH 12/31] Refactor pageParams, second step

---
 .../components/PageFooter/PageFooter.spec.js  |  19 ++-
 webapp/components/PageFooter/PageFooter.vue   |   9 +-
 .../features/InternalPage/InternalPage.vue    |  65 ++---------
 webapp/components/utils/InternalPages.js      | 103 +++++++++-------
 webapp/constants/links.js                     | 110 ++++++++----------
 webapp/layouts/basic.vue                      |  43 +------
 webapp/locales/html/de/code-of-conduct.html   |   1 -
 webapp/locales/html/de/data-privacy.html      |   1 -
 webapp/locales/html/de/donate.html            |   1 -
 webapp/locales/html/de/faq.html               |   1 -
 webapp/locales/html/de/imprint.html           |   1 -
 webapp/locales/html/de/support.html           |   1 -
 .../locales/html/de/terms-and-conditions.html |   1 -
 webapp/locales/html/en/code-of-conduct.html   |   1 -
 webapp/locales/html/en/data-privacy.html      |   1 -
 webapp/locales/html/en/donate.html            |   1 -
 webapp/locales/html/en/faq.html               |   1 -
 webapp/locales/html/en/imprint.html           |   1 -
 webapp/locales/html/en/support.html           |   1 -
 .../locales/html/en/terms-and-conditions.html |   1 -
 webapp/pages/code-of-conduct.vue              |  21 ++--
 webapp/pages/data-privacy.vue                 |  21 ++--
 webapp/pages/donate.vue                       |  21 ++--
 webapp/pages/faq.vue                          |  21 ++--
 webapp/pages/imprint.vue                      |  21 ++--
 webapp/pages/organization.vue                 |  18 +--
 webapp/pages/support.vue                      |  21 ++--
 webapp/pages/terms-and-conditions.vue         |  21 ++--
 28 files changed, 206 insertions(+), 322 deletions(-)

diff --git a/webapp/components/PageFooter/PageFooter.spec.js b/webapp/components/PageFooter/PageFooter.spec.js
index d82d03982..c0c32c4c4 100644
--- a/webapp/components/PageFooter/PageFooter.spec.js
+++ b/webapp/components/PageFooter/PageFooter.spec.js
@@ -77,7 +77,9 @@ describe('PageFooter.vue', () => {
       })
 
       it('renders TERMS_AND_CONDITIONS as nuxt-link', () => {
-        expect(wrapper.find('span[data-test="terms-and-conditions-nuxt-link"]').exists()).toBeTruthy()
+        expect(
+          wrapper.find('span[data-test="terms-and-conditions-nuxt-link"]').exists(),
+        ).toBeTruthy()
       })
 
       it('renders CODE_OF_CONDUCT as nuxt-link', () => {
@@ -99,9 +101,18 @@ describe('PageFooter.vue', () => {
           ...linksDefault,
           ORGANIZATION: { ...linksDefault.ORGANIZATION, externalLink: 'https://ocelot.social' },
           IMPRINT: { ...linksDefault.IMPRINT, externalLink: 'https://ocelot.social/IMPRINT' },
-          TERMS_AND_CONDITIONS: { ...linksDefault.TERMS_AND_CONDITIONS, externalLink: 'https://ocelot.social/TERMS_AND_CONDITIONS' },
-          CODE_OF_CONDUCT: { ...linksDefault.CODE_OF_CONDUCT, externalLink: 'https://ocelot.social/CODE_OF_CONDUCT' },
-          DATA_PRIVACY: { ...linksDefault.DATA_PRIVACY, externalLink: 'https://ocelot.social/DATA_PRIVACY' },
+          TERMS_AND_CONDITIONS: {
+            ...linksDefault.TERMS_AND_CONDITIONS,
+            externalLink: 'https://ocelot.social/TERMS_AND_CONDITIONS',
+          },
+          CODE_OF_CONDUCT: {
+            ...linksDefault.CODE_OF_CONDUCT,
+            externalLink: 'https://ocelot.social/CODE_OF_CONDUCT',
+          },
+          DATA_PRIVACY: {
+            ...linksDefault.DATA_PRIVACY,
+            externalLink: 'https://ocelot.social/DATA_PRIVACY',
+          },
           FAQ: { ...linksDefault.FAQ, externalLink: 'https://ocelot.social/FAQ' },
         }
         wrapper = Wrapper()
diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
index cb8c2a424..9aedaafec 100644
--- a/webapp/components/PageFooter/PageFooter.vue
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -7,11 +7,14 @@
         :to="pageParams.internalLink"
         :data-test="pageParams.name + '-nuxt-link'"
       >
-        {{ pageParams.link }}
         {{ $t(pageParams.internalPage.footerIdent) }}
       </nuxt-link>
-      <a v-else :href="pageParams.externalLink" target="_blank" :data-test="pageParams.name + '-link'">
-        {{ pageParams.link }}
+      <a
+        v-else
+        :href="pageParams.externalLink"
+        target="_blank"
+        :data-test="pageParams.name + '-link'"
+      >
         {{ $t(pageParams.internalPage.footerIdent) }}
       </a>
       <span class="division-line">-</span>
diff --git a/webapp/components/_new/features/InternalPage/InternalPage.vue b/webapp/components/_new/features/InternalPage/InternalPage.vue
index ab47d90f7..397baeeb1 100644
--- a/webapp/components/_new/features/InternalPage/InternalPage.vue
+++ b/webapp/components/_new/features/InternalPage/InternalPage.vue
@@ -1,37 +1,36 @@
 <template>
   <div>
     <ds-space margin="small">
-      <!-- Wolle <ds-heading v-if="pageParams.internalPage.headlineIdent !== null" tag="h2">{{ $t(pageParams.internalPage.headlineIdent === '' ? pageValues.defaultHeadlineIdent : pageParams.internalPage.headlineIdent) }}</ds-heading> -->
-      <ds-heading v-if="pageParams.internalPage.headlineIdent !== null" tag="h2">{{ $t(pageParams.internalPage.headlineIdent === '' ? pageParams.internalPage.defaultHeadlineIdent : pageParams.internalPage.headlineIdent) }}</ds-heading>
+      <ds-heading v-if="pageParams.internalPage.headlineIdent !== null" tag="h2">
+        {{
+          $t(
+            pageParams.internalPage.headlineIdent === ''
+              ? pageParams.internalPage.defaultHeadlineIdent
+              : pageParams.internalPage.headlineIdent,
+          )
+        }}
+      </ds-heading>
     </ds-space>
     <ds-container v-if="pageParams.internalPage.hasContainer">
       <div v-if="!pageParams.internalPage.hasBaseCard">
-        <br>
-        <!-- Wolle <div v-html="$t(pageValues.htmlIdent)" /> -->
+        <br />
         <div v-html="$t(pageParams.internalPage.htmlIdent)" />
       </div>
       <base-card v-else>
-        <!-- Wolle <div v-html="$t(pageValues.htmlIdent)" /> -->
         <div v-html="$t(pageParams.internalPage.htmlIdent)" />
       </base-card>
     </ds-container>
     <div v-else-if="!pageParams.internalPage.hasBaseCard">
-      <br>
-      <!-- Wolle <div v-html="$t(pageValues.htmlIdent)" /> -->
+      <br />
       <div v-html="$t(pageParams.internalPage.htmlIdent)" />
     </div>
     <base-card v-else>
-      <!-- Wolle <div v-html="$t(pageValues.htmlIdent)" /> -->
       <div v-html="$t(pageParams.internalPage.htmlIdent)" />
     </base-card>
   </div>
 </template>
 
 <script>
-// Wolle import links from '~/constants/links.js'
-// import { pageLink } from '~/components/utils/InternalPages.js'
-// import Logo from '~/components/Logo/Logo'
-
 export default {
   name: 'InternalPage',
   head() {
@@ -39,50 +38,8 @@ export default {
       title: this.$t(this.pageParams.internalPage.headTitleIdent),
     }
   },
-  // Wolle components: {
-  //   Logo,
-  // },
   props: {
     pageParams: { type: Object, required: true },
   },
-  // Wolle data() {
-  //   return { links, pageLink }
-  // },
-  // computed: {
-  //   pageValues() {
-  //     let values = {}
-  //     switch (this.pageParams.name) {
-  //       case 'organization':
-  //         values.defaultHeadlineIdent = 'site.made'
-  //         values.htmlIdent = 'html.organization'
-  //         break;
-  //       case 'donate':
-  //         values.defaultHeadlineIdent = 'site.donate'
-  //         values.htmlIdent = 'html.donate'
-  //         break;
-  //       case 'imprint':
-          // values.defaultHeadlineIdent = 'site.imprint'
-          // values.htmlIdent = 'html.imprint'
-  //         break;
-  //       case 'terms-and-conditions':
-  //         values.defaultHeadlineIdent = 'site.termsAndConditions'
-  //         values.htmlIdent = 'html.termsAndConditions'
-  //         break;
-  //       case 'code-of-conduct':
-  //         values.defaultHeadlineIdent = 'site.code-of-conduct'
-  //         values.htmlIdent = 'html.codeOfConduct'
-  //         break;
-  //       case 'data-privacy':
-  //         values.defaultHeadlineIdent = 'site.data-privacy'
-  //         values.htmlIdent = 'html.dataPrivacy'
-  //         break;
-  //       case 'faq':
-  //         values.defaultHeadlineIdent = 'site.faq'
-  //         values.htmlIdent = 'html.faq'
-  //         break;
-  //     }
-  //     return values
-  //   },
-  // },
 }
 </script>
diff --git a/webapp/components/utils/InternalPages.js b/webapp/components/utils/InternalPages.js
index e508d4af9..419578e1d 100644
--- a/webapp/components/utils/InternalPages.js
+++ b/webapp/components/utils/InternalPages.js
@@ -2,16 +2,39 @@ export function isInternalPage(pageParams) {
   return noStringDefined(pageParams.externalLink)
 }
 
-export function noStringDefined(string) {
+function noStringDefined(string) {
   return !string || string === 0
 }
 
-export function pageLink(pageParams) {
+function pageLink(pageParams) {
   return isInternalPage(pageParams) ? pageParams.internalLink : pageParams.externalLink
 }
 
-export const defaultInternalPagesSettings = {
-  ORGANIZATION: {
+class PageParams {
+  constructor(pageParams) {
+    this.name = pageParams.name
+    this.externalLink = pageParams.externalLink
+    this.internalLink = pageParams.internalLink
+    this.internalPage = pageParams.internalPage
+  }
+
+  assign(assignPageParams) {
+    let pageParams = this
+    pageParams = {
+      ...pageParams,
+      ...assignPageParams,
+      internalPage: { ...pageParams.internalPage, ...assignPageParams.internalPage },
+    }
+    return pageParams
+  }
+
+  get link() {
+    return pageLink(this)
+  }
+}
+
+export const defaultPageParamsPages = {
+  ORGANIZATION: new PageParams({
     name: 'organization',
 
     externalLink: null, // if string is defined and not empty it's dominating
@@ -29,12 +52,8 @@ export const defaultInternalPagesSettings = {
       defaultHeadlineIdent: 'site.made',
       htmlIdent: 'html.organization',
     },
-
-    get link() {
-      return pageLink(this)
-    },
-  },
-  DONATE: {
+  }),
+  DONATE: new PageParams({
     name: 'donate',
 
     externalLink: null, // if string is defined and not empty it's dominating
@@ -52,12 +71,8 @@ export const defaultInternalPagesSettings = {
       defaultHeadlineIdent: 'site.donate',
       htmlIdent: 'html.donate',
     },
-
-    get link() {
-      return pageLink(this)
-    },
-  },
-  IMPRINT: {
+  }),
+  IMPRINT: new PageParams({
     name: 'imprint',
 
     externalLink: null, // if string is defined and not empty it's dominating
@@ -75,12 +90,8 @@ export const defaultInternalPagesSettings = {
       defaultHeadlineIdent: 'site.imprint',
       htmlIdent: 'html.imprint',
     },
-
-    get link() {
-      return pageLink(this)
-    },
-  },
-  TERMS_AND_CONDITIONS: {
+  }),
+  TERMS_AND_CONDITIONS: new PageParams({
     name: 'terms-and-conditions',
 
     externalLink: null, // if string is defined and not empty it's dominating
@@ -98,12 +109,8 @@ export const defaultInternalPagesSettings = {
       defaultHeadlineIdent: 'site.termsAndConditions',
       htmlIdent: 'html.termsAndConditions',
     },
-
-    get link() {
-      return pageLink(this)
-    },
-  },
-  CODE_OF_CONDUCT: {
+  }),
+  CODE_OF_CONDUCT: new PageParams({
     name: 'code-of-conduct',
 
     externalLink: null, // if string is defined and not empty it's dominating
@@ -121,12 +128,8 @@ export const defaultInternalPagesSettings = {
       defaultHeadlineIdent: 'site.code-of-conduct',
       htmlIdent: 'html.codeOfConduct',
     },
-
-    get link() {
-      return pageLink(this)
-    },
-  },
-  DATA_PRIVACY: {
+  }),
+  DATA_PRIVACY: new PageParams({
     name: 'data-privacy',
 
     externalLink: null, // if string is defined and not empty it's dominating
@@ -144,15 +147,10 @@ export const defaultInternalPagesSettings = {
       defaultHeadlineIdent: 'site.data-privacy',
       htmlIdent: 'html.dataPrivacy',
     },
-
-    get link() {
-      return pageLink(this)
-    },
-  },
-  FAQ: {
+  }),
+  FAQ: new PageParams({
     name: 'faq',
 
-    // Wolle externalLink: 'https://ocelot.social',
     externalLink: null, // if string is defined and not empty it's dominating
 
     // in case internal page content is here 'webapp/locales/html/'
@@ -168,9 +166,26 @@ export const defaultInternalPagesSettings = {
       defaultHeadlineIdent: 'site.faq',
       htmlIdent: 'html.faq',
     },
+  }),
+  SUPPORT: new PageParams({
+    name: 'support',
 
-    get link() {
-      return pageLink(this)
+    // ATTENTION: has to be defined even for internal page with full URL as example like 'https://staging.ocelot.social/support', because it is used in e-mails as well!
+    externalLink: 'https://ocelot.social',
+
+    // in case internal page content is here 'webapp/locales/html/'
+    // ATTENTION: example for internal support page: 'https://staging.ocelot.social/support'. set a full URL please, because it is used in e-mails as well!
+    internalLink: '/support', // static, don't change '*/support'! internal page in case no external is defined
+    internalPage: {
+      footerIdent: 'site.support', // localized string identifier
+      headTitleIdent: 'site.support', // localized string identifier
+      headlineIdent: 'site.support', // localized string identifier. on null it's hidden, on empty string default is used
+      hasContainer: true,
+      hasBaseCard: true,
+      hasLoginInHeader: true,
+
+      defaultHeadlineIdent: 'site.support',
+      htmlIdent: 'html.support',
     },
-  },
+  }),
 }
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
index 32c6fc5e2..a26a0d52e 100644
--- a/webapp/constants/links.js
+++ b/webapp/constants/links.js
@@ -1,129 +1,121 @@
 // this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
 
-import { defaultInternalPagesSettings } from '~/components/utils/InternalPages.js'
+import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
 
-const ORGANIZATION = {
-  ...defaultInternalPagesSettings.ORGANIZATION,
-  // Wolle name: 'organization',
-
-  // Wolle 
-  externalLink: 'https://ocelot.social',
-  // externalLink: null, // if string is defined and not empty it's dominating
+const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.assign({
+  // Wolle externalLink: 'https://ocelot.social',
+  //
+  externalLink: null, // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  // Wolle internalLink: '/organization', // static, don't change! internal page in case no external is defined
   internalPage: {
-    ...defaultInternalPagesSettings.ORGANIZATION.internalPage,
-
     footerIdent: 'site.made', // localized string identifier
     headTitleIdent: 'site.made', // localized string identifier
-    // Wolle headlineIdent: 'site.made', // localized string identifier. on null it's hidden, on empty string default is used
+    // Wolle headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
     headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
-}
-const DONATE = {
-  ...defaultInternalPagesSettings.DONATE,
-  // Wolle name: 'donate',
-
+})
+const DONATE = defaultPageParamsPages.DONATE.assign({
   // Wolle externalLink: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
   externalLink: '', // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  // Wolle internalLink: '/donate', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.donate', // localized string identifier
     headTitleIdent: 'site.donate', // localized string identifier
-    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
+    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
-}
-const IMPRINT = {
-  ...defaultInternalPagesSettings.IMPRINT,
-  // Wolle name: 'imprint',
-
+})
+const IMPRINT = defaultPageParamsPages.IMPRINT.assign({
   // Wolle externalLink: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
   externalLink: '', // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  // Wolle internalLink: '/imprint', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.imprint', // localized string identifier
     headTitleIdent: 'site.imprint', // localized string identifier
-    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
+    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
-}
-const TERMS_AND_CONDITIONS = {
-  ...defaultInternalPagesSettings.TERMS_AND_CONDITIONS,
-  // Wolle name: 'terms-and-conditions',
-
+})
+const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.assign({
   externalLink: null, // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  // Wolle internalLink: '/terms-and-conditions', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.termsAndConditions', // localized string identifier
     headTitleIdent: 'site.termsAndConditions', // localized string identifier
-    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
+    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
-}
-const CODE_OF_CONDUCT = {
-  ...defaultInternalPagesSettings.CODE_OF_CONDUCT,
-  // Wolle name: 'code-of-conduct',
-
+})
+const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.assign({
   externalLink: null, // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  // Wolle internalLink: '/code-of-conduct', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.code-of-conduct', // localized string identifier
     headTitleIdent: 'site.code-of-conduct', // localized string identifier
-    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
+    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
-}
-const DATA_PRIVACY = {
-  ...defaultInternalPagesSettings.DATA_PRIVACY,
-  // Wolle name: 'data-privacy',
-
+})
+const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.assign({
   externalLink: null, // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  // Wolle internalLink: '/data-privacy', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.data-privacy', // localized string identifier
     headTitleIdent: 'site.data-privacy', // localized string identifier
-    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
+    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
-}
-const FAQ = {
-  ...defaultInternalPagesSettings.FAQ,
-  // Wolle name: 'faq',
-
+})
+const FAQ = defaultPageParamsPages.FAQ.assign({
   // Wolle externalLink: 'https://ocelot.social',
   externalLink: null, // if string is defined and not empty it's dominating
 
   // in case internal page content is here 'webapp/locales/html/'
-  // Wolle internalLink: '/faq', // static, don't change! internal page in case no external is defined
   internalPage: {
     footerIdent: 'site.faq', // localized string identifier
     headTitleIdent: 'site.faq', // localized string identifier
-    // Wolle headlineIdent: null, // on null default is used, on empty string it's hidden
-    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
+    // Wolle headlineIdent: '', // on null default is used, on empty string it's hidden
+    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
   },
-}
+})
+const SUPPORT = defaultPageParamsPages.SUPPORT.assign({
+  // ATTENTION: has to be defined even for internal page with full URL as example like 'https://staging.ocelot.social/support', because it is used in e-mails as well!
+  // Wolle externalLink: 'https://ocelot.social',
+  externalLink: 'http://localhost:3000/support', // if string is defined and not empty it's dominating
+
+  // in case internal page content is here 'webapp/locales/html/'
+  internalPage: {
+    footerIdent: 'site.support', // localized string identifier
+    headTitleIdent: 'site.support', // localized string identifier
+    // Wolle headlineIdent: '', // on null default is used, on empty string it's hidden
+    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    hasContainer: true,
+    hasBaseCard: true,
+    hasLoginInHeader: true,
+  },
+})
 
 export default {
   // Wolle LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
@@ -131,8 +123,6 @@ export default {
 
   // you can find and store templates for 👇🏼 at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
 
-  SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support'. set a full URL please, because it is used in e-mails as well!
-
   ORGANIZATION,
   DONATE,
   IMPRINT,
@@ -140,6 +130,7 @@ export default {
   CODE_OF_CONDUCT,
   DATA_PRIVACY,
   FAQ,
+  SUPPORT,
 
   FOOTER_LINK_LIST: [
     ORGANIZATION,
@@ -147,9 +138,8 @@ export default {
     CODE_OF_CONDUCT,
     DATA_PRIVACY,
     FAQ,
-    // DONATE,
-    // Wolle
     DONATE,
     IMPRINT,
+    // SUPPORT,
   ],
 }
diff --git a/webapp/layouts/basic.vue b/webapp/layouts/basic.vue
index a14ae4f3c..5eadb42af 100644
--- a/webapp/layouts/basic.vue
+++ b/webapp/layouts/basic.vue
@@ -10,10 +10,7 @@
             </a>
           </ds-flex-item>
           <ds-flex-item width="20%" style="flex-grow: 0">
-            <div
-              class="main-navigation-right"
-              style="flex-basis: auto"
-            >
+            <div class="main-navigation-right" style="flex-basis: auto">
               <locale-switch class="topbar-locale-switch" placement="top" offset="8" />
               <template v-if="!isLoggedIn">
                 <client-only>
@@ -65,26 +62,6 @@ export default {
 </script>
 
 <style lang="scss">
-// Wolle .topbar-locale-switch {
-//   display: flex;
-//   margin-right: $space-xx-small;
-//   align-self: center;
-//   display: inline-flex;
-// }
-// .main-container {
-//   padding-top: 6rem;
-//   padding-bottom: 5rem;
-// }
-
-// .main-navigation-flex {
-//   align-items: center;
-// }
-
-// .main-navigation {
-//   a {
-//     color: $text-color-soft;
-//   }
-// }
 .main-navigation-right {
   display: flex;
   justify-content: flex-end;
@@ -92,22 +69,4 @@ export default {
 .main-navigation-right .desktop-view {
   float: right;
 }
-// Wolle .ds-flex-item.mobile-hamburger-menu {
-//   margin-left: auto;
-//   text-align: right;
-// }
-// @media only screen and (min-width: 730px) {
-//   .mobile-hamburger-menu {
-//     display: none;
-//   }
-// }
-// @media only screen and (max-width: 730px) {
-//   #nav-search-box,
-//   .main-navigation-right {
-//     margin: 10px 0px;
-//   }
-//   .hide-mobile-menu {
-//     display: none;
-//   }
-// }
 </style>
diff --git a/webapp/locales/html/de/code-of-conduct.html b/webapp/locales/html/de/code-of-conduct.html
index 96ac29482..bd0d41ba8 100644
--- a/webapp/locales/html/de/code-of-conduct.html
+++ b/webapp/locales/html/de/code-of-conduct.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Ich bin der Inhalt vom Verhaltenskodex.</p>
diff --git a/webapp/locales/html/de/data-privacy.html b/webapp/locales/html/de/data-privacy.html
index cdfe50ac9..a6fc04470 100644
--- a/webapp/locales/html/de/data-privacy.html
+++ b/webapp/locales/html/de/data-privacy.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Das hier wäre der Inhalt der Datenschutzbestimmungen.</p>
diff --git a/webapp/locales/html/de/donate.html b/webapp/locales/html/de/donate.html
index 773c5db32..70cf6e0bb 100644
--- a/webapp/locales/html/de/donate.html
+++ b/webapp/locales/html/de/donate.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Hier steht was zu den Spenden.</p>
diff --git a/webapp/locales/html/de/faq.html b/webapp/locales/html/de/faq.html
index db20366ef..da3b2447a 100644
--- a/webapp/locales/html/de/faq.html
+++ b/webapp/locales/html/de/faq.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Hier stehen die FAQs.</p>
diff --git a/webapp/locales/html/de/imprint.html b/webapp/locales/html/de/imprint.html
index fc610d802..82450b370 100644
--- a/webapp/locales/html/de/imprint.html
+++ b/webapp/locales/html/de/imprint.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Ich bin das Impressum.</p>
diff --git a/webapp/locales/html/de/support.html b/webapp/locales/html/de/support.html
index 65899c77b..081b6dbfa 100644
--- a/webapp/locales/html/de/support.html
+++ b/webapp/locales/html/de/support.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Ich bin der Inhalt vom Support.</p>
diff --git a/webapp/locales/html/de/terms-and-conditions.html b/webapp/locales/html/de/terms-and-conditions.html
index 3a3c76775..af6c023a3 100644
--- a/webapp/locales/html/de/terms-and-conditions.html
+++ b/webapp/locales/html/de/terms-and-conditions.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Ich bin der Inhalt der Seite "Nutzungsbedingungen".</p>
diff --git a/webapp/locales/html/en/code-of-conduct.html b/webapp/locales/html/en/code-of-conduct.html
index f971a2c31..d3a9d7078 100644
--- a/webapp/locales/html/en/code-of-conduct.html
+++ b/webapp/locales/html/en/code-of-conduct.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>I am the content of the code of conduct.</p>
diff --git a/webapp/locales/html/en/data-privacy.html b/webapp/locales/html/en/data-privacy.html
index 1383a0870..5c38928c8 100644
--- a/webapp/locales/html/en/data-privacy.html
+++ b/webapp/locales/html/en/data-privacy.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>This would be our data privacy section.</p>
diff --git a/webapp/locales/html/en/donate.html b/webapp/locales/html/en/donate.html
index c82001587..82abaff6a 100644
--- a/webapp/locales/html/en/donate.html
+++ b/webapp/locales/html/en/donate.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Here's what it says about donations.</p>
diff --git a/webapp/locales/html/en/faq.html b/webapp/locales/html/en/faq.html
index 0ed093fa9..e87174838 100644
--- a/webapp/locales/html/en/faq.html
+++ b/webapp/locales/html/en/faq.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>Here are the FAQs.</p>
diff --git a/webapp/locales/html/en/imprint.html b/webapp/locales/html/en/imprint.html
index 3f85b6e86..5f1cdae19 100644
--- a/webapp/locales/html/en/imprint.html
+++ b/webapp/locales/html/en/imprint.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>I am the imprint.</p>
diff --git a/webapp/locales/html/en/support.html b/webapp/locales/html/en/support.html
index c663964b3..44b519e1d 100644
--- a/webapp/locales/html/en/support.html
+++ b/webapp/locales/html/en/support.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>I am the content of the support.</p>
diff --git a/webapp/locales/html/en/terms-and-conditions.html b/webapp/locales/html/en/terms-and-conditions.html
index a34211eda..746851607 100644
--- a/webapp/locales/html/en/terms-and-conditions.html
+++ b/webapp/locales/html/en/terms-and-conditions.html
@@ -1,5 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<br>
 <p>I am the content of the page "Terms And Conditions".<p>
diff --git a/webapp/pages/code-of-conduct.vue b/webapp/pages/code-of-conduct.vue
index c3cf3bf54..4bcf87cee 100644
--- a/webapp/pages/code-of-conduct.vue
+++ b/webapp/pages/code-of-conduct.vue
@@ -1,21 +1,18 @@
 <template>
-  <div>
-    <ds-space margin="small">
-      <ds-heading tag="h2">{{ $t('site.code-of-conduct') }}</ds-heading>
-    </ds-space>
-    <ds-container>
-      <div v-html="$t('html.codeOfConduct')" />
-    </ds-container>
-  </div>
+  <internal-page :pageParams="links.CODE_OF_CONDUCT" />
 </template>
 
 <script>
+import links from '~/constants/links.js'
+import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+
 export default {
   layout: 'basic',
-  head() {
-    return {
-      title: this.$t('site.code-of-conduct'),
-    }
+  components: {
+    InternalPage,
+  },
+  data() {
+    return { links }
   },
 }
 </script>
diff --git a/webapp/pages/data-privacy.vue b/webapp/pages/data-privacy.vue
index 236fa5eeb..b8416785b 100644
--- a/webapp/pages/data-privacy.vue
+++ b/webapp/pages/data-privacy.vue
@@ -1,21 +1,18 @@
 <template>
-  <div>
-    <ds-space margin="small">
-      <ds-heading tag="h2">{{ $t('site.data-privacy') }}</ds-heading>
-    </ds-space>
-    <ds-container>
-      <div v-html="$t('html.dataPrivacy')" />
-    </ds-container>
-  </div>
+  <internal-page :pageParams="links.DATA_PRIVACY" />
 </template>
 
 <script>
+import links from '~/constants/links.js'
+import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+
 export default {
   layout: 'basic',
-  head() {
-    return {
-      title: this.$t('site.data-privacy'),
-    }
+  components: {
+    InternalPage,
+  },
+  data() {
+    return { links }
   },
 }
 </script>
diff --git a/webapp/pages/donate.vue b/webapp/pages/donate.vue
index a3e25bb46..480242193 100644
--- a/webapp/pages/donate.vue
+++ b/webapp/pages/donate.vue
@@ -1,21 +1,18 @@
 <template>
-  <div>
-    <ds-space margin="small">
-      <ds-heading tag="h2">{{ $t('site.donate') }}</ds-heading>
-    </ds-space>
-    <ds-container>
-      <div v-html="$t('html.donate')" />
-    </ds-container>
-  </div>
+  <internal-page :pageParams="links.DONATE" />
 </template>
 
 <script>
+import links from '~/constants/links.js'
+import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+
 export default {
   layout: 'basic',
-  head() {
-    return {
-      title: this.$t('site.donate'),
-    }
+  components: {
+    InternalPage,
+  },
+  data() {
+    return { links }
   },
 }
 </script>
diff --git a/webapp/pages/faq.vue b/webapp/pages/faq.vue
index 843c78461..0ffbcdea9 100644
--- a/webapp/pages/faq.vue
+++ b/webapp/pages/faq.vue
@@ -1,21 +1,18 @@
 <template>
-  <div>
-    <ds-space margin="small">
-      <ds-heading tag="h2">{{ $t('site.faq') }}</ds-heading>
-    </ds-space>
-    <ds-container>
-      <div v-html="$t('html.faq')" />
-    </ds-container>
-  </div>
+  <internal-page :pageParams="links.FAQ" />
 </template>
 
 <script>
+import links from '~/constants/links.js'
+import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+
 export default {
   layout: 'basic',
-  head() {
-    return {
-      title: this.$t('site.faq'),
-    }
+  components: {
+    InternalPage,
+  },
+  data() {
+    return { links }
   },
 }
 </script>
diff --git a/webapp/pages/imprint.vue b/webapp/pages/imprint.vue
index 538e023a9..6902b7c3e 100644
--- a/webapp/pages/imprint.vue
+++ b/webapp/pages/imprint.vue
@@ -1,21 +1,18 @@
 <template>
-  <div>
-    <ds-space margin="small">
-      <ds-heading tag="h2">{{ $t('site.imprint') }}</ds-heading>
-    </ds-space>
-    <ds-container>
-      <div v-html="$t('html.imprint')" />
-    </ds-container>
-  </div>
+  <internal-page :pageParams="links.IMPRINT" />
 </template>
 
 <script>
+import links from '~/constants/links.js'
+import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+
 export default {
   layout: 'basic',
-  head() {
-    return {
-      title: this.$t('site.imprint'),
-    }
+  components: {
+    InternalPage,
+  },
+  data() {
+    return { links }
   },
 }
 </script>
diff --git a/webapp/pages/organization.vue b/webapp/pages/organization.vue
index 0447fff4f..4e6610931 100644
--- a/webapp/pages/organization.vue
+++ b/webapp/pages/organization.vue
@@ -1,15 +1,5 @@
 <template>
-  <internal-page
-    :pageParams="links.ORGANIZATION"
-  />
-  <!-- Wolle <div>
-    <ds-space margin="small">
-      <ds-heading tag="h2">{{ $t('site.made') }}</ds-heading>
-    </ds-space>
-    <ds-container>
-      <div v-html="$t('html.organization')" />
-    </ds-container>
-  </div> -->
+  <internal-page :pageParams="links.ORGANIZATION" />
 </template>
 
 <script>
@@ -22,13 +12,7 @@ export default {
     InternalPage,
   },
   data() {
-    // Wolle console.log(links.ORGANIZATION)
     return { links }
   },
-  // Wolle head() {
-  //   return {
-  //     title: this.$t('site.made'),
-  //   }
-  // },
 }
 </script>
diff --git a/webapp/pages/support.vue b/webapp/pages/support.vue
index b94b358a8..092515465 100644
--- a/webapp/pages/support.vue
+++ b/webapp/pages/support.vue
@@ -1,21 +1,18 @@
 <template>
-  <div>
-    <ds-space margin="small">
-      <ds-heading tag="h2">{{ $t('site.support') }}</ds-heading>
-    </ds-space>
-    <ds-container>
-      <div v-html="$t('html.support')" />
-    </ds-container>
-  </div>
+  <internal-page :pageParams="links.SUPPORT" />
 </template>
 
 <script>
+import links from '~/constants/links.js'
+import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+
 export default {
   layout: 'basic',
-  head() {
-    return {
-      title: this.$t('site.support'),
-    }
+  components: {
+    InternalPage,
+  },
+  data() {
+    return { links }
   },
 }
 </script>
diff --git a/webapp/pages/terms-and-conditions.vue b/webapp/pages/terms-and-conditions.vue
index 07ac41cfc..18796afa0 100644
--- a/webapp/pages/terms-and-conditions.vue
+++ b/webapp/pages/terms-and-conditions.vue
@@ -1,21 +1,18 @@
 <template>
-  <div>
-    <ds-space margin="small">
-      <ds-heading tag="h2">{{ $t('site.termsAndConditions') }}</ds-heading>
-    </ds-space>
-    <ds-container>
-      <div v-html="$t('html.termsAndConditions')" />
-    </ds-container>
-  </div>
+  <internal-page :pageParams="links.TERMS_AND_CONDITIONS" />
 </template>
 
 <script>
+import links from '~/constants/links.js'
+import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+
 export default {
   layout: 'basic',
-  head() {
-    return {
-      title: this.$t('site.termsAndConditions'),
-    }
+  components: {
+    InternalPage,
+  },
+  data() {
+    return { links }
   },
 }
 </script>

From aa454893ceb6b53c2ea248cd575811e3fbde9ec3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 Aug 2021 14:44:54 +0200
Subject: [PATCH 13/31] Refactor pageParams, third step

- Implement emails.js in backend as well.
- Move backend links.js into emails.js, because code is not a duplicate of webapp anymore.
---
 backend/src/config/emails.js                  |   8 ++
 backend/src/config/index.js                   |   6 +-
 backend/src/config/links.js                   |  18 ---
 .../ContributionForm/ContributionForm.vue     |   8 +-
 .../components/DonationInfo/DonationInfo.vue  |   9 +-
 webapp/components/LoginForm/LoginForm.vue     |   6 +-
 webapp/components/PageFooter/PageFooter.vue   |  23 ++--
 .../PasswordReset/ChangePassword.vue          |   2 +-
 .../Registration/RegistrationSlideCreate.vue  |   2 +-
 .../Registration/RegistrationSlider.vue       |   6 +-
 .../features/InternalPage/InternalPage.vue    |   4 +-
 .../PageParamsLink/PageParamsLink.vue         |  26 ++++
 webapp/components/utils/InternalPages.js      |  89 ++++++--------
 webapp/constants/emails.js                    |   8 +-
 webapp/constants/links.js                     | 112 +++++++++---------
 webapp/locales/html/de/organization.html      |  18 +--
 webapp/locales/html/en/organization.html      |  18 +--
 webapp/maintenance/source/pages/index.vue     |   6 +-
 webapp/pages/donate.vue                       |   5 +
 webapp/pages/index.vue                        |   9 +-
 webapp/pages/password-reset.vue               |   6 +-
 webapp/pages/post/_id/_slug/index.vue         |  12 +-
 .../settings/my-email-address/verify.vue      |   2 +-
 23 files changed, 195 insertions(+), 208 deletions(-)
 create mode 100644 backend/src/config/emails.js
 delete mode 100644 backend/src/config/links.js
 create mode 100644 webapp/components/_new/features/PageParamsLink/PageParamsLink.vue

diff --git a/backend/src/config/emails.js b/backend/src/config/emails.js
new file mode 100644
index 000000000..34daaecb0
--- /dev/null
+++ b/backend/src/config/emails.js
@@ -0,0 +1,8 @@
+// this file is duplicated in `backend/src/config/` and `webapp/constants/` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
+export default {
+  SUPPORT_EMAIL: 'devops@ocelot.social',
+  MODERATION_EMAIL: 'devops@ocelot.social',
+  // ATTENTION: the following links have to be defined even for internal pages with full URLs as example like 'https://staging.ocelot.social/support', because they are used in e-mails!
+  ORGANIZATION_LINK: 'https://ocelot.social',
+  SUPPORT_LINK: 'https://ocelot.social',
+}
diff --git a/backend/src/config/index.js b/backend/src/config/index.js
index f3a8fb63c..d6d8cc166 100644
--- a/backend/src/config/index.js
+++ b/backend/src/config/index.js
@@ -1,5 +1,5 @@
 import dotenv from 'dotenv'
-import links from './links.js'
+import emails from './emails.js'
 import metadata from './metadata.js'
 
 // Load env file
@@ -79,9 +79,9 @@ const s3 = {
 
 const options = {
   EMAIL_DEFAULT_SENDER: env.EMAIL_DEFAULT_SENDER,
-  SUPPORT_URL: links.SUPPORT,
+  SUPPORT_URL: emails.SUPPORT_LINK,
   APPLICATION_NAME: metadata.APPLICATION_NAME,
-  ORGANIZATION_URL: links.ORGANIZATION,
+  ORGANIZATION_URL: emails.ORGANIZATION_LINK,
   PUBLIC_REGISTRATION: env.PUBLIC_REGISTRATION === 'true' || false,
   INVITE_REGISTRATION: env.INVITE_REGISTRATION !== 'false', // default = true
 }
diff --git a/backend/src/config/links.js b/backend/src/config/links.js
deleted file mode 100644
index 07b97aa60..000000000
--- a/backend/src/config/links.js
+++ /dev/null
@@ -1,18 +0,0 @@
-// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
-export default {
-  // Wolle LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
-  LANDING_PAGE: '/organization', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
-
-  // you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
-
-  SUPPORT: 'https://ocelot.social', // example for internal support page: 'https://staging.ocelot.social/support'. set a full URL please, because it is used in e-mails as well!
-
-  // on null or empty strings internal pages are used, see 'webapp/locales/html/'
-  ORGANIZATION: 'https://ocelot.social',
-  DONATE: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-  IMPRINT: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-  TERMS_AND_CONDITIONS: null,
-  CODE_OF_CONDUCT: null,
-  DATA_PRIVACY: null,
-  FAQ: 'https://ocelot.social',
-}
diff --git a/webapp/components/ContributionForm/ContributionForm.vue b/webapp/components/ContributionForm/ContributionForm.vue
index d2cb419a4..a06679149 100644
--- a/webapp/components/ContributionForm/ContributionForm.vue
+++ b/webapp/components/ContributionForm/ContributionForm.vue
@@ -25,10 +25,10 @@
         <div v-if="formData.image" class="blur-toggle">
           <label for="blur-img">{{ $t('contribution.inappropriatePicture') }}</label>
           <input type="checkbox" id="blur-img" v-model="formData.imageBlurred" />
-          <a :href="links.FAQ" target="_blank" class="link">
-            {{ $t('contribution.inappropriatePictureText') }}
+          <page-params-link class="link" :pageParams="links.FAQ">
+            {{ $t('contribution.inappropriatePicture') }}
             <base-icon name="question-circle" />
-          </a>
+          </page-params-link>
         </div>
         <ds-input
           model="title"
@@ -71,11 +71,13 @@ import HcEditor from '~/components/Editor/Editor'
 import PostMutations from '~/graphql/PostMutations.js'
 import ImageUploader from '~/components/ImageUploader/ImageUploader'
 import links from '~/constants/links.js'
+import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
 
 export default {
   components: {
     HcEditor,
     ImageUploader,
+    PageParamsLink,
   },
   props: {
     contribution: {
diff --git a/webapp/components/DonationInfo/DonationInfo.vue b/webapp/components/DonationInfo/DonationInfo.vue
index b1916a6e9..27807a20c 100644
--- a/webapp/components/DonationInfo/DonationInfo.vue
+++ b/webapp/components/DonationInfo/DonationInfo.vue
@@ -1,9 +1,7 @@
 <template>
   <div class="donation-info">
     <progress-bar :title="title" :label="label" :goal="goal" :progress="progress" />
-    <a target="_blank" :href="links.DONATE">
-      <base-button filled>{{ $t('donations.donate-now') }}</base-button>
-    </a>
+    <base-button filled @click="redirectToPage(links.DONATE)">{{ $t('donations.donate-now') }}</base-button>
   </div>
 </template>
 
@@ -36,6 +34,11 @@ export default {
       })
     },
   },
+  methods: {
+    redirectToPage(pageParams) {
+      pageParams.redirectToPage(this)
+    },
+  },
   apollo: {
     Donations: {
       query() {
diff --git a/webapp/components/LoginForm/LoginForm.vue b/webapp/components/LoginForm/LoginForm.vue
index d9e218a2b..bd4d6c645 100644
--- a/webapp/components/LoginForm/LoginForm.vue
+++ b/webapp/components/LoginForm/LoginForm.vue
@@ -6,9 +6,9 @@
     </blockquote>
     <base-card>
       <template #imageColumn>
-        <a :href="links.ORGANIZATION.link" :title="$t('login.moreInfo', metadata)" target="_blank">
+        <page-params-link :pageParams="links.ORGANIZATION" :title="$t('login.moreInfo', metadata)">
           <logo logoType="welcome" />
-        </a>
+        </page-params-link>
       </template>
       <h2 class="title">{{ $t('login.login') }}</h2>
       <form :disabled="pending" @submit.prevent="onSubmit">
@@ -54,6 +54,7 @@
 <script>
 import links from '~/constants/links.js'
 import metadata from '~/constants/metadata.js'
+import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
 import ShowPassword from '../ShowPassword/ShowPassword.vue'
@@ -62,6 +63,7 @@ export default {
   components: {
     LocaleSwitch,
     Logo,
+    PageParamsLink,
     ShowPassword,
   },
   data() {
diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
index 9aedaafec..586843b81 100644
--- a/webapp/components/PageFooter/PageFooter.vue
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -2,21 +2,9 @@
   <div id="footer" class="ds-footer">
     <!-- links to internal or external pages -->
     <span v-for="pageParams in links.FOOTER_LINK_LIST" :key="pageParams.name">
-      <nuxt-link
-        v-if="isInternalPage(pageParams)"
-        :to="pageParams.internalLink"
-        :data-test="pageParams.name + '-nuxt-link'"
-      >
+      <page-params-link :pageParams="pageParams">
         {{ $t(pageParams.internalPage.footerIdent) }}
-      </nuxt-link>
-      <a
-        v-else
-        :href="pageParams.externalLink"
-        target="_blank"
-        :data-test="pageParams.name + '-link'"
-      >
-        {{ $t(pageParams.internalPage.footerIdent) }}
-      </a>
+      </page-params-link>
       <span class="division-line">-</span>
     </span>
     <!-- version -->
@@ -32,11 +20,14 @@
 
 <script>
 import links from '~/constants/links.js'
-import { isInternalPage } from '~/components/utils/InternalPages.js'
+import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
 
 export default {
+  components: {
+    PageParamsLink,
+  },
   data() {
-    return { links, isInternalPage, version: `v${this.$env.VERSION}` }
+    return { links, version: `v${this.$env.VERSION}` }
   },
 }
 </script>
diff --git a/webapp/components/PasswordReset/ChangePassword.vue b/webapp/components/PasswordReset/ChangePassword.vue
index 5d1e02acf..e65a7a04f 100644
--- a/webapp/components/PasswordReset/ChangePassword.vue
+++ b/webapp/components/PasswordReset/ChangePassword.vue
@@ -79,7 +79,7 @@ export default {
   data() {
     const passwordForm = PasswordForm({ translate: this.$t })
     return {
-      supportEmail: emails.SUPPORT,
+      supportEmail: emails.SUPPORT_EMAIL,
       formData: {
         ...passwordForm.formData,
       },
diff --git a/webapp/components/Registration/RegistrationSlideCreate.vue b/webapp/components/Registration/RegistrationSlideCreate.vue
index cab0e1cce..35bba6614 100644
--- a/webapp/components/Registration/RegistrationSlideCreate.vue
+++ b/webapp/components/Registration/RegistrationSlideCreate.vue
@@ -142,7 +142,7 @@ export default {
     const passwordForm = PasswordForm({ translate: this.$t })
     return {
       links,
-      supportEmail: emails.SUPPORT,
+      supportEmail: emails.SUPPORT_EMAIL,
       formData: {
         name: '',
         ...passwordForm.formData,
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index b860bf2a2..fc2878c1b 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -2,9 +2,9 @@
   <section class="login-form">
     <base-card>
       <template #imageColumn>
-        <a :href="links.ORGANIZATION.link" :title="$t('login.moreInfo', metadata)" target="_blank">
+        <page-params-link :pageParams="links.ORGANIZATION" :title="$t('login.moreInfo', metadata)">
           <logo logoType="signup" />
-        </a>
+        </page-params-link>
       </template>
 
       <component-slider :sliderData="sliderData">
@@ -48,6 +48,7 @@ import metadata from '~/constants/metadata.js'
 import ComponentSlider from '~/components/ComponentSlider/ComponentSlider'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
+import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
 import RegistrationSlideCreate from './RegistrationSlideCreate'
 import RegistrationSlideEmail from './RegistrationSlideEmail'
 import RegistrationSlideInvite from './RegistrationSlideInvite'
@@ -60,6 +61,7 @@ export default {
     ComponentSlider,
     LocaleSwitch,
     Logo,
+    PageParamsLink,
     RegistrationSlideCreate,
     RegistrationSlideEmail,
     RegistrationSlideInvite,
diff --git a/webapp/components/_new/features/InternalPage/InternalPage.vue b/webapp/components/_new/features/InternalPage/InternalPage.vue
index 397baeeb1..b7d6ecf2e 100644
--- a/webapp/components/_new/features/InternalPage/InternalPage.vue
+++ b/webapp/components/_new/features/InternalPage/InternalPage.vue
@@ -4,9 +4,7 @@
       <ds-heading v-if="pageParams.internalPage.headlineIdent !== null" tag="h2">
         {{
           $t(
-            pageParams.internalPage.headlineIdent === ''
-              ? pageParams.internalPage.defaultHeadlineIdent
-              : pageParams.internalPage.headlineIdent,
+            pageParams.internalPage.headlineIdent,
           )
         }}
       </ds-heading>
diff --git a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
new file mode 100644
index 000000000..c98a0cbc8
--- /dev/null
+++ b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
@@ -0,0 +1,26 @@
+<template>
+  <nuxt-link
+    v-if="pageParams.isInternalPage"
+    :to="pageParams.internalPage.pageRoute"
+    :data-test="pageParams.name + '-nuxt-link'"
+  >
+    <slot />
+  </nuxt-link>
+  <a
+    v-else
+    :href="pageParams.externalLink"
+    target="_blank"
+    :data-test="pageParams.name + '-link'"
+  >
+    <slot />
+  </a>
+</template>
+
+<script>
+export default {
+  name: 'PageParamsLink',
+  props: {
+    pageParams: { type: Object, required: true },
+  },
+}
+</script>
diff --git a/webapp/components/utils/InternalPages.js b/webapp/components/utils/InternalPages.js
index 419578e1d..499627f4a 100644
--- a/webapp/components/utils/InternalPages.js
+++ b/webapp/components/utils/InternalPages.js
@@ -1,35 +1,42 @@
-export function isInternalPage(pageParams) {
-  return noStringDefined(pageParams.externalLink)
-}
-
 function noStringDefined(string) {
   return !string || string === 0
 }
 
-function pageLink(pageParams) {
-  return isInternalPage(pageParams) ? pageParams.internalLink : pageParams.externalLink
-}
-
 class PageParams {
   constructor(pageParams) {
     this.name = pageParams.name
     this.externalLink = pageParams.externalLink
-    this.internalLink = pageParams.internalLink
     this.internalPage = pageParams.internalPage
   }
 
-  assign(assignPageParams) {
+  overwrite(assignPageParams) {
     let pageParams = this
-    pageParams = {
-      ...pageParams,
-      ...assignPageParams,
-      internalPage: { ...pageParams.internalPage, ...assignPageParams.internalPage },
+    if (assignPageParams.name !== undefined) {
+      pageParams.name = assignPageParams.name
+    }
+    if (assignPageParams.externalLink !== undefined) {
+      pageParams.externalLink = assignPageParams.externalLink
+    }
+    if (assignPageParams.internalPage !== undefined) {
+      pageParams.internalPage = { ...pageParams.internalPage, ...assignPageParams.internalPage }
     }
     return pageParams
   }
 
+  get isInternalPage() {
+    return noStringDefined(this.externalLink)
+  }
+
   get link() {
-    return pageLink(this)
+    return this.isInternalPage ? this.internalPage.pageRoute : this.externalLink
+  }
+
+  redirectToPage(thisComponent) {
+    if (this.isInternalPage) {
+      thisComponent.$router.push(this.internalPage.pageRoute)
+    } else {
+      window.location.href = this.externalLink
+    }
   }
 }
 
@@ -39,17 +46,15 @@ export const defaultPageParamsPages = {
 
     externalLink: null, // if string is defined and not empty it's dominating
 
-    // in case internal page content is here 'webapp/locales/html/'
-    internalLink: '/organization', // static, don't change! internal page in case no external is defined
     internalPage: {
+      pageRoute: '/organization', // static, don't change! internal page in case no external is defined
       footerIdent: 'site.made', // localized string identifier
       headTitleIdent: 'site.made', // localized string identifier
       headlineIdent: 'site.made', // localized string identifier. on null it's hidden, on empty string default is used
       hasContainer: true,
       hasBaseCard: true,
       hasLoginInHeader: true,
-
-      defaultHeadlineIdent: 'site.made',
+      // in case internal page content is here 'webapp/locales/html/'
       htmlIdent: 'html.organization',
     },
   }),
@@ -58,17 +63,15 @@ export const defaultPageParamsPages = {
 
     externalLink: null, // if string is defined and not empty it's dominating
 
-    // in case internal page content is here 'webapp/locales/html/'
-    internalLink: '/donate', // static, don't change! internal page in case no external is defined
     internalPage: {
+      pageRoute: '/donate', // static, don't change! internal page in case no external is defined
       footerIdent: 'site.donate', // localized string identifier
       headTitleIdent: 'site.donate', // localized string identifier
       headlineIdent: 'site.donate', // localized string identifier. on null it's hidden, on empty string default is used
       hasContainer: true,
       hasBaseCard: true,
       hasLoginInHeader: true,
-
-      defaultHeadlineIdent: 'site.donate',
+      // in case internal page content is here 'webapp/locales/html/'
       htmlIdent: 'html.donate',
     },
   }),
@@ -77,17 +80,15 @@ export const defaultPageParamsPages = {
 
     externalLink: null, // if string is defined and not empty it's dominating
 
-    // in case internal page content is here 'webapp/locales/html/'
-    internalLink: '/imprint', // static, don't change! internal page in case no external is defined
     internalPage: {
+      pageRoute: '/imprint', // static, don't change! internal page in case no external is defined
       footerIdent: 'site.imprint', // localized string identifier
       headTitleIdent: 'site.imprint', // localized string identifier
       headlineIdent: 'site.imprint', // localized string identifier. on null it's hidden, on empty string default is used
       hasContainer: true,
       hasBaseCard: true,
       hasLoginInHeader: true,
-
-      defaultHeadlineIdent: 'site.imprint',
+      // in case internal page content is here 'webapp/locales/html/'
       htmlIdent: 'html.imprint',
     },
   }),
@@ -96,17 +97,15 @@ export const defaultPageParamsPages = {
 
     externalLink: null, // if string is defined and not empty it's dominating
 
-    // in case internal page content is here 'webapp/locales/html/'
-    internalLink: '/terms-and-conditions', // static, don't change! internal page in case no external is defined
     internalPage: {
+      pageRoute: '/terms-and-conditions', // static, don't change! internal page in case no external is defined
       footerIdent: 'site.termsAndConditions', // localized string identifier
       headTitleIdent: 'site.termsAndConditions', // localized string identifier
       headlineIdent: 'site.termsAndConditions', // localized string identifier. on null it's hidden, on empty string default is used
       hasContainer: true,
       hasBaseCard: true,
       hasLoginInHeader: true,
-
-      defaultHeadlineIdent: 'site.termsAndConditions',
+      // in case internal page content is here 'webapp/locales/html/'
       htmlIdent: 'html.termsAndConditions',
     },
   }),
@@ -115,17 +114,15 @@ export const defaultPageParamsPages = {
 
     externalLink: null, // if string is defined and not empty it's dominating
 
-    // in case internal page content is here 'webapp/locales/html/'
-    internalLink: '/code-of-conduct', // static, don't change! internal page in case no external is defined
     internalPage: {
+      pageRoute: '/code-of-conduct', // static, don't change! internal page in case no external is defined
       footerIdent: 'site.code-of-conduct', // localized string identifier
       headTitleIdent: 'site.code-of-conduct', // localized string identifier
       headlineIdent: 'site.code-of-conduct', // localized string identifier. on null it's hidden, on empty string default is used
       hasContainer: true,
       hasBaseCard: true,
       hasLoginInHeader: true,
-
-      defaultHeadlineIdent: 'site.code-of-conduct',
+      // in case internal page content is here 'webapp/locales/html/'
       htmlIdent: 'html.codeOfConduct',
     },
   }),
@@ -134,17 +131,15 @@ export const defaultPageParamsPages = {
 
     externalLink: null, // if string is defined and not empty it's dominating
 
-    // in case internal page content is here 'webapp/locales/html/'
-    internalLink: '/data-privacy', // static, don't change! internal page in case no external is defined
     internalPage: {
+      pageRoute: '/data-privacy', // static, don't change! internal page in case no external is defined
       footerIdent: 'site.data-privacy', // localized string identifier
       headTitleIdent: 'site.data-privacy', // localized string identifier
       headlineIdent: 'site.data-privacy', // localized string identifier. on null it's hidden, on empty string default is used
       hasContainer: true,
       hasBaseCard: true,
       hasLoginInHeader: true,
-
-      defaultHeadlineIdent: 'site.data-privacy',
+      // in case internal page content is here 'webapp/locales/html/'
       htmlIdent: 'html.dataPrivacy',
     },
   }),
@@ -153,38 +148,32 @@ export const defaultPageParamsPages = {
 
     externalLink: null, // if string is defined and not empty it's dominating
 
-    // in case internal page content is here 'webapp/locales/html/'
-    internalLink: '/faq', // static, don't change! internal page in case no external is defined
     internalPage: {
+      pageRoute: '/faq', // static, don't change! internal page in case no external is defined
       footerIdent: 'site.faq', // localized string identifier
       headTitleIdent: 'site.faq', // localized string identifier
       headlineIdent: 'site.faq', // localized string identifier. on null it's hidden, on empty string default is used
       hasContainer: true,
       hasBaseCard: true,
       hasLoginInHeader: true,
-
-      defaultHeadlineIdent: 'site.faq',
+      // in case internal page content is here 'webapp/locales/html/'
       htmlIdent: 'html.faq',
     },
   }),
   SUPPORT: new PageParams({
     name: 'support',
 
-    // ATTENTION: has to be defined even for internal page with full URL as example like 'https://staging.ocelot.social/support', because it is used in e-mails as well!
-    externalLink: 'https://ocelot.social',
+    externalLink: null,
 
-    // in case internal page content is here 'webapp/locales/html/'
-    // ATTENTION: example for internal support page: 'https://staging.ocelot.social/support'. set a full URL please, because it is used in e-mails as well!
-    internalLink: '/support', // static, don't change '*/support'! internal page in case no external is defined
     internalPage: {
+      pageRoute: '/support', // static, don't change '*/support'! internal page in case no external is defined
       footerIdent: 'site.support', // localized string identifier
       headTitleIdent: 'site.support', // localized string identifier
       headlineIdent: 'site.support', // localized string identifier. on null it's hidden, on empty string default is used
       hasContainer: true,
       hasBaseCard: true,
       hasLoginInHeader: true,
-
-      defaultHeadlineIdent: 'site.support',
+      // in case internal page content is here 'webapp/locales/html/'
       htmlIdent: 'html.support',
     },
   }),
diff --git a/webapp/constants/emails.js b/webapp/constants/emails.js
index b7d188c67..34daaecb0 100644
--- a/webapp/constants/emails.js
+++ b/webapp/constants/emails.js
@@ -1,4 +1,8 @@
+// this file is duplicated in `backend/src/config/` and `webapp/constants/` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
 export default {
-  SUPPORT: 'devops@ocelot.social',
-  MODERATION: 'devops@ocelot.social',
+  SUPPORT_EMAIL: 'devops@ocelot.social',
+  MODERATION_EMAIL: 'devops@ocelot.social',
+  // ATTENTION: the following links have to be defined even for internal pages with full URLs as example like 'https://staging.ocelot.social/support', because they are used in e-mails!
+  ORGANIZATION_LINK: 'https://ocelot.social',
+  SUPPORT_LINK: 'https://ocelot.social',
 }
diff --git a/webapp/constants/links.js b/webapp/constants/links.js
index a26a0d52e..e9015386e 100644
--- a/webapp/constants/links.js
+++ b/webapp/constants/links.js
@@ -1,119 +1,113 @@
-// this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
+// this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/constants/
 
 import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
 
-const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.assign({
-  // Wolle externalLink: 'https://ocelot.social',
-  //
-  externalLink: null, // if string is defined and not empty it's dominating
+const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
+  // Wolle externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
 
-  // in case internal page content is here 'webapp/locales/html/'
   internalPage: {
-    footerIdent: 'site.made', // localized string identifier
-    headTitleIdent: 'site.made', // localized string identifier
-    // Wolle headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
-    headlineIdent: null, // localized string identifier. on null it's hidden, on empty string default is used
+    // 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
+    // Wolle
+    headlineIdent: null, // localized string identifier, on null it's hidden, if undefined default is used
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
-const DONATE = defaultPageParamsPages.DONATE.assign({
-  // Wolle externalLink: 'https://ocelot-social.herokuapp.com/donations', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-  externalLink: '', // if string is defined and not empty it's dominating
+const DONATE = defaultPageParamsPages.DONATE.overwrite({
+  // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
+  // Wolle externalLink: 'https://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating
 
-  // in case internal page content is here 'webapp/locales/html/'
   internalPage: {
-    footerIdent: 'site.donate', // localized string identifier
-    headTitleIdent: 'site.donate', // localized string identifier
-    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    // 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
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
-const IMPRINT = defaultPageParamsPages.IMPRINT.assign({
-  // Wolle externalLink: 'https://ocelot-social.herokuapp.com/imprint', // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
-  externalLink: '', // if string is defined and not empty it's dominating
+const IMPRINT = defaultPageParamsPages.IMPRINT.overwrite({
+  // we use 'ocelot-social.herokuapp.com' at the moment, because redirections of 'ocelot.social' subpages are not working correctly
+  // Wolle externalLink: 'https://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating
 
-  // in case internal page content is here 'webapp/locales/html/'
   internalPage: {
-    footerIdent: 'site.imprint', // localized string identifier
-    headTitleIdent: 'site.imprint', // localized string identifier
-    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    // 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
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
-const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.assign({
-  externalLink: null, // if string is defined and not empty it's dominating
+const TERMS_AND_CONDITIONS = defaultPageParamsPages.TERMS_AND_CONDITIONS.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
 
-  // in case internal page content is here 'webapp/locales/html/'
   internalPage: {
-    footerIdent: 'site.termsAndConditions', // localized string identifier
-    headTitleIdent: 'site.termsAndConditions', // localized string identifier
-    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    // footerIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.termsAndConditions', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.termsAndConditions', // localized string identifier, on null it's hidden, if undefined default is used
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
-const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.assign({
-  externalLink: null, // if string is defined and not empty it's dominating
+const CODE_OF_CONDUCT = defaultPageParamsPages.CODE_OF_CONDUCT.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
 
-  // in case internal page content is here 'webapp/locales/html/'
   internalPage: {
-    footerIdent: 'site.code-of-conduct', // localized string identifier
-    headTitleIdent: 'site.code-of-conduct', // localized string identifier
-    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    // footerIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.code-of-conduct', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.code-of-conduct', // localized string identifier, on null it's hidden, if undefined default is used
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
-const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.assign({
-  externalLink: null, // if string is defined and not empty it's dominating
+const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
+  // externalLink: null, // if string is defined and not empty it's dominating
 
-  // in case internal page content is here 'webapp/locales/html/'
   internalPage: {
-    footerIdent: 'site.data-privacy', // localized string identifier
-    headTitleIdent: 'site.data-privacy', // localized string identifier
-    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    // footerIdent: 'site.data-privacy', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.data-privacy', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.data-privacy', // localized string identifier, on null it's hidden, if undefined default is used
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
-const FAQ = defaultPageParamsPages.FAQ.assign({
-  // Wolle externalLink: 'https://ocelot.social',
-  externalLink: null, // if string is defined and not empty it's dominating
+const FAQ = defaultPageParamsPages.FAQ.overwrite({
+  // Wolle externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
 
-  // in case internal page content is here 'webapp/locales/html/'
   internalPage: {
-    footerIdent: 'site.faq', // localized string identifier
-    headTitleIdent: 'site.faq', // localized string identifier
-    // Wolle headlineIdent: '', // on null default is used, on empty string it's hidden
-    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    // footerIdent: 'site.faq', // localized string identifier, if undefined default is used
+    // headTitleIdent: 'site.faq', // localized string identifier, if undefined default is used
+    // headlineIdent: 'site.faq', // on null default is used, on empty string it's hidden
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
-const SUPPORT = defaultPageParamsPages.SUPPORT.assign({
-  // ATTENTION: has to be defined even for internal page with full URL as example like 'https://staging.ocelot.social/support', because it is used in e-mails as well!
-  // Wolle externalLink: 'https://ocelot.social',
-  externalLink: 'http://localhost:3000/support', // if string is defined and not empty it's dominating
+const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
+  // Wolle externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
 
-  // in case internal page content is here 'webapp/locales/html/'
   internalPage: {
-    footerIdent: 'site.support', // localized string identifier
-    headTitleIdent: 'site.support', // localized string identifier
-    // Wolle headlineIdent: '', // on null default is used, on empty string it's hidden
-    headlineIdent: '', // localized string identifier. on null it's hidden, on empty string default is used
+    // 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
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
+    // in case internal page content is here 'webapp/locales/html/'
   },
 })
 
diff --git a/webapp/locales/html/de/organization.html b/webapp/locales/html/de/organization.html
index 2ffdd90b5..9d1abcbc1 100644
--- a/webapp/locales/html/de/organization.html
+++ b/webapp/locales/html/de/organization.html
@@ -1,29 +1,15 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<!-- <br> -->
-<!-- <h1 class="h3-headline-big">
-  sender.fm
-</h1> -->
-<!-- <img class="logo" alt="ocelot.social Header" src="/img/custom/logo-horizontal.svg" style="width: 360px;"><br> -->
-<!-- <p class="paragraph">
-  Hier wird sender.fm in Zukunft vorgestellt …
-</p> -->
-<!-- <p class="link">
-  <a href="/login" target="_blank">
-    Zum Login …
-  </a><br>
-</p>
-<br> -->
 <h1 class="h1-headline">
-  Unser Radio-Stream
+  Press Play
 </h1>
 <br>
 <!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
 <iframe class="player" id="embed_player" frameborder="0" width="510px" height="396px" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
 <br>
 <h3 class="h3-headline">
-  Sende-Wochenplan
+  Sendeplan
 </h3>
 <iframe class="weekly-plan" height="802px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
 <br>
diff --git a/webapp/locales/html/en/organization.html b/webapp/locales/html/en/organization.html
index 61172ba8e..174a269a6 100644
--- a/webapp/locales/html/en/organization.html
+++ b/webapp/locales/html/en/organization.html
@@ -1,29 +1,15 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<!-- <br> -->
-<!-- <h1 class="h3-headline-big">
-  sender.fm
-</h1> -->
-<!-- <img class="logo" alt="ocelot.social Header" src="/img/custom/logo-horizontal.svg" style="width: 360px;"><br> -->
-<!-- <p class="paragraph">
-  Here sender.fm will be described in the future …
-</p> -->
-<!-- <p class="link">
-  <a href="/login" target="_blank">
-    Login …
-  </a><br>
-</p>
-<br> -->
 <h1 class="h1-headline">
-  Our Radio Stream
+  Press Play
 </h1>
 <br>
 <!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
 <iframe class="player" id="embed_player" frameborder="0" width="510px" height="396px" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
 <br>
 <h3 class="h3-headline">
-  Radio Weekly Plan
+  Broadcast Schedule
 </h3>
 <iframe class="weekly-plan" height="802px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
 <br>
diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue
index 2e2cdfe3b..a9b29ccdd 100644
--- a/webapp/maintenance/source/pages/index.vue
+++ b/webapp/maintenance/source/pages/index.vue
@@ -8,9 +8,11 @@
         <ds-flex>
           <ds-flex-item :width="{ base: '100%', sm: 1, md: 1 }">
             <ds-space>
-              <a :href="links.ORGANIZATION" :title="$t('login.moreInfo', metadata)" target="_blank">
+              <!-- Wolle -->
+              <a v-if="!links.ORGANIZATION.isInternalPage" :href="links.ORGANIZATION.link" :title="$t('login.moreInfo', metadata)" target="_blank">
                 <img class="image" alt="Under maintenance" src="/img/custom/logo-squared.svg" />
               </a>
+              <img v-else class="image" alt="Under maintenance" src="/img/custom/logo-squared.svg" :title="$t('login.moreInfo', metadata)" />
             </ds-space>
           </ds-flex-item>
           <ds-flex-item :width="{ base: '100%', sm: 1, md: 1 }">
@@ -45,7 +47,7 @@ export default {
     LocaleSwitch,
   },
   data() {
-    return { links, metadata, supportEmail: emails.SUPPORT }
+    return { links, metadata, supportEmail: emails.SUPPORT_EMAIL }
   },
 }
 </script>
diff --git a/webapp/pages/donate.vue b/webapp/pages/donate.vue
index 480242193..27fe06b13 100644
--- a/webapp/pages/donate.vue
+++ b/webapp/pages/donate.vue
@@ -14,5 +14,10 @@ export default {
   data() {
     return { links }
   },
+  created() {
+    if (!this.links.DONATE.isInternalPage) {
+      window.location.href = this.links.DONATE.externalLink
+    }
+  },
 }
 </script>
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index d23582ad7..f0b5c327c 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -5,11 +5,9 @@
         <hashtags-filter :hashtag="hashtag" @clearSearch="clearSearch" />
       </ds-grid-item>
       <ds-grid-item :row-span="2" column-span="fullWidth" class="top-info-bar">
-        <!--<donation-info /> -->
+        <!-- <donation-info /> -->
         <div>
-          <a target="_blank" :href="links.DONATE">
-            <base-button filled>{{ $t('donations.donate-now') }}</base-button>
-          </a>
+          <base-button filled @click="redirectToPage(links.DONATE)">{{ $t('donations.donate-now') }}</base-button>
         </div>
         <div class="sorting-dropdown">
           <ds-select
@@ -172,6 +170,9 @@ export default {
       this.resetPostList()
       this.$apollo.queries.Post.refetch()
     },
+    redirectToPage(pageParams) {
+      pageParams.redirectToPage(this)
+    },
   },
   apollo: {
     Post: {
diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue
index caa7c3455..6d67c4cae 100644
--- a/webapp/pages/password-reset.vue
+++ b/webapp/pages/password-reset.vue
@@ -2,9 +2,9 @@
   <ds-container width="small" class="password-reset">
     <base-card>
       <template #imageColumn>
-        <a :href="links.ORGANIZATION" :title="$t('login.moreInfo', metadata)" target="_blank">
+        <page-params-link :pageParams="links.ORGANIZATION" :title="$t('login.moreInfo', metadata)">
           <logo logoType="passwordReset" />
-        </a>
+        </page-params-link>
       </template>
       <nuxt-child />
       <template #topMenu>
@@ -19,11 +19,13 @@ import links from '~/constants/links.js'
 import metadata from '~/constants/metadata.js'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import Logo from '~/components/Logo/Logo'
+import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
 
 export default {
   components: {
     LocaleSwitch,
     Logo,
+    PageParamsLink,
   },
   layout: 'no-header',
   data() {
diff --git a/webapp/pages/post/_id/_slug/index.vue b/webapp/pages/post/_id/_slug/index.vue
index 18bcfe343..b1ca870d7 100644
--- a/webapp/pages/post/_id/_slug/index.vue
+++ b/webapp/pages/post/_id/_slug/index.vue
@@ -80,7 +80,9 @@
           {{ $t('settings.blocked-users.explanation.commenting-disabled') }}
           <br />
           {{ $t('settings.blocked-users.explanation.commenting-explanation') }}
-          <a :href="links.FAQ" target="_blank">FAQ</a>
+          <page-params-link :pageParams="links.FAQ">
+            {{ $t('site.faq') }}
+          </page-params-link>
         </ds-placeholder>
       </ds-section>
     </base-card>
@@ -95,6 +97,7 @@ import UserTeaser from '~/components/UserTeaser/UserTeaser'
 import HcShoutButton from '~/components/ShoutButton.vue'
 import CommentForm from '~/components/CommentForm/CommentForm'
 import CommentList from '~/components/CommentList/CommentList'
+import PageParamsLink from '~/components/_new/features/PageParamsLink/PageParamsLink.vue'
 import {
   postMenuModalsData,
   deletePostMutation,
@@ -111,13 +114,14 @@ export default {
     mode: 'out-in',
   },
   components: {
-    HcHashtag,
-    UserTeaser,
-    HcShoutButton,
     ContentMenu,
     CommentForm,
     CommentList,
     ContentViewer,
+    HcHashtag,
+    HcShoutButton,
+    PageParamsLink,
+    UserTeaser,
   },
   head() {
     return {
diff --git a/webapp/pages/settings/my-email-address/verify.vue b/webapp/pages/settings/my-email-address/verify.vue
index 26f435182..cfab25f0a 100644
--- a/webapp/pages/settings/my-email-address/verify.vue
+++ b/webapp/pages/settings/my-email-address/verify.vue
@@ -60,7 +60,7 @@ export default {
   },
   data() {
     return {
-      supportEmail: emails.SUPPORT,
+      supportEmail: emails.SUPPORT_EMAIL,
     }
   },
   async asyncData(context) {

From b7018ffefbb6ed083eb825535708481e0e25e083 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 Aug 2021 16:05:55 +0200
Subject: [PATCH 14/31] Implement mixins in internal pages

---
 webapp/mixins/internalPageMixins.js   | 19 +++++++++++++++++++
 webapp/pages/code-of-conduct.vue      | 12 +++---------
 webapp/pages/data-privacy.vue         | 12 +++---------
 webapp/pages/donate.vue               | 17 +++--------------
 webapp/pages/faq.vue                  | 12 +++---------
 webapp/pages/imprint.vue              | 12 +++---------
 webapp/pages/organization.vue         | 12 +++---------
 webapp/pages/support.vue              | 12 +++---------
 webapp/pages/terms-and-conditions.vue | 12 +++---------
 9 files changed, 43 insertions(+), 77 deletions(-)
 create mode 100644 webapp/mixins/internalPageMixins.js

diff --git a/webapp/mixins/internalPageMixins.js b/webapp/mixins/internalPageMixins.js
new file mode 100644
index 000000000..7c1a58f1d
--- /dev/null
+++ b/webapp/mixins/internalPageMixins.js
@@ -0,0 +1,19 @@
+
+import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+
+export function internalPageMixins(pageParams) {
+  return {
+    layout: 'basic',
+    components: {
+      InternalPage,
+    },
+    data() {
+      return { pageParams }
+    },
+    created() {
+      if (!this.pageParams.isInternalPage) {
+        window.location.href = this.pageParams.externalLink
+      }
+    },
+  }
+}
diff --git a/webapp/pages/code-of-conduct.vue b/webapp/pages/code-of-conduct.vue
index 4bcf87cee..3a3275c39 100644
--- a/webapp/pages/code-of-conduct.vue
+++ b/webapp/pages/code-of-conduct.vue
@@ -1,18 +1,12 @@
 <template>
-  <internal-page :pageParams="links.CODE_OF_CONDUCT" />
+  <internal-page :pageParams="pageParams" />
 </template>
 
 <script>
 import links from '~/constants/links.js'
-import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+import { internalPageMixins } from '~/mixins/internalPageMixins'
 
 export default {
-  layout: 'basic',
-  components: {
-    InternalPage,
-  },
-  data() {
-    return { links }
-  },
+  mixins: [internalPageMixins(links.CODE_OF_CONDUCT)],
 }
 </script>
diff --git a/webapp/pages/data-privacy.vue b/webapp/pages/data-privacy.vue
index b8416785b..31f86c9b8 100644
--- a/webapp/pages/data-privacy.vue
+++ b/webapp/pages/data-privacy.vue
@@ -1,18 +1,12 @@
 <template>
-  <internal-page :pageParams="links.DATA_PRIVACY" />
+  <internal-page :pageParams="pageParams" />
 </template>
 
 <script>
 import links from '~/constants/links.js'
-import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+import { internalPageMixins } from '~/mixins/internalPageMixins'
 
 export default {
-  layout: 'basic',
-  components: {
-    InternalPage,
-  },
-  data() {
-    return { links }
-  },
+  mixins: [internalPageMixins(links.DATA_PRIVACY)],
 }
 </script>
diff --git a/webapp/pages/donate.vue b/webapp/pages/donate.vue
index 27fe06b13..aac73695f 100644
--- a/webapp/pages/donate.vue
+++ b/webapp/pages/donate.vue
@@ -1,23 +1,12 @@
 <template>
-  <internal-page :pageParams="links.DONATE" />
+  <internal-page :pageParams="pageParams" />
 </template>
 
 <script>
 import links from '~/constants/links.js'
-import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+import { internalPageMixins } from '~/mixins/internalPageMixins'
 
 export default {
-  layout: 'basic',
-  components: {
-    InternalPage,
-  },
-  data() {
-    return { links }
-  },
-  created() {
-    if (!this.links.DONATE.isInternalPage) {
-      window.location.href = this.links.DONATE.externalLink
-    }
-  },
+  mixins: [internalPageMixins(links.DONATE)],
 }
 </script>
diff --git a/webapp/pages/faq.vue b/webapp/pages/faq.vue
index 0ffbcdea9..ec0ee8eda 100644
--- a/webapp/pages/faq.vue
+++ b/webapp/pages/faq.vue
@@ -1,18 +1,12 @@
 <template>
-  <internal-page :pageParams="links.FAQ" />
+  <internal-page :pageParams="pageParams" />
 </template>
 
 <script>
 import links from '~/constants/links.js'
-import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+import { internalPageMixins } from '~/mixins/internalPageMixins'
 
 export default {
-  layout: 'basic',
-  components: {
-    InternalPage,
-  },
-  data() {
-    return { links }
-  },
+  mixins: [internalPageMixins(links.FAQ)],
 }
 </script>
diff --git a/webapp/pages/imprint.vue b/webapp/pages/imprint.vue
index 6902b7c3e..3c5fea10e 100644
--- a/webapp/pages/imprint.vue
+++ b/webapp/pages/imprint.vue
@@ -1,18 +1,12 @@
 <template>
-  <internal-page :pageParams="links.IMPRINT" />
+  <internal-page :pageParams="pageParams" />
 </template>
 
 <script>
 import links from '~/constants/links.js'
-import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+import { internalPageMixins } from '~/mixins/internalPageMixins'
 
 export default {
-  layout: 'basic',
-  components: {
-    InternalPage,
-  },
-  data() {
-    return { links }
-  },
+  mixins: [internalPageMixins(links.IMPRINT)],
 }
 </script>
diff --git a/webapp/pages/organization.vue b/webapp/pages/organization.vue
index 4e6610931..7f6f3abd6 100644
--- a/webapp/pages/organization.vue
+++ b/webapp/pages/organization.vue
@@ -1,18 +1,12 @@
 <template>
-  <internal-page :pageParams="links.ORGANIZATION" />
+  <internal-page :pageParams="pageParams" />
 </template>
 
 <script>
 import links from '~/constants/links.js'
-import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+import { internalPageMixins } from '~/mixins/internalPageMixins'
 
 export default {
-  layout: 'basic',
-  components: {
-    InternalPage,
-  },
-  data() {
-    return { links }
-  },
+  mixins: [internalPageMixins(links.ORGANIZATION)],
 }
 </script>
diff --git a/webapp/pages/support.vue b/webapp/pages/support.vue
index 092515465..e157693c7 100644
--- a/webapp/pages/support.vue
+++ b/webapp/pages/support.vue
@@ -1,18 +1,12 @@
 <template>
-  <internal-page :pageParams="links.SUPPORT" />
+  <internal-page :pageParams="pageParams" />
 </template>
 
 <script>
 import links from '~/constants/links.js'
-import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+import { internalPageMixins } from '~/mixins/internalPageMixins'
 
 export default {
-  layout: 'basic',
-  components: {
-    InternalPage,
-  },
-  data() {
-    return { links }
-  },
+  mixins: [internalPageMixins(links.SUPPORT)],
 }
 </script>
diff --git a/webapp/pages/terms-and-conditions.vue b/webapp/pages/terms-and-conditions.vue
index 18796afa0..341de62db 100644
--- a/webapp/pages/terms-and-conditions.vue
+++ b/webapp/pages/terms-and-conditions.vue
@@ -1,18 +1,12 @@
 <template>
-  <internal-page :pageParams="links.TERMS_AND_CONDITIONS" />
+  <internal-page :pageParams="pageParams" />
 </template>
 
 <script>
 import links from '~/constants/links.js'
-import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
+import { internalPageMixins } from '~/mixins/internalPageMixins'
 
 export default {
-  layout: 'basic',
-  components: {
-    InternalPage,
-  },
-  data() {
-    return { links }
-  },
+  mixins: [internalPageMixins(links.TERMS_AND_CONDITIONS)],
 }
 </script>

From b848aeb579ca8ba0312a1ba0b7fafab02cdd68d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 Aug 2021 16:22:57 +0200
Subject: [PATCH 15/31] Fix tests by using toBeTruthy() instead of toBe(true)

---
 webapp/pages/code-of-conduct.spec.js      | 2 +-
 webapp/pages/data-privacy.spec.js         | 2 +-
 webapp/pages/donate.spec.js               | 2 +-
 webapp/pages/faq.spec.js                  | 2 +-
 webapp/pages/imprint.spec.js              | 2 +-
 webapp/pages/organization.spec.js         | 2 +-
 webapp/pages/support.spec.js              | 2 +-
 webapp/pages/terms-and-conditions.spec.js | 2 +-
 8 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/webapp/pages/code-of-conduct.spec.js b/webapp/pages/code-of-conduct.spec.js
index 75e244c79..6d70d3a67 100644
--- a/webapp/pages/code-of-conduct.spec.js
+++ b/webapp/pages/code-of-conduct.spec.js
@@ -28,7 +28,7 @@ describe('code-of-conduct.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.is('div')).toBeTruthy()
     })
 
     it('has correct <head> content', () => {
diff --git a/webapp/pages/data-privacy.spec.js b/webapp/pages/data-privacy.spec.js
index a919bb742..3e891ad43 100644
--- a/webapp/pages/data-privacy.spec.js
+++ b/webapp/pages/data-privacy.spec.js
@@ -28,7 +28,7 @@ describe('data-privacy.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.is('div')).toBeTruthy()
     })
 
     it('has correct <head> content', () => {
diff --git a/webapp/pages/donate.spec.js b/webapp/pages/donate.spec.js
index 2fae9d67a..5407e3386 100644
--- a/webapp/pages/donate.spec.js
+++ b/webapp/pages/donate.spec.js
@@ -28,7 +28,7 @@ describe('donate.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.is('div')).toBeTruthy()
     })
 
     it('has correct <head> content', () => {
diff --git a/webapp/pages/faq.spec.js b/webapp/pages/faq.spec.js
index bb68a3638..7ab5a68ed 100644
--- a/webapp/pages/faq.spec.js
+++ b/webapp/pages/faq.spec.js
@@ -28,7 +28,7 @@ describe('faq.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.is('div')).toBeTruthy()
     })
 
     it('has correct <head> content', () => {
diff --git a/webapp/pages/imprint.spec.js b/webapp/pages/imprint.spec.js
index 1a84b5794..96c37db15 100644
--- a/webapp/pages/imprint.spec.js
+++ b/webapp/pages/imprint.spec.js
@@ -28,7 +28,7 @@ describe('imprint.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.is('div')).toBeTruthy()
     })
 
     it('has correct <head> content', () => {
diff --git a/webapp/pages/organization.spec.js b/webapp/pages/organization.spec.js
index 05322f580..c9d492225 100644
--- a/webapp/pages/organization.spec.js
+++ b/webapp/pages/organization.spec.js
@@ -28,7 +28,7 @@ describe('organization.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.is('div')).toBeTruthy()
     })
 
     it('has correct <head> content', () => {
diff --git a/webapp/pages/support.spec.js b/webapp/pages/support.spec.js
index 43c9debd6..fd55e7d00 100644
--- a/webapp/pages/support.spec.js
+++ b/webapp/pages/support.spec.js
@@ -28,7 +28,7 @@ describe('support.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.is('div')).toBeTruthy()
     })
 
     it('has correct <head> content', () => {
diff --git a/webapp/pages/terms-and-conditions.spec.js b/webapp/pages/terms-and-conditions.spec.js
index d6ae6dce7..cc93d8d37 100644
--- a/webapp/pages/terms-and-conditions.spec.js
+++ b/webapp/pages/terms-and-conditions.spec.js
@@ -28,7 +28,7 @@ describe('terms-and-conditions.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.is('div')).toBe(true)
+      expect(wrapper.is('div')).toBeTruthy()
     })
 
     it('has correct <head> content', () => {

From 37cb8a2afbf55bd73c4ed46c03eb1ec0db427f8c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 Aug 2021 16:24:50 +0200
Subject: [PATCH 16/31] Fix linting

---
 webapp/components/DonationInfo/DonationInfo.vue   |  4 +++-
 .../_new/features/InternalPage/InternalPage.vue   |  6 +-----
 .../features/PageParamsLink/PageParamsLink.vue    |  7 +------
 webapp/components/utils/InternalPages.js          |  2 +-
 webapp/maintenance/source/pages/index.vue         | 15 +++++++++++++--
 webapp/mixins/internalPageMixins.js               |  1 -
 webapp/pages/index.vue                            |  4 +++-
 7 files changed, 22 insertions(+), 17 deletions(-)

diff --git a/webapp/components/DonationInfo/DonationInfo.vue b/webapp/components/DonationInfo/DonationInfo.vue
index 27807a20c..c6db40bc8 100644
--- a/webapp/components/DonationInfo/DonationInfo.vue
+++ b/webapp/components/DonationInfo/DonationInfo.vue
@@ -1,7 +1,9 @@
 <template>
   <div class="donation-info">
     <progress-bar :title="title" :label="label" :goal="goal" :progress="progress" />
-    <base-button filled @click="redirectToPage(links.DONATE)">{{ $t('donations.donate-now') }}</base-button>
+    <base-button filled @click="redirectToPage(links.DONATE)">
+      {{ $t('donations.donate-now') }}
+    </base-button>
   </div>
 </template>
 
diff --git a/webapp/components/_new/features/InternalPage/InternalPage.vue b/webapp/components/_new/features/InternalPage/InternalPage.vue
index b7d6ecf2e..0c1d8d633 100644
--- a/webapp/components/_new/features/InternalPage/InternalPage.vue
+++ b/webapp/components/_new/features/InternalPage/InternalPage.vue
@@ -2,11 +2,7 @@
   <div>
     <ds-space margin="small">
       <ds-heading v-if="pageParams.internalPage.headlineIdent !== null" tag="h2">
-        {{
-          $t(
-            pageParams.internalPage.headlineIdent,
-          )
-        }}
+        {{ $t(pageParams.internalPage.headlineIdent) }}
       </ds-heading>
     </ds-space>
     <ds-container v-if="pageParams.internalPage.hasContainer">
diff --git a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
index c98a0cbc8..ae01dd319 100644
--- a/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
+++ b/webapp/components/_new/features/PageParamsLink/PageParamsLink.vue
@@ -6,12 +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="_blank" :data-test="pageParams.name + '-link'">
     <slot />
   </a>
 </template>
diff --git a/webapp/components/utils/InternalPages.js b/webapp/components/utils/InternalPages.js
index 499627f4a..2f8d49ad8 100644
--- a/webapp/components/utils/InternalPages.js
+++ b/webapp/components/utils/InternalPages.js
@@ -10,7 +10,7 @@ class PageParams {
   }
 
   overwrite(assignPageParams) {
-    let pageParams = this
+    const pageParams = this
     if (assignPageParams.name !== undefined) {
       pageParams.name = assignPageParams.name
     }
diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue
index a9b29ccdd..3ad264c43 100644
--- a/webapp/maintenance/source/pages/index.vue
+++ b/webapp/maintenance/source/pages/index.vue
@@ -9,10 +9,21 @@
           <ds-flex-item :width="{ base: '100%', sm: 1, md: 1 }">
             <ds-space>
               <!-- Wolle -->
-              <a v-if="!links.ORGANIZATION.isInternalPage" :href="links.ORGANIZATION.link" :title="$t('login.moreInfo', metadata)" target="_blank">
+              <a
+                v-if="!links.ORGANIZATION.isInternalPage"
+                :href="links.ORGANIZATION.link"
+                :title="$t('login.moreInfo', metadata)"
+                target="_blank"
+              >
                 <img class="image" alt="Under maintenance" src="/img/custom/logo-squared.svg" />
               </a>
-              <img v-else class="image" alt="Under maintenance" src="/img/custom/logo-squared.svg" :title="$t('login.moreInfo', metadata)" />
+              <img
+                v-else
+                class="image"
+                alt="Under maintenance"
+                src="/img/custom/logo-squared.svg"
+                :title="$t('login.moreInfo', metadata)"
+              />
             </ds-space>
           </ds-flex-item>
           <ds-flex-item :width="{ base: '100%', sm: 1, md: 1 }">
diff --git a/webapp/mixins/internalPageMixins.js b/webapp/mixins/internalPageMixins.js
index 7c1a58f1d..b5ffe62d4 100644
--- a/webapp/mixins/internalPageMixins.js
+++ b/webapp/mixins/internalPageMixins.js
@@ -1,4 +1,3 @@
-
 import InternalPage from '~/components/_new/features/InternalPage/InternalPage.vue'
 
 export function internalPageMixins(pageParams) {
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index f0b5c327c..306ff49f1 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -7,7 +7,9 @@
       <ds-grid-item :row-span="2" column-span="fullWidth" class="top-info-bar">
         <!-- <donation-info /> -->
         <div>
-          <base-button filled @click="redirectToPage(links.DONATE)">{{ $t('donations.donate-now') }}</base-button>
+          <base-button filled @click="redirectToPage(links.DONATE)">
+            {{ $t('donations.donate-now') }}
+          </base-button>
         </div>
         <div class="sorting-dropdown">
           <ds-select

From 4fccb6e78861ce539b08a282370ba3e5c09223c9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 Aug 2021 16:32:00 +0200
Subject: [PATCH 17/31] Remove tryout data

---
 webapp/constants/links.js                | 15 ++---
 webapp/locales/html/de/organization.html | 70 +-----------------------
 webapp/locales/html/en/organization.html | 70 +-----------------------
 3 files changed, 8 insertions(+), 147 deletions(-)

diff --git a/webapp/constants/links.js b/webapp/constants/links.js
index e9015386e..16d3d085f 100644
--- a/webapp/constants/links.js
+++ b/webapp/constants/links.js
@@ -3,14 +3,12 @@
 import { defaultPageParamsPages } from '~/components/utils/InternalPages.js'
 
 const ORGANIZATION = defaultPageParamsPages.ORGANIZATION.overwrite({
-  // Wolle externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
+  externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
 
   internalPage: {
     // 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
-    // Wolle
-    headlineIdent: null, // localized string identifier, on null it's hidden, if undefined default is used
     hasContainer: true,
     hasBaseCard: true,
     hasLoginInHeader: true,
@@ -19,7 +17,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
-  // Wolle externalLink: 'https://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating
+  externalLink: 'https://ocelot-social.herokuapp.com/donations', // if string is defined and not empty it's dominating
 
   internalPage: {
     // footerIdent: 'site.donate', // localized string identifier, if undefined default is used
@@ -33,7 +31,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
-  // Wolle externalLink: 'https://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating
+  externalLink: 'https://ocelot-social.herokuapp.com/imprint', // if string is defined and not empty it's dominating
 
   internalPage: {
     // footerIdent: 'site.imprint', // localized string identifier, if undefined default is used
@@ -85,7 +83,7 @@ const DATA_PRIVACY = defaultPageParamsPages.DATA_PRIVACY.overwrite({
   },
 })
 const FAQ = defaultPageParamsPages.FAQ.overwrite({
-  // Wolle externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
+  externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
 
   internalPage: {
     // footerIdent: 'site.faq', // localized string identifier, if undefined default is used
@@ -98,7 +96,7 @@ const FAQ = defaultPageParamsPages.FAQ.overwrite({
   },
 })
 const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
-  // Wolle externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
+  externalLink: 'https://ocelot.social', // if string is defined and not empty it's dominating
 
   internalPage: {
     // footerIdent: 'site.support', // localized string identifier, if undefined default is used
@@ -112,8 +110,7 @@ const SUPPORT = defaultPageParamsPages.SUPPORT.overwrite({
 })
 
 export default {
-  // Wolle LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
-  LANDING_PAGE: '/organization', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
+  LANDING_PAGE: '/login', // examples: '/login', '/registration', '/organization', or external 'https://ocelot.social'
 
   // you can find and store templates for 👇🏼 at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/
 
diff --git a/webapp/locales/html/de/organization.html b/webapp/locales/html/de/organization.html
index 9d1abcbc1..547ea95d5 100644
--- a/webapp/locales/html/de/organization.html
+++ b/webapp/locales/html/de/organization.html
@@ -1,72 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<h1 class="h1-headline">
-  Press Play
-</h1>
-<br>
-<!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
-<iframe class="player" id="embed_player" frameborder="0" width="510px" height="396px" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
-<br>
-<h3 class="h3-headline">
-  Sendeplan
-</h3>
-<iframe class="weekly-plan" height="802px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
-<br>
-<br>
-
-<!-- Stream Url:  
-https://senderfm.out.airtime.pro/senderfm_a -->
-
-<style type="text/css">
-  .logo {
-    margin-top: 48px;
-    margin-bottom: 48px;
-  }
-
-  .h1-headline {
-    font-size: 48px;
-    margin-top: 12px;
-    margin-bottom: 8px;
-  }
-
-  .h3-headline-big {
-    font-size: 64px;
-    margin-top: 12px;
-    margin-bottom: 8px;
-  }
-
-  .h3-headline {
-    font-size: 32px;
-    margin-top: 12px;
-    margin-bottom: 8px;
-  }
-
-  .h4-headline {
-    font-size: 18px;
-    margin-top: 12px;
-    margin-bottom: 8px;
-  }
-
-  .paragraph {
-    font-size: 16px;
-    margin-top: 0px;
-    margin-bottom: 8px;
-  }
-
-  .link {
-    margin-top: 4px;
-    margin-bottom: 8px;
-  }
-
-  .player {
-    margin-top: 0px;
-    margin-bottom: 12px;
-  }
-
-  .weekly-plan {
-    margin-top: 0px;
-    margin-bottom: 0px;
-    margin-left: -20px;
-  }
-</style>
+<p>Hier wird das Netzwerk beschrieben.</p>
\ No newline at end of file
diff --git a/webapp/locales/html/en/organization.html b/webapp/locales/html/en/organization.html
index 174a269a6..a63e4c6ff 100644
--- a/webapp/locales/html/en/organization.html
+++ b/webapp/locales/html/en/organization.html
@@ -1,72 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<h1 class="h1-headline">
-  Press Play
-</h1>
-<br>
-<!-- <iframe id="embed_player" frameborder="0" width="280" height="216" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=1"></iframe> -->
-<iframe class="player" id="embed_player" frameborder="0" width="510px" height="396px" src="https://senderfm.airtime.pro/embed/player?stream=s1&skin=2"></iframe>
-<br>
-<h3 class="h3-headline">
-  Broadcast Schedule
-</h3>
-<iframe class="weekly-plan" height="802px" width="550px" scrolling="yes" frameborder="0" src=https://senderfm.airtime.pro/embed/weekly-program></iframe>
-<br>
-<br>
-
-<!-- Stream Url:  
-https://senderfm.out.airtime.pro/senderfm_a -->
-
-<style type="text/css">
-  .logo {
-    margin-top: 48px;
-    margin-bottom: 48px;
-  }
-
-  .h1-headline {
-    font-size: 48px;
-    margin-top: 12px;
-    margin-bottom: 8px;
-  }
-
-  .h3-headline-big {
-    font-size: 64px;
-    margin-top: 12px;
-    margin-bottom: 8px;
-  }
-
-  .h3-headline {
-    font-size: 32px;
-    margin-top: 12px;
-    margin-bottom: 8px;
-  }
-
-  .h4-headline {
-    font-size: 18px;
-    margin-top: 12px;
-    margin-bottom: 8px;
-  }
-
-  .paragraph {
-    font-size: 16px;
-    margin-top: 0px;
-    margin-bottom: 8px;
-  }
-
-  .link {
-    margin-top: 4px;
-    margin-bottom: 8px;
-  }
-
-  .player {
-    margin-top: 0px;
-    margin-bottom: 12px;
-  }
-
-  .weekly-plan {
-    margin-top: 0px;
-    margin-bottom: 0px;
-    margin-left: -20px;
-  }
-</style>
+<p>Here the network is described.</p>
\ No newline at end of file

From e3ea3e1733bb876677e5885fe98bd22aeb7d3bae Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 Aug 2021 16:54:20 +0200
Subject: [PATCH 18/31] Fix error 'window is undefined' that appears sometimes

- Avoid possible errors, because of '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'.
---
 webapp/mixins/internalPageMixins.js | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/webapp/mixins/internalPageMixins.js b/webapp/mixins/internalPageMixins.js
index b5ffe62d4..b2443a263 100644
--- a/webapp/mixins/internalPageMixins.js
+++ b/webapp/mixins/internalPageMixins.js
@@ -11,7 +11,10 @@ export function internalPageMixins(pageParams) {
     },
     created() {
       if (!this.pageParams.isInternalPage) {
-        window.location.href = this.pageParams.externalLink
+        // 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
+        }
       }
     },
   }

From 41252785d261b729944f37c948c278f6da620766 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Thu, 5 Aug 2021 17:57:48 +0200
Subject: [PATCH 19/31] Fix tests

---
 .../DonationInfo/DonationInfo.spec.js         |  6 ---
 .../LoginButton/LoginButton.spec.js           | 22 +++-------
 .../components/PageFooter/PageFooter.spec.js  | 41 ++++++++++---------
 .../features/InternalPage/InternalPage.vue    |  5 ---
 webapp/layouts/basic.spec.js                  |  8 ++++
 webapp/mixins/internalPageMixins.js           |  5 +++
 webapp/pages/code-of-conduct.spec.js          |  5 +++
 webapp/pages/data-privacy.spec.js             |  5 +++
 webapp/pages/donate.spec.js                   |  5 +++
 webapp/pages/faq.spec.js                      |  5 +++
 webapp/pages/imprint.spec.js                  |  5 +++
 webapp/pages/organization.spec.js             |  5 +++
 webapp/pages/support.spec.js                  |  5 +++
 webapp/pages/terms-and-conditions.spec.js     |  5 +++
 14 files changed, 79 insertions(+), 48 deletions(-)

diff --git a/webapp/components/DonationInfo/DonationInfo.spec.js b/webapp/components/DonationInfo/DonationInfo.spec.js
index 8d20042b0..5b4e95435 100644
--- a/webapp/components/DonationInfo/DonationInfo.spec.js
+++ b/webapp/components/DonationInfo/DonationInfo.spec.js
@@ -21,12 +21,6 @@ describe('DonationInfo.vue', () => {
 
   const Wrapper = () => mount(DonationInfo, { mocks, localVue })
 
-  it('includes a link to the ocelot.social donations website', () => {
-    expect(Wrapper().find('a').attributes('href')).toBe(
-      'https://ocelot-social.herokuapp.com/donations',
-    )
-  })
-
   it('displays a call to action button', () => {
     expect(Wrapper().find('.base-button').text()).toBe('donations.donate-now')
   })
diff --git a/webapp/components/LoginButton/LoginButton.spec.js b/webapp/components/LoginButton/LoginButton.spec.js
index f28045612..62e663714 100644
--- a/webapp/components/LoginButton/LoginButton.spec.js
+++ b/webapp/components/LoginButton/LoginButton.spec.js
@@ -1,9 +1,9 @@
 import { config, mount } from '@vue/test-utils'
-import InviteButton from './InviteButton.vue'
+import LoginButton from './LoginButton.vue'
 
 config.stubs['v-popover'] = '<span><slot /></span>'
 
-describe('InviteButton.vue', () => {
+describe('LoginButton.vue', () => {
   let wrapper
   let mocks
   let propsData
@@ -22,7 +22,7 @@ describe('InviteButton.vue', () => {
 
   describe('mount', () => {
     const Wrapper = () => {
-      return mount(InviteButton, { mocks, propsData })
+      return mount(LoginButton, { mocks, propsData })
     }
 
     beforeEach(() => {
@@ -30,24 +30,12 @@ describe('InviteButton.vue', () => {
     })
 
     it('renders', () => {
-      expect(wrapper.contains('.invite-button')).toBe(true)
+      expect(wrapper.contains('.login-button')).toBe(true)
     })
 
     it('open popup', () => {
       wrapper.find('.base-button').trigger('click')
-      expect(wrapper.contains('.invite-button')).toBe(true)
-    })
-
-    it('invite codes not available', async () => {
-      wrapper.find('.base-button').trigger('click') // open popup
-      wrapper.find('.invite-button').trigger('click') // click copy button
-      expect(mocks.$t).toHaveBeenCalledWith('invite-codes.not-available')
-    })
-
-    it.skip('invite codes copied to clipboard', async () => {
-      wrapper.find('.base-button').trigger('click') // open popup
-      wrapper.find('.invite-button').trigger('click') // click copy button
-      expect(mocks.$t).toHaveBeenCalledWith('invite-codes.not-available')
+      expect(wrapper.contains('.login-button')).toBe(true)
     })
   })
 })
diff --git a/webapp/components/PageFooter/PageFooter.spec.js b/webapp/components/PageFooter/PageFooter.spec.js
index c0c32c4c4..7b104add2 100644
--- a/webapp/components/PageFooter/PageFooter.spec.js
+++ b/webapp/components/PageFooter/PageFooter.spec.js
@@ -29,8 +29,8 @@ describe('PageFooter.vue', () => {
         wrapper = Wrapper()
       })
 
-      it('renders four links', () => {
-        expect(wrapper.findAll('a')).toHaveLength(4)
+      it('renders five links', () => {
+        expect(wrapper.findAll('a')).toHaveLength(5)
       })
 
       it('renders three nuxt-links', () => {
@@ -56,12 +56,12 @@ describe('PageFooter.vue', () => {
       beforeEach(async () => {
         const links = {
           ...linksDefault,
-          ORGANIZATION: { ...linksDefault.ORGANIZATION, externalLink: null },
-          IMPRINT: { ...linksDefault.IMPRINT, externalLink: null },
-          TERMS_AND_CONDITIONS: { ...linksDefault.TERMS_AND_CONDITIONS, externalLink: null },
-          CODE_OF_CONDUCT: { ...linksDefault.CODE_OF_CONDUCT, externalLink: null },
-          DATA_PRIVACY: { ...linksDefault.DATA_PRIVACY, externalLink: null },
-          FAQ: { ...linksDefault.FAQ, externalLink: null },
+          ORGANIZATION: linksDefault.ORGANIZATION.overwrite({ externalLink: null }),
+          IMPRINT: linksDefault.IMPRINT.overwrite({ externalLink: null }),
+          TERMS_AND_CONDITIONS: linksDefault.TERMS_AND_CONDITIONS.overwrite({ externalLink: null }),
+          CODE_OF_CONDUCT: linksDefault.CODE_OF_CONDUCT.overwrite({ externalLink: null }),
+          DATA_PRIVACY: linksDefault.DATA_PRIVACY.overwrite({ externalLink: null }),
+          FAQ: linksDefault.FAQ.overwrite({ externalLink: null }),
         }
         wrapper = Wrapper()
         wrapper.setData({ links })
@@ -99,21 +99,22 @@ describe('PageFooter.vue', () => {
       beforeEach(async () => {
         const links = {
           ...linksDefault,
-          ORGANIZATION: { ...linksDefault.ORGANIZATION, externalLink: 'https://ocelot.social' },
-          IMPRINT: { ...linksDefault.IMPRINT, externalLink: 'https://ocelot.social/IMPRINT' },
-          TERMS_AND_CONDITIONS: {
-            ...linksDefault.TERMS_AND_CONDITIONS,
+          ORGANIZATION: linksDefault.ORGANIZATION.overwrite({
+            externalLink: 'https://ocelot.social',
+          }),
+          IMPRINT: linksDefault.IMPRINT.overwrite({
+            externalLink: 'https://ocelot.social/IMPRINT',
+          }),
+          TERMS_AND_CONDITIONS: linksDefault.TERMS_AND_CONDITIONS.overwrite({
             externalLink: 'https://ocelot.social/TERMS_AND_CONDITIONS',
-          },
-          CODE_OF_CONDUCT: {
-            ...linksDefault.CODE_OF_CONDUCT,
+          }),
+          CODE_OF_CONDUCT: linksDefault.CODE_OF_CONDUCT.overwrite({
             externalLink: 'https://ocelot.social/CODE_OF_CONDUCT',
-          },
-          DATA_PRIVACY: {
-            ...linksDefault.DATA_PRIVACY,
+          }),
+          DATA_PRIVACY: linksDefault.DATA_PRIVACY.overwrite({
             externalLink: 'https://ocelot.social/DATA_PRIVACY',
-          },
-          FAQ: { ...linksDefault.FAQ, externalLink: 'https://ocelot.social/FAQ' },
+          }),
+          FAQ: linksDefault.FAQ.overwrite({ externalLink: 'https://ocelot.social/FAQ' }),
         }
         wrapper = Wrapper()
         wrapper.setData({ links })
diff --git a/webapp/components/_new/features/InternalPage/InternalPage.vue b/webapp/components/_new/features/InternalPage/InternalPage.vue
index 0c1d8d633..99982e89b 100644
--- a/webapp/components/_new/features/InternalPage/InternalPage.vue
+++ b/webapp/components/_new/features/InternalPage/InternalPage.vue
@@ -27,11 +27,6 @@
 <script>
 export default {
   name: 'InternalPage',
-  head() {
-    return {
-      title: this.$t(this.pageParams.internalPage.headTitleIdent),
-    }
-  },
   props: {
     pageParams: { type: Object, required: true },
   },
diff --git a/webapp/layouts/basic.spec.js b/webapp/layouts/basic.spec.js
index 5094a970b..f84195246 100644
--- a/webapp/layouts/basic.spec.js
+++ b/webapp/layouts/basic.spec.js
@@ -1,3 +1,4 @@
+import Vuex from 'vuex'
 import { config, shallowMount } from '@vue/test-utils'
 import Basic from './basic.vue'
 
@@ -8,16 +9,23 @@ config.stubs.nuxt = '<span><slot /></span>'
 describe('basic.vue', () => {
   let wrapper
   let mocks
+  let store
 
   beforeEach(() => {
     mocks = {
       $t: jest.fn(),
     }
+    store = new Vuex.Store({
+      getters: {
+        'auth/isLoggedIn': () => true,
+      },
+    })
   })
 
   describe('shallow mount', () => {
     const Wrapper = () => {
       return shallowMount(Basic, {
+        store,
         mocks,
         localVue,
       })
diff --git a/webapp/mixins/internalPageMixins.js b/webapp/mixins/internalPageMixins.js
index b2443a263..2c2a517c4 100644
--- a/webapp/mixins/internalPageMixins.js
+++ b/webapp/mixins/internalPageMixins.js
@@ -9,6 +9,11 @@ export function internalPageMixins(pageParams) {
     data() {
       return { pageParams }
     },
+    head() {
+      return {
+        title: this.$t(this.pageParams.internalPage.headTitleIdent),
+      }
+    },
     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'
diff --git a/webapp/pages/code-of-conduct.spec.js b/webapp/pages/code-of-conduct.spec.js
index 6d70d3a67..c050f65ba 100644
--- a/webapp/pages/code-of-conduct.spec.js
+++ b/webapp/pages/code-of-conduct.spec.js
@@ -5,6 +5,11 @@ import VueMeta from 'vue-meta'
 const localVue = global.localVue
 localVue.use(VueMeta, { keyName: 'head' })
 
+// avoid: 'Error: Not implemented: navigation (except hash changes)', see https://stackoverflow.com/questions/54090231/how-to-fix-error-not-implemented-navigation-except-hash-changes
+const assignMock = jest.fn()
+delete window.location
+window.location = { assign: assignMock }
+
 describe('code-of-conduct.vue', () => {
   let wrapper
   let mocks
diff --git a/webapp/pages/data-privacy.spec.js b/webapp/pages/data-privacy.spec.js
index 3e891ad43..c5e4e4d62 100644
--- a/webapp/pages/data-privacy.spec.js
+++ b/webapp/pages/data-privacy.spec.js
@@ -5,6 +5,11 @@ import VueMeta from 'vue-meta'
 const localVue = global.localVue
 localVue.use(VueMeta, { keyName: 'head' })
 
+// avoid: 'Error: Not implemented: navigation (except hash changes)', see https://stackoverflow.com/questions/54090231/how-to-fix-error-not-implemented-navigation-except-hash-changes
+const assignMock = jest.fn()
+delete window.location
+window.location = { assign: assignMock }
+
 describe('data-privacy.vue', () => {
   let wrapper
   let mocks
diff --git a/webapp/pages/donate.spec.js b/webapp/pages/donate.spec.js
index 5407e3386..62a5d0f7d 100644
--- a/webapp/pages/donate.spec.js
+++ b/webapp/pages/donate.spec.js
@@ -5,6 +5,11 @@ import VueMeta from 'vue-meta'
 const localVue = global.localVue
 localVue.use(VueMeta, { keyName: 'head' })
 
+// avoid: 'Error: Not implemented: navigation (except hash changes)', see https://stackoverflow.com/questions/54090231/how-to-fix-error-not-implemented-navigation-except-hash-changes
+const assignMock = jest.fn()
+delete window.location
+window.location = { assign: assignMock }
+
 describe('donate.vue', () => {
   let wrapper
   let mocks
diff --git a/webapp/pages/faq.spec.js b/webapp/pages/faq.spec.js
index 7ab5a68ed..3e92d3f7f 100644
--- a/webapp/pages/faq.spec.js
+++ b/webapp/pages/faq.spec.js
@@ -5,6 +5,11 @@ import VueMeta from 'vue-meta'
 const localVue = global.localVue
 localVue.use(VueMeta, { keyName: 'head' })
 
+// avoid: 'Error: Not implemented: navigation (except hash changes)', see https://stackoverflow.com/questions/54090231/how-to-fix-error-not-implemented-navigation-except-hash-changes
+const assignMock = jest.fn()
+delete window.location
+window.location = { assign: assignMock }
+
 describe('faq.vue', () => {
   let wrapper
   let mocks
diff --git a/webapp/pages/imprint.spec.js b/webapp/pages/imprint.spec.js
index 96c37db15..120d99932 100644
--- a/webapp/pages/imprint.spec.js
+++ b/webapp/pages/imprint.spec.js
@@ -5,6 +5,11 @@ import VueMeta from 'vue-meta'
 const localVue = global.localVue
 localVue.use(VueMeta, { keyName: 'head' })
 
+// avoid: 'Error: Not implemented: navigation (except hash changes)', see https://stackoverflow.com/questions/54090231/how-to-fix-error-not-implemented-navigation-except-hash-changes
+const assignMock = jest.fn()
+delete window.location
+window.location = { assign: assignMock }
+
 describe('imprint.vue', () => {
   let wrapper
   let mocks
diff --git a/webapp/pages/organization.spec.js b/webapp/pages/organization.spec.js
index c9d492225..0d0946461 100644
--- a/webapp/pages/organization.spec.js
+++ b/webapp/pages/organization.spec.js
@@ -5,6 +5,11 @@ import VueMeta from 'vue-meta'
 const localVue = global.localVue
 localVue.use(VueMeta, { keyName: 'head' })
 
+// avoid: 'Error: Not implemented: navigation (except hash changes)', see https://stackoverflow.com/questions/54090231/how-to-fix-error-not-implemented-navigation-except-hash-changes
+const assignMock = jest.fn()
+delete window.location
+window.location = { assign: assignMock }
+
 describe('organization.vue', () => {
   let wrapper
   let mocks
diff --git a/webapp/pages/support.spec.js b/webapp/pages/support.spec.js
index fd55e7d00..4e3003553 100644
--- a/webapp/pages/support.spec.js
+++ b/webapp/pages/support.spec.js
@@ -5,6 +5,11 @@ import VueMeta from 'vue-meta'
 const localVue = global.localVue
 localVue.use(VueMeta, { keyName: 'head' })
 
+// avoid: 'Error: Not implemented: navigation (except hash changes)', see https://stackoverflow.com/questions/54090231/how-to-fix-error-not-implemented-navigation-except-hash-changes
+const assignMock = jest.fn()
+delete window.location
+window.location = { assign: assignMock }
+
 describe('support.vue', () => {
   let wrapper
   let mocks
diff --git a/webapp/pages/terms-and-conditions.spec.js b/webapp/pages/terms-and-conditions.spec.js
index cc93d8d37..6046c2e41 100644
--- a/webapp/pages/terms-and-conditions.spec.js
+++ b/webapp/pages/terms-and-conditions.spec.js
@@ -5,6 +5,11 @@ import VueMeta from 'vue-meta'
 const localVue = global.localVue
 localVue.use(VueMeta, { keyName: 'head' })
 
+// avoid: 'Error: Not implemented: navigation (except hash changes)', see https://stackoverflow.com/questions/54090231/how-to-fix-error-not-implemented-navigation-except-hash-changes
+const assignMock = jest.fn()
+delete window.location
+window.location = { assign: assignMock }
+
 describe('terms-and-conditions.vue', () => {
   let wrapper
   let mocks

From edcde1f08db7557480c525fa42a639aaf51e19b6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 9 Aug 2021 11:04:00 +0200
Subject: [PATCH 20/31] Get maintenance page to work

---
 webapp/maintenance/source/pages/index.vue | 28 ++++++++++-------------
 1 file changed, 12 insertions(+), 16 deletions(-)

diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue
index 3ad264c43..e6ee49455 100644
--- a/webapp/maintenance/source/pages/index.vue
+++ b/webapp/maintenance/source/pages/index.vue
@@ -8,22 +8,17 @@
         <ds-flex>
           <ds-flex-item :width="{ base: '100%', sm: 1, md: 1 }">
             <ds-space>
-              <!-- Wolle -->
-              <a
-                v-if="!links.ORGANIZATION.isInternalPage"
-                :href="links.ORGANIZATION.link"
+              <!-- this link works only for external pages -->
+              <!-- QUESTION: could we have internal page or even all internal pages here as well with PageParamsLink by having the footer underneath? -->
+              <!--   I tried this out, but only could get the nginx page displayed. I guees the there were nuxt errors, because the nuxt config file 'webapp/maintenance/source/nuxt.config.maintenance.js' would have to be refactored for that as well -->
+              <!-- BUT: not even the a-tag is working at the moment -->
+              <!-- <a
+                :href="emails.ORGANIZATION_LINK"
                 :title="$t('login.moreInfo', metadata)"
                 target="_blank"
-              >
-                <img class="image" alt="Under maintenance" src="/img/custom/logo-squared.svg" />
-              </a>
-              <img
-                v-else
-                class="image"
-                alt="Under maintenance"
-                src="/img/custom/logo-squared.svg"
-                :title="$t('login.moreInfo', metadata)"
-              />
+              > -->
+              <img class="image" alt="Under maintenance" src="/img/custom/logo-squared.svg" />
+              <!-- </a> -->
             </ds-space>
           </ds-flex-item>
           <ds-flex-item :width="{ base: '100%', sm: 1, md: 1 }">
@@ -48,7 +43,7 @@
 
 <script>
 import emails from '~/constants/emails.js'
-import links from '~/constants/links.js'
+// import links from '~/constants/links.js'
 import metadata from '~/constants/metadata.js'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 
@@ -58,7 +53,8 @@ export default {
     LocaleSwitch,
   },
   data() {
-    return { links, metadata, supportEmail: emails.SUPPORT_EMAIL }
+    // return { links, metadata, supportEmail: emails.SUPPORT_EMAIL }
+    return { metadata, supportEmail: emails.SUPPORT_EMAIL }
   },
 }
 </script>

From 0ec33fe3a3e57b526927304d8690a97176b35a78 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 9 Aug 2021 11:53:45 +0200
Subject: [PATCH 21/31] Try to implement the logo on maintenance page,
 uncommented and hints

---
 docker-compose.override.yml               | 5 +++++
 webapp/Dockerfile.maintenance             | 2 ++
 webapp/components/Logo/Logo.vue           | 2 +-
 webapp/maintenance/source/pages/index.vue | 5 ++++-
 4 files changed, 12 insertions(+), 2 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index 5fceb2776..15cf00e7a 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -60,6 +60,11 @@ services:
     networks:
       - external-net
       
+# the following network from the main YAML gives the warning `WARNING: Some networks were defined but are not used by any service: internal-net` and should be removed
+#   but removing is not possible yet, it seems: https://github.com/docker/compose/issues/3729#issuecomment-623154878
+# networks:
+#   internal-net:
+
 volumes:
   webapp_node_modules:
   backend_node_modules:
diff --git a/webapp/Dockerfile.maintenance b/webapp/Dockerfile.maintenance
index dcc06ad61..d9fa6fe43 100644
--- a/webapp/Dockerfile.maintenance
+++ b/webapp/Dockerfile.maintenance
@@ -57,8 +57,10 @@ COPY package.json yarn.lock ./
 RUN yarn install --production=false --frozen-lockfile --non-interactive
 
 COPY assets assets
+# COPY components/_new/generic/ components/_new/generic
 COPY components/LocaleSwitch/ components/LocaleSwitch
 COPY components/Dropdown.vue components/Dropdown.vue
+# COPY components/Logo/ components/Logo
 COPY layouts/blank.vue layouts/blank.vue
 COPY locales locales
 COPY mixins mixins
diff --git a/webapp/components/Logo/Logo.vue b/webapp/components/Logo/Logo.vue
index c93d74f81..ed5c147e8 100644
--- a/webapp/components/Logo/Logo.vue
+++ b/webapp/components/Logo/Logo.vue
@@ -71,7 +71,7 @@ export default {
       maintenance: {
         path: logos.LOGO_MAINTENACE_RESET_PATH,
         alt: 'Under Maintenance',
-        widthDefault: '75%',
+        widthDefault: '200px',
       },
     }
     return {
diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue
index e6ee49455..7f27e58d1 100644
--- a/webapp/maintenance/source/pages/index.vue
+++ b/webapp/maintenance/source/pages/index.vue
@@ -11,13 +11,14 @@
               <!-- this link works only for external pages -->
               <!-- QUESTION: could we have internal page or even all internal pages here as well with PageParamsLink by having the footer underneath? -->
               <!--   I tried this out, but only could get the nginx page displayed. I guees the there were nuxt errors, because the nuxt config file 'webapp/maintenance/source/nuxt.config.maintenance.js' would have to be refactored for that as well -->
-              <!-- BUT: not even the a-tag is working at the moment -->
+              <!-- BUT: not the logo and not even the a-tag is working at the moment -->
               <!-- <a
                 :href="emails.ORGANIZATION_LINK"
                 :title="$t('login.moreInfo', metadata)"
                 target="_blank"
               > -->
               <img class="image" alt="Under maintenance" src="/img/custom/logo-squared.svg" />
+              <!-- <logo type="maintenance" /> -->
               <!-- </a> -->
             </ds-space>
           </ds-flex-item>
@@ -46,11 +47,13 @@ import emails from '~/constants/emails.js'
 // import links from '~/constants/links.js'
 import metadata from '~/constants/metadata.js'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
+// import Logo from '~/components/Logo/Logo'
 
 export default {
   layout: 'blank',
   components: {
     LocaleSwitch,
+    // Logo,
   },
   data() {
     // return { links, metadata, supportEmail: emails.SUPPORT_EMAIL }

From d4012ee3ca3aa96fea3b0bf9eb5642ae028d3c0e Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 9 Aug 2021 14:02:48 +0200
Subject: [PATCH 22/31] Fix error 'window is undefined' that may appear

- Avoid possible errors, because of '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'.
---
 webapp/components/utils/InternalPages.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/components/utils/InternalPages.js b/webapp/components/utils/InternalPages.js
index 2f8d49ad8..629206cc2 100644
--- a/webapp/components/utils/InternalPages.js
+++ b/webapp/components/utils/InternalPages.js
@@ -34,7 +34,7 @@ class PageParams {
   redirectToPage(thisComponent) {
     if (this.isInternalPage) {
       thisComponent.$router.push(this.internalPage.pageRoute)
-    } else {
+    } else if (typeof window !== 'undefined') {
       window.location.href = this.externalLink
     }
   }

From 2ec692b0e8313b39e2da247295329f250c8a0df0 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 9 Aug 2021 14:10:32 +0200
Subject: [PATCH 23/31] Add empty line at end of all
 'webapp/locales/html/*/organization.html'

---
 webapp/locales/html/de/organization.html | 2 +-
 webapp/locales/html/en/organization.html | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/locales/html/de/organization.html b/webapp/locales/html/de/organization.html
index 547ea95d5..6abd63a6e 100644
--- a/webapp/locales/html/de/organization.html
+++ b/webapp/locales/html/de/organization.html
@@ -1,4 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<p>Hier wird das Netzwerk beschrieben.</p>
\ No newline at end of file
+<p>Hier wird das Netzwerk beschrieben.</p>
diff --git a/webapp/locales/html/en/organization.html b/webapp/locales/html/en/organization.html
index a63e4c6ff..2be0dc833 100644
--- a/webapp/locales/html/en/organization.html
+++ b/webapp/locales/html/en/organization.html
@@ -1,4 +1,4 @@
 <!-- this file is replaced on rebranding by https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/locales/html/ -->
 <!-- you can find and store templates at https://github.com/Ocelot-Social-Community/Ocelot-Social-Deploy-Rebranding/tree/master/branding/templates/ -->
 
-<p>Here the network is described.</p>
\ No newline at end of file
+<p>Here the network is described.</p>

From b37c05ef14fb4145dfe2d73dab64ce71a36675f4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 9 Aug 2021 14:19:04 +0200
Subject: [PATCH 24/31] Add hint to 'page-params-link' on maintenance page

---
 webapp/maintenance/source/pages/index.vue | 7 ++++---
 1 file changed, 4 insertions(+), 3 deletions(-)

diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue
index 7f27e58d1..c4110d0ae 100644
--- a/webapp/maintenance/source/pages/index.vue
+++ b/webapp/maintenance/source/pages/index.vue
@@ -8,9 +8,11 @@
         <ds-flex>
           <ds-flex-item :width="{ base: '100%', sm: 1, md: 1 }">
             <ds-space>
-              <!-- this link works only for external pages -->
               <!-- QUESTION: could we have internal page or even all internal pages here as well with PageParamsLink by having the footer underneath? -->
-              <!--   I tried this out, but only could get the nginx page displayed. I guees the there were nuxt errors, because the nuxt config file 'webapp/maintenance/source/nuxt.config.maintenance.js' would have to be refactored for that as well -->
+              <!--   I tried this out, but only could get the nginx page displayed. I guees the there were nuxt errors, because the nuxt config file 'webapp/maintenance/source/nuxt.config.maintenance.js' would have to be refactored for that as well and may be the missing folder `components/_new/generic/` plays a role, see https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4619 -->
+              <!-- <page-params-link :pageParams="links.ORGANIZATION">
+                <logo type="maintenance" />
+              </page-params-link> -->
               <!-- BUT: not the logo and not even the a-tag is working at the moment -->
               <!-- <a
                 :href="emails.ORGANIZATION_LINK"
@@ -18,7 +20,6 @@
                 target="_blank"
               > -->
               <img class="image" alt="Under maintenance" src="/img/custom/logo-squared.svg" />
-              <!-- <logo type="maintenance" /> -->
               <!-- </a> -->
             </ds-space>
           </ds-flex-item>

From 531f7316fab14f4715c5033e2fa9adf87b9bd326 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 9 Aug 2021 14:26:10 +0200
Subject: [PATCH 25/31] Change hint to 'page-params-link' on maintenance page

---
 webapp/maintenance/source/pages/index.vue | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue
index c4110d0ae..c38041ca7 100644
--- a/webapp/maintenance/source/pages/index.vue
+++ b/webapp/maintenance/source/pages/index.vue
@@ -10,7 +10,7 @@
             <ds-space>
               <!-- QUESTION: could we have internal page or even all internal pages here as well with PageParamsLink by having the footer underneath? -->
               <!--   I tried this out, but only could get the nginx page displayed. I guees the there were nuxt errors, because the nuxt config file 'webapp/maintenance/source/nuxt.config.maintenance.js' would have to be refactored for that as well and may be the missing folder `components/_new/generic/` plays a role, see https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4619 -->
-              <!-- <page-params-link :pageParams="links.ORGANIZATION">
+              <!-- <page-params-link :pageParams="links.ORGANIZATION" :title="$t('login.moreInfo', metadata)">
                 <logo type="maintenance" />
               </page-params-link> -->
               <!-- BUT: not the logo and not even the a-tag is working at the moment -->

From e15a07199158ff8efac54ac6516a83071aee87d8 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Tue, 10 Aug 2021 18:48:02 +0200
Subject: [PATCH 26/31] Fulfill the suggestions of Ulf

---
 webapp/components/utils/InternalPages.js | 42 +-----------------------
 webapp/components/utils/PageParams.js    | 41 +++++++++++++++++++++++
 2 files changed, 42 insertions(+), 41 deletions(-)
 create mode 100644 webapp/components/utils/PageParams.js

diff --git a/webapp/components/utils/InternalPages.js b/webapp/components/utils/InternalPages.js
index 629206cc2..f45601af9 100644
--- a/webapp/components/utils/InternalPages.js
+++ b/webapp/components/utils/InternalPages.js
@@ -1,44 +1,4 @@
-function noStringDefined(string) {
-  return !string || string === 0
-}
-
-class PageParams {
-  constructor(pageParams) {
-    this.name = pageParams.name
-    this.externalLink = pageParams.externalLink
-    this.internalPage = pageParams.internalPage
-  }
-
-  overwrite(assignPageParams) {
-    const pageParams = this
-    if (assignPageParams.name !== undefined) {
-      pageParams.name = assignPageParams.name
-    }
-    if (assignPageParams.externalLink !== undefined) {
-      pageParams.externalLink = assignPageParams.externalLink
-    }
-    if (assignPageParams.internalPage !== undefined) {
-      pageParams.internalPage = { ...pageParams.internalPage, ...assignPageParams.internalPage }
-    }
-    return pageParams
-  }
-
-  get isInternalPage() {
-    return noStringDefined(this.externalLink)
-  }
-
-  get link() {
-    return this.isInternalPage ? this.internalPage.pageRoute : this.externalLink
-  }
-
-  redirectToPage(thisComponent) {
-    if (this.isInternalPage) {
-      thisComponent.$router.push(this.internalPage.pageRoute)
-    } else if (typeof window !== 'undefined') {
-      window.location.href = this.externalLink
-    }
-  }
-}
+import { PageParams } from '~/components/utils/PageParams.js'
 
 export const defaultPageParamsPages = {
   ORGANIZATION: new PageParams({
diff --git a/webapp/components/utils/PageParams.js b/webapp/components/utils/PageParams.js
new file mode 100644
index 000000000..9d1fc6dfe
--- /dev/null
+++ b/webapp/components/utils/PageParams.js
@@ -0,0 +1,41 @@
+export class PageParams {
+  constructor(pageParams) {
+    this.name = pageParams.name
+    this.externalLink = pageParams.externalLink
+    this.internalPage = pageParams.internalPage
+  }
+
+  overwrite(assignPageParams) {
+    const pageParams = this
+    if (assignPageParams.name !== undefined) {
+      pageParams.name = assignPageParams.name
+    }
+    if (assignPageParams.externalLink !== undefined) {
+      pageParams.externalLink = assignPageParams.externalLink
+    }
+    if (assignPageParams.internalPage !== undefined) {
+      pageParams.internalPage = { ...pageParams.internalPage, ...assignPageParams.internalPage }
+    }
+    return pageParams
+  }
+
+  noStringDefined(string) {
+    return !string || string.length === 0
+  }
+
+  get isInternalPage() {
+    return this.noStringDefined(this.externalLink)
+  }
+
+  get link() {
+    return this.isInternalPage ? this.internalPage.pageRoute : this.externalLink
+  }
+
+  redirectToPage(thisComponent) {
+    if (this.isInternalPage) {
+      thisComponent.$router.push(this.internalPage.pageRoute)
+    } else if (typeof window !== 'undefined') {
+      window.location.href = this.externalLink
+    }
+  }
+}

From ea8a4be283eed308e5a867e86680722fc33dbda9 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 11 Aug 2021 15:03:23 +0200
Subject: [PATCH 27/31] release-v1.0.5

---
 CHANGELOG.md                           | 63 +++++++++++++++++++++++++-
 backend/package.json                   |  2 +-
 package.json                           |  2 +-
 webapp/maintenance/source/package.json |  2 +-
 webapp/package.json                    |  2 +-
 5 files changed, 66 insertions(+), 5 deletions(-)

diff --git a/CHANGELOG.md b/CHANGELOG.md
index e7e69342a..ca7a9a2ee 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,8 +4,69 @@ All notable changes to this project will be documented in this file. Dates are d
 
 Generated by [`auto-changelog`](https://github.com/CookPete/auto-changelog).
 
-#### [v1.0.4](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/1.0.3...v1.0.4)
+#### [1.0.5](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/1.0.4...1.0.5)
 
+- feat: 🍰 Landing Page And Other Internal Pages [`#4599`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4599)
+- Bump eslint-plugin-prettier from 3.1.4 to 3.4.0 in /webapp [`#4577`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4577)
+- Bump vue-scrollto from 2.17.1 to 2.20.0 in /webapp [`#4592`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4592)
+- Bump date-fns from 2.22.1 to 2.23.0 [`#4596`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4596)
+- Bump metascraper-description from 5.11.6 to 5.23.1 in /backend [`#4593`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4593)
+- Bump slug from 2.1.1 to 5.1.0 [`#4525`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4525)
+- Bump metascraper-lang from 5.11.8 to 5.23.1 in /backend [`#4587`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4587)
+- Bump eslint-plugin-promise from 4.2.1 to 4.3.1 in /backend [`#4591`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4591)
+- fix: 🍰 Quick Fix For backend Tests [`#4565`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4565)
+- Bump eslint-config-prettier from 6.10.1 to 6.15.0 in /backend [`#4583`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4583)
+- Bump subscriptions-transport-ws from 0.9.16 to 0.9.19 in /backend [`#4584`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4584)
+- Bump metascraper-youtube from 5.11.8 to 5.23.0 in /backend [`#4579`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4579)
+- Bump metascraper-publisher from 5.11.8 to 5.23.0 in /backend [`#4578`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4578)
+- [Security] Bump node-notifier from 6.0.0 to 8.0.2 in /webapp [`#4299`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4299)
+- Bump @storybook/addon-a11y from 5.3.21 to 6.3.6 in /webapp [`#4570`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4570)
+- Bump metascraper-soundcloud from 5.11.8 to 5.23.0 in /backend [`#4576`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4576)
+- Bump cross-env from 7.0.2 to 7.0.3 in /backend [`#4522`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4522)
+- [Security] Bump browserslist from 4.9.1 to 4.16.6 in /backend [`#4444`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4444)
+- 🍰 feat: Landing Page etc. [`#4555`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4555)
+- [Security] Bump browserslist from 4.14.7 to 4.16.6 [`#4440`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4440)
+- Bump auto-changelog from 2.2.1 to 2.3.0 [`#4515`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4515)
+- Bump @storybook/vue from 5.3.21 to 6.3.6 in /webapp [`#4571`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4571)
+- Bump @storybook/addon-actions from 5.3.18 to 5.3.21 in /webapp [`#4141`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4141)
+- [Security] Bump ssri from 6.0.1 to 6.0.2 in /webapp [`#4390`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4390)
+- [Security] Bump y18n from 4.0.0 to 4.0.3 in /backend [`#4356`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4356)
+- Bump v-tooltip from 2.0.3 to 2.1.3 in /webapp [`#4308`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4308)
+- Bump eslint-plugin-jest from 24.1.10 to 24.4.0 in /webapp [`#4564`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4564)
+- Bump apollo-cache-inmemory from 1.6.5 to 1.6.6 in /webapp [`#4140`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4140)
+- [Security] Bump websocket-extensions from 0.1.3 to 0.1.4 in /webapp [`#3975`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/3975)
+- Bump linkify-it from 2.2.0 to 3.0.2 in /webapp [`#4139`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4139)
+- [Security] Bump yargs-parser from 18.1.1 to 18.1.3 in /backend [`#3962`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/3962)
+- [Security] Bump y18n from 3.2.1 to 3.2.2 in /webapp [`#4317`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4317)
+- Bump vue-sweetalert-icons from 4.2.0 to 4.3.0 in /webapp [`#4142`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4142)
+- Bump mustache from 4.0.1 to 4.2.0 in /backend [`#4310`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4310)
+- [Security] Bump elliptic from 6.5.3 to 6.5.4 in /webapp [`#4286`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4286)
+- [Security] Bump elliptic from 6.5.3 to 6.5.4 [`#4285`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4285)
+- Bump neode from 0.3.7 to 0.4.7 [`#4162`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4162)
+- Bump date-fns from 2.11.1 to 2.22.1 in /backend [`#4523`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4523)
+- Bump stack-utils from 2.0.1 to 2.0.3 in /webapp [`#4076`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4076)
+- Bump date-fns from 2.12.0 to 2.22.1 [`#4455`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4455)
+- Bump date-fns from 2.12.0 to 2.22.1 in /webapp [`#4537`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4537)
+- Bump cross-env from 7.0.2 to 7.0.3 [`#4032`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4032)
+- Bump graphql-request from 1.8.2 to 2.0.0 [`#3988`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/3988)
+- Bump cookie-universal-nuxt from 2.1.4 to 2.1.5 in /webapp [`#4561`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4561)
+- Bump graphql from 14.6.0 to 14.7.0 in /webapp [`#4000`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4000)
+- Bump prettier from 2.2.0 to 2.3.2 in /backend [`#4530`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4530)
+- Bump merge-graphql-schemas from 1.7.7 to 1.7.8 in /backend [`#3959`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/3959)
+- fix: 🍰 Fix Menu Legend Menu Bar Button Without Click Event [`#4556`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4556)
+- Bump eslint-plugin-promise from 4.2.1 to 4.3.1 in /webapp [`#4534`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4534)
+- feat: 🍰 Post Editor Legend [`#4492`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4492)
+- New Issue type EPIC [`#4536`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4536)
+- Upgrade to GitHub-native Dependabot [`#4399`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4399)
+- Remove superfluous package-lock.json [`c7e4e6d`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/c7e4e6d2b26d448b3d2787aff4a0bde32c24e919)
+- Delete superfluous and always conflicting file package-lock.json [`9932796`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/9932796d233789c76b917de533ec2efc99f6aa4a)
+- Refactor pageParams, second step [`e8a0a5d`](https://github.com/Ocelot-Social-Community/Ocelot-Social/commit/e8a0a5d13c0610066c50c98d5e0d661ee8139217)
+
+#### [1.0.4](https://github.com/Ocelot-Social-Community/Ocelot-Social/compare/1.0.3...1.0.4)
+
+> 8 June 2021
+
+- chore: 🍰 Release v1.0.4 [`#4475`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4475)
 - fixed wrong env variable [`#4474`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4474)
 - chore: [WIP] 🍰 New Deployment With 'base' And 'code' Docker Images [`#4452`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4452)
 - feat: 🍰 Flexible Footer Links [`#4468`](https://github.com/Ocelot-Social-Community/Ocelot-Social/pull/4468)
diff --git a/backend/package.json b/backend/package.json
index 8f9394168..67cabe90e 100644
--- a/backend/package.json
+++ b/backend/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-backend",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "GraphQL Backend for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/package.json b/package.json
index 77c0f39ff..be40c81b7 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "Fullstack and API tests with cypress and cucumber for ocelot.social",
   "author": "ocelot.social Community",
   "license": "MIT",
diff --git a/webapp/maintenance/source/package.json b/webapp/maintenance/source/package.json
index 2fcf86443..711d5c618 100644
--- a/webapp/maintenance/source/package.json
+++ b/webapp/maintenance/source/package.json
@@ -1,6 +1,6 @@
 {
   "name": "@ocelot-social/maintenance",
-  "version": "1.0.3",
+  "version": "1.0.5",
   "description": "Maintenance page for ocelot.social",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",
diff --git a/webapp/package.json b/webapp/package.json
index 2f3294923..f314662b3 100644
--- a/webapp/package.json
+++ b/webapp/package.json
@@ -1,6 +1,6 @@
 {
   "name": "ocelot-social-webapp",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "description": "ocelot.social Frontend",
   "repository": "https://github.com/Ocelot-Social-Community/Ocelot-Social",
   "author": "ocelot.social Community",

From eb44525381cfac1fe297e596a98e0d26a3a04c91 Mon Sep 17 00:00:00 2001
From: AayushSaini101 <kumaraayush9810@gmail.com>
Date: Sun, 5 Sep 2021 21:28:37 +0530
Subject: [PATCH 28/31] SpellingChange

---
 README.md | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/README.md b/README.md
index 416fcaefb..67f94f94c 100644
--- a/README.md
+++ b/README.md
@@ -74,7 +74,7 @@ Docker is a software development container tool that combines software and its d
 
 #### General Installation of Docker
 
-There are [sevaral ways to install Docker CE](https://docs.docker.com/install/) on your computer or server.
+There are [several ways to install Docker CE](https://docs.docker.com/install/) on your computer or server.
 
  * [install Docker Desktop on macOS](https://docs.docker.com/docker-for-mac/install/)
  * [install Docker Desktop on Windows](https://docs.docker.com/docker-for-windows/install/)

From fa6d3bb95db162d7abcf3c29b0100e0f9200507c Mon Sep 17 00:00:00 2001
From: somesh202 <77766761+somesh202@users.noreply.github.com>
Date: Sat, 11 Sep 2021 11:30:30 +0530
Subject: [PATCH 29/31] centered-login-form

---
 webapp/components/LoginForm/LoginForm.vue             |  2 +-
 webapp/components/Registration/RegistrationSlider.vue | 10 ++++++++--
 2 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/webapp/components/LoginForm/LoginForm.vue b/webapp/components/LoginForm/LoginForm.vue
index bd4d6c645..5d06dcb61 100644
--- a/webapp/components/LoginForm/LoginForm.vue
+++ b/webapp/components/LoginForm/LoginForm.vue
@@ -115,7 +115,7 @@ export default {
 .login-form {
   width: 80vw;
   max-width: 620px;
-  /* margin: auto; */
+  margin: auto; 
 
   .base-button {
     display: block;
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index fc2878c1b..3fe13225b 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -1,5 +1,5 @@
 <template>
-  <section class="login-form">
+  <section class="registration-slider">
     <base-card>
       <template #imageColumn>
         <page-params-link :pageParams="links.ORGANIZATION" :title="$t('login.moreInfo', metadata)">
@@ -255,4 +255,10 @@ export default {
 }
 </script>
 
-<style lang="scss"></style>
+<style lang="scss">
+.registration-slider {
+  width: 80vw;
+  max-width: 620px;
+  margin: auto; 
+}
+</style>

From e9189a3c58edd87edf3c71c52a5d025cfc4942a7 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sun, 12 Sep 2021 08:28:56 +0200
Subject: [PATCH 30/31] Fix linting

---
 webapp/components/LoginForm/LoginForm.vue             | 2 +-
 webapp/components/Registration/RegistrationSlider.vue | 2 +-
 2 files changed, 2 insertions(+), 2 deletions(-)

diff --git a/webapp/components/LoginForm/LoginForm.vue b/webapp/components/LoginForm/LoginForm.vue
index 5d06dcb61..0d85ca33a 100644
--- a/webapp/components/LoginForm/LoginForm.vue
+++ b/webapp/components/LoginForm/LoginForm.vue
@@ -115,7 +115,7 @@ export default {
 .login-form {
   width: 80vw;
   max-width: 620px;
-  margin: auto; 
+  margin: auto;
 
   .base-button {
     display: block;
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index 3fe13225b..6bd704b32 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -259,6 +259,6 @@ export default {
 .registration-slider {
   width: 80vw;
   max-width: 620px;
-  margin: auto; 
+  margin: auto;
 }
 </style>

From 198d24ecb195489aef32b9884f5950a4f28e8256 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Mon, 13 Sep 2021 09:33:22 +0200
Subject: [PATCH 31/31] Fix test `pages/registration.spec.js`

---
 webapp/pages/registration.spec.js | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/webapp/pages/registration.spec.js b/webapp/pages/registration.spec.js
index 74fb7d710..88ba31431 100644
--- a/webapp/pages/registration.spec.js
+++ b/webapp/pages/registration.spec.js
@@ -306,7 +306,7 @@ describe('Registration', () => {
 
     it('renders', async () => {
       wrapper = await Wrapper()
-      expect(wrapper.is('.login-form')).toBe(true)
+      expect(wrapper.is('.registration-slider')).toBe(true)
     })
 
     // The asyncTests must go last