Merge branch 'master' of https://github.com/Ocelot-Social-Community/Ocelot-Social into 4451-new-deployment-with-base-and-code

.github/ISSUE_TEMPLATE/question.md

@@ -1,12 +1,12 @@
 ---
 name: 💬 Question
-about: If you need help understanding HumanConnection.
+about: If you need help understanding ocelot.social.
 labels: question
 title: 💬 [Question] 
 ---
-<!-- Chat with Team HumanConnection -->
+<!-- Chat with ocelot.social team -->
-<!-- If you need an answer right away, visit the HumanConnection Discord:
+<!-- If you need an answer right away, visit the ocelot.social Discord:
-https://discord.gg/Q3mpcgr -->
+https://discord.gg/AJSX9DCSUA -->
 
 ## :speech_balloon: Question
 <!-- Describe your Question in detail. Include screenshots and drawings if needed. -->

CONTRIBUTING.md

@@ -4,31 +4,33 @@ Thank you so much for thinking of contributing to the Human Connection project!
 
 ## Getting Set Up
 
-Instructions for how to install all the necessary software and some code guidelines can be found in our [documentation](https://docs.human-connection.org/human-connection/).
+Instructions for how to install all the necessary software and some code guidelines can be found in our main [Readme](/README.md) or in our [documentation](https://docs.human-connection.org/human-connection/).
 
-To get you started we recommend that you join forces with a regular contributor. Please join [our discord instance](https://human-connection.org/discord) to chat with developers or just get in touch directly on an issue on either [Github](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues) or [Zenhub](https://app.zenhub.com/workspaces/ocelotsocial-5fb21ff922cb410015dd6535/board?filterLogic=any&repos=301151089):
+To get you started we recommend that you join forces with a regular contributor. Please join [our Discord instance](https://discord.gg/AJSX9DCSUA) to chat with developers or just get in touch directly on an issue on either [Github](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues) or [Zenhub](https://app.zenhub.com/workspaces/ocelotsocial-5fb21ff922cb410015dd6535/board?filterLogic=any&repos=301151089):
 
 ![](https://dl.dropbox.com/s/vbmcihkduy9dhko/Screenshot%202019-01-03%2015.50.11.png?dl=0)
 
-We also have regular pair programming sessions that you are very welcome to join! We feel this is often the best way to get to know both the project and the team. Most developers are also available for spontaneous sessions if the times listed below don't work for you – just ping us on discord.
+We also have regular pair programming sessions that you are very welcome to join! We feel this is often the best way to get to know both the project and the team. Most developers are also available for spontaneous sessions if the times listed below don't work for you – just ping us on Discord.
 
 ## Development Flow
 
 We operate in two week sprints that are planned, estimated and prioritised on [Zenhub](https://app.zenhub.com/workspaces/ocelotsocial-5fb21ff922cb410015dd6535/board?filterLogic=any&repos=301151089). All issues are also linked to and synced with [Github](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues). Look for the `good first issue` label if you're not sure where to start!
 
-We try to discuss all questions directly related to a feature or bug in the respective issue, in order to preserve it for the future and for other developers. We use discord for real-time communication.
+We try to discuss all questions directly related to a feature or bug in the respective issue, in order to preserve it for the future and for other developers. We use Discord for real-time communication.
 
 This is how we solve bugs and implement features, step by step:
+
 1. We find an issue we want to work on, usually during the sprint planning but as an open source contributor this can happen at any time.
 2. We communicate with the team to see if the issue is still available. (When you comment on an issue but don't get an answer there within 1-2 days try to mention @Human-Connection/hc-dev-team to make sure we check in.)
 3. We make sure we understand the issue in detail – what problem is it solving and how should it be implemented?
-4. We assign ourselves to the issue and move it to `In Progress` on [Zenhub](https://app.zenhub.com/workspaces/human-connection-nitro-5c0154ecc699f60fc92cf11f).
+4. We assign ourselves to the issue and move it to `In Progress` on [Zenhub](https://app.zenhub.com/workspaces/ocelotsocial-5fb21ff922cb410015dd6535/board?filterLogic=any&repos=301151089).
 5. We start working on it in a `new branch` and open a `pull request` prefixed with `[WIP]` (work in progress) to which we regularly push our changes.
 6. When questions come up we clarify them with the team (directly in the issue on Github).
 7. When we are happy with our work and our PR is passing all tests we remove the `[WIP]` from the PR description and ask for reviews (if you're not sure who to ask there is @Human-Connection/hc-dev-team which pings all core developers).
 8. We then incorporate the suggestions from the reviews into our work and once it has been approved it can be merged into master!
 
 Every pull request needs to:
+
 * fix an issue (if there is something you want to work on but there is no issue for it, create one first and discuss it with the team)
 * include tests for the code that is added or changed
 * pass all tests (linter, backend, frontend, end-to-end)
@@ -38,37 +40,46 @@ Every pull request needs to:
 
 There are many volunteers all around the world helping us build this network and without their contributions we wouldn't be where we are today. Big thank you to all of you!
 
-You can see the core team behind Human Connection [on our website](https://human-connection.org/en/the-team/). On Github you will mostly run into our developers:
+You can talk to our core team on [Discord](https://discord.gg/AJSX9DCSUA). And on Github you will mostly run into our core developers:
-* Robert (@roschaefer)
+
-* Matt (@mattwr18)
+* Ulf (@ulfgebhardt)
+* Moriz (@Mogge)
 * Wolle (@Tirokk)
 * Alex (@ogerly)
+
+<!-- * Robert (@roschaefer)
+* Matt (@mattwr18)
 * Alina (@alina-beck)
 * Martin (@datenbrei), our head of IT
-* and sometimes Dennis (@DennisHack), the founder of Human Connection
+* and sometimes Dennis (@DennisHack), the founder of Human Connection -->
 
 ## Meetings and Pair Programming Sessions
 
 Times below refer to **German Time** – that's CET (GMT+1) in winter and CEST (GMT+2) in summer – because most Human Connection core team members are living in Germany.
 
 Daily standup
-* every Monday–Friday 11:30
+
-* in the discord `Conference Room`
+* every Monday–Thursday 11:30 am (german time see above 👆🏼)
+* in our [Discord](https://discord.gg/AJSX9DCSUA) `Office Cube`
 * all contributors welcome!
 * everybody shares what they are working on and asks for help if they are blocked
 
+<!--
 Regular pair programming sessions
+
 * every Monday, Wednesday and Thursday 15:00
-* the link will be posted in the [discord chat](https://discord.gg/6ub73U3) and on the [Agile Ventures website](https://www.agileventures.org/events?utf8=%E2%9C%93&project_id=220&commit=Filter+by+Project)
+* the link will be posted in the [Discord chat](https://discord.gg/AJSX9DCSUA) and on the [Agile Ventures website](https://www.agileventures.org/events?utf8=%E2%9C%93&project_id=220&commit=Filter+by+Project)
 * all contributors welcome!
 * we team up and work on an issue together (often using Visual Studio live sharing sessions)
 
 Open-Source Community Meeting
+
 * bi-weekly on Mondays 13:00 (when there is no sprint retrospective)
-* the link will be posted in the [discord chat](https://discord.gg/6ub73U3) and on the [Agile Ventures website](https://www.agileventures.org/events?utf8=%E2%9C%93&project_id=220&commit=Filter+by+Project)
+* the link will be posted in the [Discord chat](https://discord.gg/AJSX9DCSUA) and on the [Agile Ventures website](https://www.agileventures.org/events?utf8=%E2%9C%93&project_id=220&commit=Filter+by+Project)
 * all contributors welcome!
 
 Meet the team
+
 * every Monday 21:00 (at the moment only in German)
 * details here https://human-connection.org/veranstaltungen/
 * via this [zoom link](https://zoom.us/j/936943532)
@@ -76,6 +87,7 @@ Meet the team
 * users of the network chat with the Human Connection team and discuss current questions and issues
 
 Sprint planning
+
 * bi-weekly on Tuesday 13:00
 * via this [zoom link](https://zoom.us/j/7743582385)
 * all contributors welcome (recommended for those who want to work on an issue in this sprint)
@@ -87,6 +99,7 @@ Sprint retrospective
 * via this [zoom link](https://zoom.us/j/7743582385)
 * all contributors welcome (most interesting for those who participated in the sprint)
 * we review the past sprint and talk about what went well and what we could improve
+-->
 
 ## Philosophy
 
@@ -102,10 +115,9 @@ We use pair programming sessions as a tool for knowledge sharing. We can learn a
 
 As a volunteeer you have no commitment except your own self development and your awesomeness by contributing to this free and open-source software project. Cheers to you!
 
-
 ## Open-Source Bounties
 
-There are so many good reasons to contribute to Human Connection
+There are so many good reasons to contribute to ocelot.social
 
 * You learn state-of-the-art technologies
 * You build your portfolio
@@ -121,7 +133,7 @@ pull request approved and merged for free**. You can choose something really
 quick and easy. What's important is starting a working relationship with the
 team, learning the workflow, and understanding this contribution guide. You can
 filter issues by 'good first issue', to get an idea where to start. Please join
-our our [community chat](https://human-connection.org/discord), too.
+our our [Discord community chat](https://discord.gg/AJSX9DCSUA), too.
 
 You can filter Github issues with label [bounty](https://github.com/Ocelot-Social-Community/Ocelot-Social/issues?q=is%3Aopen+is%3Aissue+label%3Abounty). These issues should have a second label `€<amount>`
 which indicate their respective financial compensation in Euros.

README.md

@@ -31,6 +31,7 @@ Logins:
 ## Directory Layout
 
 There are four important directories:
+
 * [Backend](./backend) runs on the server and is a middleware between database and frontend
 * [Frontend](./webapp) is a server-side-rendered and client-side-rendered web frontend
 * [Cypress](./cypress) contains end-to-end tests and executable feature specifications
@@ -46,16 +47,19 @@ There are two approaches:
 ## Installation
 
 ### Clone the Repository
+
 Clone the repository, this will create a new folder called `Ocelot-Social`:
 
 Using HTTPS:
+
 ```bash
 $ git clone https://github.com/Ocelot-Social-Community/Ocelot-Social.git
 ```
 
 Using SSH:
+
 ```bash
-$ git clone git@github.com:Human-Connection/Human-Connection.git
+$ git clone git@github.com:Ocelot-Social-Community/Ocelot-Social.git
 ```
 
 Change into the new folder.
@@ -88,13 +92,15 @@ docker-compose version 1.23.2
 #### Start Ocelot-Social via Docker-Compose
 
 For Development:
+
 ```bash
-docker-compose up
+$ docker-compose up
 ```
 
-For Production
+For Production:
+
 ```bash
-docker-compose -f docker-compose.yml up
+$ docker-compose -f docker-compose.yml up
 ```
 
 This will start all required Docker containers
@@ -107,12 +113,12 @@ The only deployment method in this repository is `docker-compose` for developmen
 
 ## Developer Chat
 
-Join our friendly open-source community on [Discord](https://discordapp.com/invite/DFSjPaX) :heart_eyes_cat:
+Join our friendly open-source community on [Discord](https://discord.gg/AJSX9DCSUA) :heart_eyes_cat:
 Just introduce yourself at `#introduce-yourself` and mention `@@Mentor` to get you onboard :neckbeard:
 Check out the [contribution guideline](./CONTRIBUTING.md), too!
 
 We give write permissions to every developer who asks for it. Just text us on
-[Discord](https://discord.gg/6ub73U3).
+[Discord](https://discord.gg/AJSX9DCSUA).
 
 ## Technology Stack
 
@@ -131,4 +137,5 @@ Browser compatibility testing with [BrowserStack](https://www.browserstack.com/)
 <img alt="BrowserStack Logo" src=".gitbook/assets/browserstack-logo.svg" width="256">
 
 ## License
+
 See the [LICENSE](LICENSE.md) file for license rights and limitations (MIT).

backend/src/config/links.js

@@ -1,7 +1,13 @@
 // this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding
 export default {
   ORGANIZATION: 'https://ocelot.social',
-  DONATE: 'https://ocelot-social.herokuapp.com/donations',
-  FAQ: 'https://ocelot.social',
   SUPPORT: 'https://ocelot.social',
+
+  // on null or empty strings internal imprint is used, see 'webapp/locales/html/'
+  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',
 }

webapp/components/PageFooter/PageFooter.spec.js

@@ -1,6 +1,6 @@
 import { config, mount } from '@vue/test-utils'
 import PageFooter from './PageFooter.vue'
-import links from '~/constants/links.js'
+import linksDefault from '~/constants/links.js'
 
 const localVue = global.localVue
 
@@ -8,6 +8,7 @@ config.stubs['nuxt-link'] = '<span class="nuxt-link"><slot /></span>'
 
 describe('PageFooter.vue', () => {
   let mocks
+  let wrapper
 
   beforeEach(() => {
     mocks = {
@@ -15,30 +16,118 @@ describe('PageFooter.vue', () => {
       $env: {
         VERSION: 'v1.0.0',
       },
-      links,
     }
   })
 
   describe('mount', () => {
-    let wrapper
     const Wrapper = () => {
       return mount(PageFooter, { mocks, localVue })
     }
 
-    beforeEach(() => {
+    describe('links.js', () => {
-      wrapper = Wrapper()
+      beforeEach(() => {
+        wrapper = Wrapper()
+      })
+
+      it('renders four links', () => {
+        expect(wrapper.findAll('a')).toHaveLength(4)
+      })
+
+      it('renders three nuxt-links', () => {
+        expect(wrapper.findAll('.nuxt-link')).toHaveLength(3)
+      })
+
+      it('renders version', () => {
+        expect(wrapper.find('.ds-footer').text()).toContain('v1.0.0')
+      })
     })
 
-    it('renders three links', () => {
+    describe('inflexible links', () => {
-      expect(wrapper.findAll('a')).toHaveLength(3)
+      beforeEach(() => {
+        wrapper = Wrapper()
+      })
+
+      it('renders ORGANIZATION', () => {
+        expect(wrapper.find('a[data-test="organization-link"]').exists()).toBe(true)
+      })
+
+      it('renders version', () => {
+        expect(wrapper.find('a[data-test="version-link"]').exists()).toBe(true)
+      })
     })
 
-    it('renders four nuxt-links', () => {
+    describe('flexible links not set', () => {
-      expect(wrapper.findAll('.nuxt-link')).toHaveLength(4)
+      beforeEach(async () => {
+        const links = {
+          ...linksDefault,
+          IMPRINT: null,
+          TERMS_AND_CONDITIONS: null,
+          CODE_OF_CONDUCT: null,
+          DATA_PRIVACY: null,
+          FAQ: null,
+        }
+        wrapper = Wrapper()
+        wrapper.setData({ links })
+        await wrapper.vm.$nextTick()
+      })
+
+      it('renders IMPRINT as nuxt-link', () => {
+        expect(wrapper.find('span[data-test="imprint-nuxt-link"]').exists()).toBe(true)
+      })
+
+      it('renders TERMS_AND_CONDITIONS as nuxt-link', () => {
+        expect(wrapper.find('span[data-test="terms-nuxt-link"]').exists()).toBe(true)
+      })
+
+      it('renders CODE_OF_CONDUCT as nuxt-link', () => {
+        expect(wrapper.find('span[data-test="code-nuxt-link"]').exists()).toBe(true)
+      })
+
+      it('renders DATA_PRIVACY as nuxt-link', () => {
+        expect(wrapper.find('span[data-test="data-nuxt-link"]').exists()).toBe(true)
+      })
+
+      it('renders FAQ as nuxt-link', () => {
+        expect(wrapper.find('span[data-test="faq-nuxt-link"]').exists()).toBe(true)
+      })
     })
 
-    it('renders version', () => {
+    describe('flexible links set', () => {
-      expect(wrapper.find('.ds-footer').text()).toContain('v1.0.0')
+      beforeEach(async () => {
+        const links = {
+          ...linksDefault,
+          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',
+        }
+        wrapper = Wrapper()
+        wrapper.setData({ links })
+        await wrapper.vm.$nextTick()
+      })
+
+      it('renders IMPRINT as "a" tag link', () => {
+        expect(wrapper.find(`a[href="https://ocelot.social/IMPRINT"]`).exists()).toBe(true)
+      })
+
+      it('renders TERMS_AND_CONDITIONS as "a" tag link', () => {
+        expect(wrapper.find(`a[href="https://ocelot.social/TERMS_AND_CONDITIONS"]`).exists()).toBe(
+          true,
+        )
+      })
+
+      it('renders CODE_OF_CONDUCT as "a" tag link', () => {
+        expect(wrapper.find(`a[href="https://ocelot.social/CODE_OF_CONDUCT"]`).exists()).toBe(true)
+      })
+
+      it('renders DATA_PRIVACY as "a" tag link', () => {
+        expect(wrapper.find(`a[href="https://ocelot.social/DATA_PRIVACY"]`).exists()).toBe(true)
+      })
+
+      it('renders FAQ as "a" tag link', () => {
+        expect(wrapper.find(`a[href="https://ocelot.social/FAQ"]`).exists()).toBe(true)
+      })
     })
   })
 })

webapp/components/PageFooter/PageFooter.vue

@@ -1,26 +1,67 @@
 <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" data-test="organization-link">
+      {{ $t('site.made') }}
+    </a>
     <span>-</span>
-    <nuxt-link to="/imprint">
+    <!-- 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>
-    <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"
+      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>
-    <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"
+      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>
-    <nuxt-link to="/data-privacy">
+    <!-- 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>
-    <a :href="links.FAQ" target="_blank">
+    <!-- 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>
+    <!-- version -->
     <a
       href="https://github.com/Ocelot-Social-Community/Ocelot-Social/blob/master/CHANGELOG.md"
       target="_blank"
+      data-test="version-link"
     >
       {{ version }}
     </a>
@@ -29,10 +70,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>
 

webapp/constants/links.js

@@ -1,7 +1,13 @@
 // this file is duplicated in `backend/src/config/links.js` and `webapp/constants/links.js` and replaced on rebranding
 export default {
   ORGANIZATION: 'https://ocelot.social',
-  DONATE: 'https://ocelot-social.herokuapp.com/donations',
-  FAQ: 'https://ocelot.social',
   SUPPORT: 'https://ocelot.social',
+
+  // on null or empty strings internal imprint is used, see 'webapp/locales/html/'
+  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',
 }

webapp/locales/de.json

@@ -771,7 +771,7 @@
     "faq": "FAQ",
     "germany": "Deutschland",
     "imprint": "Impressum",
-    "made": "Mit ❤ 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)",

webapp/locales/en.json

@@ -771,7 +771,7 @@
     "faq": "FAQ",
     "germany": "Germany",
     "imprint": "Imprint",
-    "made": "Made with ❤",
+    "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:",

webapp/locales/es.json

@@ -694,7 +694,7 @@
     "faq": "Preguntas más frecuentes",
     "germany": "Alemania",
     "imprint": "Pie de imprenta",
-    "made": "Hecho con ❤",
+    "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)",

webapp/locales/fr.json

@@ -662,7 +662,7 @@
     "faq": "FAQ",
     "germany": "Allemagne",
     "imprint": "Mentions légales",
-    "made": "Fabriqué avec ❤",
+    "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)",

webapp/locales/html/de/code-of-conduct.html

@@ -1 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
 <p>Ich bin der Inhalt vom Verhaltenskodex</p>

webapp/locales/html/de/data-privacy.html

@@ -1 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
 <p>Das hier wäre der Inhalt der Datenschutzbestimmungen</p>

webapp/locales/html/de/faq.html

@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>Hier stehen die FAQs</p>

webapp/locales/html/de/imprint.html

@@ -1 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
 <p>Ich bin das Impressum</p>

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,
 }

webapp/locales/html/de/terms-and-conditions.html

@@ -1 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
 <p>Ich bin der Inhalt der Seite "Nutzungsbedingungen"</p>

webapp/locales/html/en/code-of-conduct.html

@@ -1 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
 <p>I am the content of the code of conduct</p>

webapp/locales/html/en/data-privacy.html

@@ -1 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
 <p>This would be our data privacy section</p>

webapp/locales/html/en/faq.html

@@ -0,0 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
+<p>Here are the FAQs</p>

webapp/locales/html/en/imprint.html

@@ -1 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
 <p>I am the imprint</p>

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,
 }

webapp/locales/html/en/terms-and-conditions.html

@@ -1 +1,3 @@
+<!-- this file is replaced on rebranding -->
+
 <p>I am the content of the page "terms and conditions"<p>

webapp/locales/it.json

@@ -612,7 +612,7 @@
     "faq": null,
     "germany": "Germania",
     "imprint": "Impressum",
-    "made": "Con ❤ 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)",

webapp/locales/nl.json

@@ -165,7 +165,7 @@
     "director": "Directeur",
     "germany": "Duitsland",
     "imprint": "Afdruk",
-    "made": "Met ❤ 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).",

webapp/locales/pl.json

@@ -350,7 +350,7 @@
     "director": "Dyrektor zarządzający",
     "germany": "Niemcy",
     "imprint": "Nadruk",
-    "made": "Z ❤ 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)",

webapp/locales/pt.json

@@ -647,7 +647,7 @@
     "faq": "FAQ",
     "germany": "Alemanha",
     "imprint": "Impressão",
-    "made": "Feito com ❤",
+    "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)",

webapp/locales/ru.json

@@ -694,7 +694,7 @@
     "faq": "ЧаВо (FAQ)",
     "germany": "Германия",
     "imprint": "Импрессум",
-    "made": "Сделано с ❤",
+    "made": "Сделано с ❤️",
     "register": "Регистрационный номер",
     "responsible": "ответственный за содержание этой страницы (§ 55 Abs. 2 RStV)",
     "taxident": "UST-ID. в соответствии с §27a Закона о налоге с продаж Германии:",

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>

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>

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')
+    })
+  })
+})

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>

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>

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>