From 1bd4af6fd3b5db167575910948a0a72461a1129a Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 2 Jun 2021 20:16:52 +0200
Subject: [PATCH] Implement flexible page footer links

---
 webapp/components/PageFooter/PageFooter.vue | 46 ++++++++++++++++++---
 webapp/locales/de.json                      |  2 +-
 webapp/locales/en.json                      |  2 +-
 webapp/locales/es.json                      |  2 +-
 webapp/locales/fr.json                      |  2 +-
 webapp/locales/html/de/faq.html             |  1 +
 webapp/locales/html/de/index.js             |  2 +
 webapp/locales/html/en/faq.html             |  1 +
 webapp/locales/html/en/index.js             |  2 +
 webapp/locales/it.json                      |  2 +-
 webapp/locales/nl.json                      |  2 +-
 webapp/locales/pl.json                      |  2 +-
 webapp/locales/pt.json                      |  2 +-
 webapp/locales/ru.json                      |  2 +-
 webapp/pages/code-of-conduct.vue            |  2 +-
 webapp/pages/data-privacy.vue               |  3 +-
 webapp/pages/faq.spec.js                    | 38 +++++++++++++++++
 webapp/pages/faq.vue                        | 21 ++++++++++
 webapp/pages/imprint.vue                    |  3 +-
 webapp/pages/terms-and-conditions.vue       |  2 +-
 20 files changed, 118 insertions(+), 21 deletions(-)
 create mode 100644 webapp/locales/html/de/faq.html
 create mode 100644 webapp/locales/html/en/faq.html
 create mode 100644 webapp/pages/faq.spec.js
 create mode 100644 webapp/pages/faq.vue

diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
index ace0514e1..49834ed62 100644
--- a/webapp/components/PageFooter/PageFooter.vue
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -1,23 +1,51 @@
 <template>
   <div id="footer" class="ds-footer">
-    <a :href="links.ORGANIZATION" target="_blank" v-html="$t('site.made')"></a>
+    <!-- made with ❤️ -->
+    <a :href="links.ORGANIZATION" target="_blank">
+      {{ $t('site.made') }}
+    </a>
     <span>-</span>
-    <nuxt-link to="/imprint">
+    <!-- imprint -->
+    <nuxt-link v-if="noLinkDefined(links.IMPRINT)" to="/imprint">
       {{ $t('site.imprint') }}
     </nuxt-link>
+    <a v-else :href="links.IMPRINT" target="_blank">
+      {{ $t('site.imprint') }}
+    </a>
     <span>-</span>
-    <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>
+    <!-- terms and conditions -->
+    <nuxt-link v-if="noLinkDefined(links.TERMS_AND_CONDITIONS)" to="/terms-and-conditions">
+      {{ $t('site.termsAndConditions') }}
+    </nuxt-link>
+    <a v-else :href="links.TERMS_AND_CONDITIONS" target="_blank">
+      {{ $t('site.termsAndConditions') }}
+    </a>
     <span>-</span>
-    <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>
+    <!-- code of conduct -->
+    <nuxt-link v-if="noLinkDefined(links.CODE_OF_CONDUCT)" to="/code-of-conduct">
+      {{ $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>
-    <nuxt-link to="/data-privacy">
+    <!-- data privacy -->
+    <nuxt-link v-if="noLinkDefined(links.DATA_PRIVACY)" to="/data-privacy">
       {{ $t('site.data-privacy') }}
     </nuxt-link>
+    <a v-else :href="links.DATA_PRIVACY" target="_blank">
+      {{ $t('site.data-privacy') }}
+    </a>
     <span>-</span>
-    <a :href="links.FAQ" target="_blank">
+    <!-- faq -->
+    <nuxt-link v-if="noLinkDefined(links.FAQ)" to="/faq">
+      {{ $t('site.faq') }}
+    </nuxt-link>
+    <a v-else :href="links.FAQ" target="_blank">
       {{ $t('site.faq') }}
     </a>
     <span>-</span>
+    <!-- version -->
     <a
       href="https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/CHANGELOG.md"
       target="_blank"
@@ -29,10 +57,16 @@
 
 <script>
 import links from '~/constants/links.js'
+
 export default {
   data() {
     return { links, version: `v${this.$env.VERSION}` }
   },
+  methods: {
+    noLinkDefined(link) {
+      return !link || link.length === 0
+    },
+  },
 }
 </script>
 
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 6ef427362..042d76fac 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -771,7 +771,7 @@
     "faq": "FAQ",
     "germany": "Deutschland",
     "imprint": "Impressum",
-    "made": "Mit &#10084; gemacht",
+    "made": "Mit ❤️ gemacht",
     "register": "Registernummer",
     "responsible": "Verantwortlich für Inhalte dieser Seite (§ 55 Abs. 2 RStV)",
     "taxident": "Umsatzsteuer-Identifikationsnummer gemäß § 27 a Umsatzsteuergesetz (Deutschland)",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index c5ad5c27f..cdd261700 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -771,7 +771,7 @@
     "faq": "FAQ",
     "germany": "Germany",
     "imprint": "Imprint",
-    "made": "Made with &#10084;",
+    "made": "Made with ❤️",
     "register": "Registry number",
     "responsible": "responsible for contents of this page (§ 55 Abs. 2 RStV)",
     "taxident": "USt-ID. according to §27a of the German Sales Tax Law:",
diff --git a/webapp/locales/es.json b/webapp/locales/es.json
index 97f1f247b..1ab09e011 100644
--- a/webapp/locales/es.json
+++ b/webapp/locales/es.json
@@ -694,7 +694,7 @@
     "faq": "Preguntas más frecuentes",
     "germany": "Alemania",
     "imprint": "Pie de imprenta",
-    "made": "Hecho con &#10084;",
+    "made": "Hecho con ❤️",
     "register": "Número de registro",
     "responsible": "Responsable según § 55 Abs. 2 RStV (Alemania)",
     "taxident": "Número de identificación del impuesto sobre el valor añadido según el § 27 a de la Ley del Impuesto sobre el Valor Añadido (Alemania)",
diff --git a/webapp/locales/fr.json b/webapp/locales/fr.json
index fe4cf4b9b..cb4e96bdc 100644
--- a/webapp/locales/fr.json
+++ b/webapp/locales/fr.json
@@ -662,7 +662,7 @@
     "faq": "FAQ",
     "germany": "Allemagne",
     "imprint": "Mentions légales",
-    "made": "Fabriqué avec &#10084;",
+    "made": "Fabriqué avec ❤️",
     "register": "Numéro de registre",
     "responsible": "Responsable selon § 55 Abs. 2 RStV (Allemagne)",
     "taxident": "Numéro d'identification à la taxe sur la valeur ajoutée selon § 27 a de la loi sur la taxe sur la valeur ajoutée (Allemagne)",
diff --git a/webapp/locales/html/de/faq.html b/webapp/locales/html/de/faq.html
new file mode 100644
index 000000000..d51dbf6c2
--- /dev/null
+++ b/webapp/locales/html/de/faq.html
@@ -0,0 +1 @@
+<p>Hier stehen die FAQs</p>
diff --git a/webapp/locales/html/de/index.js b/webapp/locales/html/de/index.js
index 498bbb866..a97b217d6 100644
--- a/webapp/locales/html/de/index.js
+++ b/webapp/locales/html/de/index.js
@@ -1,11 +1,13 @@
 import termsAndConditions from './terms-and-conditions.html'
 import codeOfConduct from './code-of-conduct.html'
 import dataPrivacy from './data-privacy.html'
+import faq from './faq.html'
 import imprint from './imprint.html'
 
 export default {
   termsAndConditions,
   codeOfConduct,
   dataPrivacy,
+  faq,
   imprint,
 }
diff --git a/webapp/locales/html/en/faq.html b/webapp/locales/html/en/faq.html
new file mode 100644
index 000000000..cb019e96e
--- /dev/null
+++ b/webapp/locales/html/en/faq.html
@@ -0,0 +1 @@
+<p>Here are the FAQs</p>
diff --git a/webapp/locales/html/en/index.js b/webapp/locales/html/en/index.js
index 498bbb866..a97b217d6 100644
--- a/webapp/locales/html/en/index.js
+++ b/webapp/locales/html/en/index.js
@@ -1,11 +1,13 @@
 import termsAndConditions from './terms-and-conditions.html'
 import codeOfConduct from './code-of-conduct.html'
 import dataPrivacy from './data-privacy.html'
+import faq from './faq.html'
 import imprint from './imprint.html'
 
 export default {
   termsAndConditions,
   codeOfConduct,
   dataPrivacy,
+  faq,
   imprint,
 }
diff --git a/webapp/locales/it.json b/webapp/locales/it.json
index 0832da2cc..a9121d184 100644
--- a/webapp/locales/it.json
+++ b/webapp/locales/it.json
@@ -612,7 +612,7 @@
     "faq": null,
     "germany": "Germania",
     "imprint": "Impressum",
-    "made": "Con &#10084; fatto",
+    "made": "Con ❤️ fatto",
     "register": "numero di registro",
     "responsible": "Responsabile ai sensi del § 55 Abs. 2 RStV (Germania)",
     "taxident": "Numero di identificazione dell'imposta sul valore aggiunto ai sensi del § 27 a Legge sull'imposta sul valore aggiunto (Germania)",
diff --git a/webapp/locales/nl.json b/webapp/locales/nl.json
index dc5670e9f..3bf453655 100644
--- a/webapp/locales/nl.json
+++ b/webapp/locales/nl.json
@@ -165,7 +165,7 @@
     "director": "Directeur",
     "germany": "Duitsland",
     "imprint": "Afdruk",
-    "made": "Met &#10084; gemaakt",
+    "made": "Met ❤️ gemaakt",
     "register": "inschrijfnummer",
     "responsible": "Verantwoordelijk volgens § 55 Abs. 2 RStV (Duitsland).",
     "taxident": "Identificatienummer voor de belasting over de toegevoegde waarde overeenkomstig § 27 a Wet op de belasting over de toegevoegde waarde (Duitsland).",
diff --git a/webapp/locales/pl.json b/webapp/locales/pl.json
index d38a62573..7cb3ee3dc 100644
--- a/webapp/locales/pl.json
+++ b/webapp/locales/pl.json
@@ -350,7 +350,7 @@
     "director": "Dyrektor zarządzający",
     "germany": "Niemcy",
     "imprint": "Nadruk",
-    "made": "Z &#10084; zrobiony",
+    "made": "Z ❤️ zrobiony",
     "register": "numer rejestracyjny",
     "responsible": "Odpowiedzialny zgodnie z § 55 Abs. 2 RStV (Niemcy)",
     "taxident": "Numer identyfikacyjny podatku od wartości dodanej zgodnie z § 27 a Ustawa o podatku od wartości dodanej (Niemcy)",
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 5f8101c66..277fb9e0b 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -647,7 +647,7 @@
     "faq": "FAQ",
     "germany": "Alemanha",
     "imprint": "Impressão",
-    "made": "Feito com &#10084;",
+    "made": "Feito com ❤️",
     "register": "número de registo",
     "responsible": "Responsável segundo § 55 Abs. 2 RStV (Alemanha) ",
     "taxident": "Número de identificação do imposto sobre o valor acrescentado de acordo com o § 27 da Lei do Imposto sobre o Valor Acrescentado (Alemanha)",
diff --git a/webapp/locales/ru.json b/webapp/locales/ru.json
index 95d26690d..72a8deb54 100644
--- a/webapp/locales/ru.json
+++ b/webapp/locales/ru.json
@@ -694,7 +694,7 @@
     "faq": "ЧаВо (FAQ)",
     "germany": "Германия",
     "imprint": "Импрессум",
-    "made": "Сделано с &#10084;",
+    "made": "Сделано с ❤️",
     "register": "Регистрационный номер",
     "responsible": "ответственный за содержание этой страницы (§ 55 Abs. 2 RStV)",
     "taxident": "UST-ID. в соответствии с §27a Закона о налоге с продаж Германии:",
diff --git a/webapp/pages/code-of-conduct.vue b/webapp/pages/code-of-conduct.vue
index 7b3455934..c3cf3bf54 100644
--- a/webapp/pages/code-of-conduct.vue
+++ b/webapp/pages/code-of-conduct.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <ds-space>
+    <ds-space margin="small">
       <ds-heading tag="h2">{{ $t('site.code-of-conduct') }}</ds-heading>
     </ds-space>
     <ds-container>
diff --git a/webapp/pages/data-privacy.vue b/webapp/pages/data-privacy.vue
index 015c7b9dd..236fa5eeb 100644
--- a/webapp/pages/data-privacy.vue
+++ b/webapp/pages/data-privacy.vue
@@ -1,9 +1,8 @@
 <template>
   <div>
-    <ds-space>
+    <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>
diff --git a/webapp/pages/faq.spec.js b/webapp/pages/faq.spec.js
new file mode 100644
index 000000000..bb68a3638
--- /dev/null
+++ b/webapp/pages/faq.spec.js
@@ -0,0 +1,38 @@
+import { mount } from '@vue/test-utils'
+import Faq from './faq.vue'
+import VueMeta from 'vue-meta'
+
+const localVue = global.localVue
+localVue.use(VueMeta, { keyName: 'head' })
+
+describe('faq.vue', () => {
+  let wrapper
+  let mocks
+
+  beforeEach(() => {
+    mocks = {
+      $t: (t) => t,
+    }
+  })
+
+  describe('mount', () => {
+    const Wrapper = () => {
+      return mount(Faq, {
+        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.faq')
+    })
+  })
+})
diff --git a/webapp/pages/faq.vue b/webapp/pages/faq.vue
new file mode 100644
index 000000000..843c78461
--- /dev/null
+++ b/webapp/pages/faq.vue
@@ -0,0 +1,21 @@
+<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>
+</template>
+
+<script>
+export default {
+  layout: 'basic',
+  head() {
+    return {
+      title: this.$t('site.faq'),
+    }
+  },
+}
+</script>
diff --git a/webapp/pages/imprint.vue b/webapp/pages/imprint.vue
index 57c9f680e..538e023a9 100644
--- a/webapp/pages/imprint.vue
+++ b/webapp/pages/imprint.vue
@@ -1,9 +1,8 @@
 <template>
   <div>
-    <ds-space>
+    <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>
diff --git a/webapp/pages/terms-and-conditions.vue b/webapp/pages/terms-and-conditions.vue
index 674b5c143..07ac41cfc 100644
--- a/webapp/pages/terms-and-conditions.vue
+++ b/webapp/pages/terms-and-conditions.vue
@@ -1,6 +1,6 @@
 <template>
   <div>
-    <ds-space>
+    <ds-space margin="small">
       <ds-heading tag="h2">{{ $t('site.termsAndConditions') }}</ds-heading>
     </ds-space>
     <ds-container>