From 7fdabd9ac4548bf22c93a02329796d0423162f7f Mon Sep 17 00:00:00 2001
From: gha-gozu <ghazwan.sihamudin@gmail.com>
Date: Sun, 18 Aug 2019 21:04:56 +0700
Subject: [PATCH 01/14] fix(header-alignment): Fix logo and locale position.

---
 docker-compose.yml         |  2 +-
 webapp/layouts/default.vue | 26 ++++++++++++--------------
 2 files changed, 13 insertions(+), 15 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 45e2cdfdf..5369eb825 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,7 +47,7 @@ services:
     networks:
       - hc-network
     ports:
-      - 80:80
+      - 8001:8001
 
 networks:
   hc-network:
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index ac7917792..a669db584 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -3,8 +3,8 @@
     <div class="main-navigation">
       <ds-container class="main-navigation-container" style="padding: 10px 10px;">
         <div>
-          <ds-flex class="main-navigation-flex" centered>
-            <ds-flex-item :width="{ lg: '3.5%' }" />
+          <ds-flex class="main-navigation-flex">
+            <ds-flex-item :width="{ lg: '30%' }" />
             <ds-flex-item :width="{ base: '80%', sm: '80%', md: '80%', lg: '15%' }">
               <nuxt-link :to="{ name: 'index' }">
                 <ds-logo />
@@ -17,7 +17,7 @@
               <ds-button icon="bars" @click="toggleMobileMenuView" right />
             </ds-flex-item>
             <ds-flex-item
-              :width="{ base: '85%', sm: '85%', md: '50%', lg: '50%' }"
+              :width="{ base: '85%', sm: '85%', md: '50%', lg: '20%' }"
               :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
             >
               <div id="nav-search-box" v-if="isLoggedIn">
@@ -88,9 +88,11 @@
                           {{ $t('login.hello') }}
                           <b>{{ userName }}</b>
                           <template v-if="user.role !== 'user'">
-                            <ds-text color="softer" size="small" style="margin-bottom: 0">
-                              {{ user.role | camelCase }}
-                            </ds-text>
+                            <ds-text
+                              color="softer"
+                              size="small"
+                              style="margin-bottom: 0"
+                            >{{ user.role | camelCase }}</ds-text>
                           </template>
                           <hr />
                           <ds-menu :routes="routes" :matcher="matcher">
@@ -129,14 +131,10 @@
     <div id="footer" class="ds-footer">
       <a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a>
       &nbsp;-&nbsp;
-      <nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link>
-      &nbsp;‑&nbsp;
-      <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>
-      &nbsp;‑&nbsp;
-      <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>
-      &nbsp;‑&nbsp;
-      <nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link>
-      &nbsp;‑&nbsp;
+      <nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link>&nbsp;‑&nbsp;
+      <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>&nbsp;‑&nbsp;
+      <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>&nbsp;‑&nbsp;
+      <nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link>&nbsp;‑&nbsp;
       <nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link>
     </div>
     <div id="overlay" />

From a751a107831db9ba69abe1c2f78956c14d59098f Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Tue, 3 Sep 2019 14:02:46 +0100
Subject: [PATCH 02/14] update login page to use blank layout

---
 docker-compose.yml         | 2 +-
 webapp/layouts/default.vue | 2 +-
 webapp/pages/login.vue     | 2 +-
 3 files changed, 3 insertions(+), 3 deletions(-)

diff --git a/docker-compose.yml b/docker-compose.yml
index 5369eb825..45e2cdfdf 100644
--- a/docker-compose.yml
+++ b/docker-compose.yml
@@ -47,7 +47,7 @@ services:
     networks:
       - hc-network
     ports:
-      - 8001:8001
+      - 80:80
 
 networks:
   hc-network:
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index a669db584..e665e7d8a 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -17,7 +17,7 @@
               <ds-button icon="bars" @click="toggleMobileMenuView" right />
             </ds-flex-item>
             <ds-flex-item
-              :width="{ base: '85%', sm: '85%', md: '50%', lg: '20%' }"
+              :width="{ base: '85%', sm: '85%', md: '50%', lg: '50%' }"
               :class="{ 'hide-mobile-menu': !toggleMobileMenu }"
             >
               <div id="nav-search-box" v-if="isLoggedIn">
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index 65b1eb49c..b53e56446 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -81,7 +81,7 @@ export default {
   components: {
     LocaleSwitch,
   },
-  layout: 'default',
+  layout: 'blank',
   data() {
     return {
       ready: false,

From 6589fe10af9d5faa9f9c2d51e534466d62f39bea Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Tue, 3 Sep 2019 14:58:34 +0100
Subject: [PATCH 03/14] WIP - refactor of blank layout to have header and
 footer

---
 webapp/layouts/blank.vue        | 38 +++++++++++++++++++++++++++++++++
 webapp/pages/logout.vue         |  2 +-
 webapp/pages/password-reset.vue |  2 +-
 3 files changed, 40 insertions(+), 2 deletions(-)

diff --git a/webapp/layouts/blank.vue b/webapp/layouts/blank.vue
index 81d25a5ca..c5a57171f 100644
--- a/webapp/layouts/blank.vue
+++ b/webapp/layouts/blank.vue
@@ -1,18 +1,56 @@
 <template>
   <div class="layout-blank">
+    <div class="main-navigation">
+      <ds-container class="main-navigation-container" style="padding: 10px 10px;">
+        <ds-flex style="flex: auto; flex-direction: row;">
+          <ds-flex-item>
+            <a @click="redirectToRoot">
+              <ds-logo />
+            </a>
+          </ds-flex-item>
+          <ds-flex-item style="width:50px;">
+            <client-only>
+              <locale-switch class="topbar-locale-switch" placement="top" offset="16" />
+            </client-only>
+          </ds-flex-item>
+        </ds-flex>
+      </ds-container>
+    </div>
     <ds-container>
       <div style="padding: 5rem 2rem;">
         <nuxt />
       </div>
     </ds-container>
+    <div id="footer" class="ds-footer">
+      <a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a>
+      &nbsp;-&nbsp;
+      <nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link>
+      &nbsp;‑&nbsp;
+      <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>
+      &nbsp;‑&nbsp;
+      <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>
+      &nbsp;‑&nbsp;
+      <nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link>
+      &nbsp;‑&nbsp;
+      <nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link>
+    </div>
     <div id="overlay" />
   </div>
 </template>
 
 <script>
+import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import seo from '~/mixins/seo'
 
 export default {
+  components: {
+    LocaleSwitch,
+  },
   mixins: [seo],
+  methods: {
+    redirectToRoot() {
+      this.$router.replace('/')
+    },
+  },
 }
 </script>
diff --git a/webapp/pages/logout.vue b/webapp/pages/logout.vue
index 6562410cd..88bf755a3 100644
--- a/webapp/pages/logout.vue
+++ b/webapp/pages/logout.vue
@@ -15,7 +15,7 @@
 
 <script>
 export default {
-  layout: 'default',
+  layout: 'blank',
   async beforeCreate() {
     await this.$store.dispatch('auth/logout')
     this.$router.replace('/')
diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue
index a781bd3fb..879042cf5 100644
--- a/webapp/pages/password-reset.vue
+++ b/webapp/pages/password-reset.vue
@@ -12,7 +12,7 @@
 
 <script>
 export default {
-  layout: 'default',
+  layout: 'blank',
   asyncData({ store, redirect }) {
     if (store.getters['auth/isLoggedIn']) {
       redirect('/')

From e0fec965dc6ee1c774cba4c123dde1f96b74da7d Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Tue, 3 Sep 2019 16:33:15 +0100
Subject: [PATCH 04/14] improved navigation layout when not logged in, moved
 locale selector to nav on login page

---
 webapp/layouts/blank.vue              |  9 +++++----
 webapp/pages/changelog.vue            |  2 +-
 webapp/pages/code-of-conduct.vue      |  1 +
 webapp/pages/data-privacy.vue         |  2 +-
 webapp/pages/imprint.vue              |  1 +
 webapp/pages/login.vue                | 14 ++------------
 webapp/pages/registration.vue         |  2 +-
 webapp/pages/terms-and-conditions.vue |  2 +-
 8 files changed, 13 insertions(+), 20 deletions(-)

diff --git a/webapp/layouts/blank.vue b/webapp/layouts/blank.vue
index c5a57171f..37df16a05 100644
--- a/webapp/layouts/blank.vue
+++ b/webapp/layouts/blank.vue
@@ -1,14 +1,15 @@
 <template>
   <div class="layout-blank">
     <div class="main-navigation">
-      <ds-container class="main-navigation-container" style="padding: 10px 10px;">
-        <ds-flex style="flex: auto; flex-direction: row;">
-          <ds-flex-item>
+      <ds-container width="x-large" class="main-navigation-container" style="padding: 10px 10px;">
+        <ds-flex class="main-navigation-flex" centered>
+          <ds-flex-item width="5.5%" />
+          <ds-flex-item style="flex-grow:1;" width="20%">
             <a @click="redirectToRoot">
               <ds-logo />
             </a>
           </ds-flex-item>
-          <ds-flex-item style="width:50px;">
+          <ds-flex-item width="20%" style="flex-grow:0;">
             <client-only>
               <locale-switch class="topbar-locale-switch" placement="top" offset="16" />
             </client-only>
diff --git a/webapp/pages/changelog.vue b/webapp/pages/changelog.vue
index ddaec5962..55896c321 100644
--- a/webapp/pages/changelog.vue
+++ b/webapp/pages/changelog.vue
@@ -76,7 +76,7 @@
 
 <script>
 export default {
-  layout: 'default',
+  layout: 'blank',
   head() {
     return {
       title: this.$t('site.changelog'),
diff --git a/webapp/pages/code-of-conduct.vue b/webapp/pages/code-of-conduct.vue
index 33ecb69ab..b5e732694 100644
--- a/webapp/pages/code-of-conduct.vue
+++ b/webapp/pages/code-of-conduct.vue
@@ -36,6 +36,7 @@
 
 <script>
 export default {
+  layout: 'blank',
   head() {
     return {
       title: this.$t('site.code-of-conduct'),
diff --git a/webapp/pages/data-privacy.vue b/webapp/pages/data-privacy.vue
index c20b29a22..47cc2c2a4 100644
--- a/webapp/pages/data-privacy.vue
+++ b/webapp/pages/data-privacy.vue
@@ -385,7 +385,7 @@
 
 <script>
 export default {
-  layout: 'default',
+  layout: 'blank',
   head() {
     return {
       title: this.$t('site.data-privacy'),
diff --git a/webapp/pages/imprint.vue b/webapp/pages/imprint.vue
index 67e144237..07758c3f1 100644
--- a/webapp/pages/imprint.vue
+++ b/webapp/pages/imprint.vue
@@ -73,6 +73,7 @@
 
 <script>
 export default {
+  layout: 'blank',
   head() {
     return {
       title: this.$t('site.imprint'),
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index b53e56446..9f0f921ee 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -10,9 +10,6 @@
       <ds-card class="login-card">
         <ds-flex gutter="small">
           <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
-            <client-only>
-              <locale-switch class="login-locale-switch" offset="5" />
-            </client-only>
             <ds-space margin-top="small" margin-bottom="xxx-small" centered>
               <img
                 class="login-image"
@@ -53,17 +50,13 @@
                 name="submit"
                 type="submit"
                 icon="sign-in"
-              >
-                {{ $t('login.login') }}
-              </ds-button>
+              >{{ $t('login.login') }}</ds-button>
               <ds-space margin="x-small">
                 <a
                   :href="$t('login.moreInfoURL')"
                   :title="$t('login.moreInfoHint')"
                   target="_blank"
-                >
-                  {{ $t('login.moreInfo') }}
-                </a>
+                >{{ $t('login.moreInfo') }}</a>
               </ds-space>
             </form>
           </ds-flex-item>
@@ -78,9 +71,6 @@ import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
 
 export default {
-  components: {
-    LocaleSwitch,
-  },
   layout: 'blank',
   data() {
     return {
diff --git a/webapp/pages/registration.vue b/webapp/pages/registration.vue
index e75ec03e1..654942869 100644
--- a/webapp/pages/registration.vue
+++ b/webapp/pages/registration.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  layout: 'default',
+  layout: 'blank',
   asyncData({ store, redirect }) {
     if (store.getters['auth/isLoggedIn']) {
       redirect('/')
diff --git a/webapp/pages/terms-and-conditions.vue b/webapp/pages/terms-and-conditions.vue
index 0bd849575..d627e863e 100644
--- a/webapp/pages/terms-and-conditions.vue
+++ b/webapp/pages/terms-and-conditions.vue
@@ -23,7 +23,7 @@
 
 <script>
 export default {
-  layout: 'default',
+  layout: 'blank',
   head() {
     return {
       title: this.$t('site.termsAndConditions'),

From e9ac4628891ffc9eff0583b6bc16d0f738c0c767 Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Thu, 5 Sep 2019 13:58:35 +0100
Subject: [PATCH 05/14] update name of blanks layout to basic layout

---
 webapp/layouts/{blank.vue => basic.vue} | 0
 webapp/pages/changelog.vue              | 2 +-
 webapp/pages/code-of-conduct.vue        | 2 +-
 webapp/pages/data-privacy.vue           | 2 +-
 webapp/pages/imprint.vue                | 2 +-
 webapp/pages/login.vue                  | 2 +-
 webapp/pages/password-reset.vue         | 2 +-
 webapp/pages/registration.vue           | 2 +-
 webapp/pages/terms-and-conditions.vue   | 2 +-
 9 files changed, 8 insertions(+), 8 deletions(-)
 rename webapp/layouts/{blank.vue => basic.vue} (100%)

diff --git a/webapp/layouts/blank.vue b/webapp/layouts/basic.vue
similarity index 100%
rename from webapp/layouts/blank.vue
rename to webapp/layouts/basic.vue
diff --git a/webapp/pages/changelog.vue b/webapp/pages/changelog.vue
index 55896c321..ed3cf58e4 100644
--- a/webapp/pages/changelog.vue
+++ b/webapp/pages/changelog.vue
@@ -76,7 +76,7 @@
 
 <script>
 export default {
-  layout: 'blank',
+  layout: 'basic',
   head() {
     return {
       title: this.$t('site.changelog'),
diff --git a/webapp/pages/code-of-conduct.vue b/webapp/pages/code-of-conduct.vue
index b5e732694..d87747ac8 100644
--- a/webapp/pages/code-of-conduct.vue
+++ b/webapp/pages/code-of-conduct.vue
@@ -36,7 +36,7 @@
 
 <script>
 export default {
-  layout: 'blank',
+  layout: 'basic',
   head() {
     return {
       title: this.$t('site.code-of-conduct'),
diff --git a/webapp/pages/data-privacy.vue b/webapp/pages/data-privacy.vue
index 47cc2c2a4..021fe5b78 100644
--- a/webapp/pages/data-privacy.vue
+++ b/webapp/pages/data-privacy.vue
@@ -385,7 +385,7 @@
 
 <script>
 export default {
-  layout: 'blank',
+  layout: 'basic',
   head() {
     return {
       title: this.$t('site.data-privacy'),
diff --git a/webapp/pages/imprint.vue b/webapp/pages/imprint.vue
index 07758c3f1..657d0e651 100644
--- a/webapp/pages/imprint.vue
+++ b/webapp/pages/imprint.vue
@@ -73,7 +73,7 @@
 
 <script>
 export default {
-  layout: 'blank',
+  layout: 'basic',
   head() {
     return {
       title: this.$t('site.imprint'),
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index 9f0f921ee..f8a3e4565 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -71,7 +71,7 @@ import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
 
 export default {
-  layout: 'blank',
+  layout: 'basic',
   data() {
     return {
       ready: false,
diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue
index 879042cf5..9b955747f 100644
--- a/webapp/pages/password-reset.vue
+++ b/webapp/pages/password-reset.vue
@@ -12,7 +12,7 @@
 
 <script>
 export default {
-  layout: 'blank',
+  layout: 'basic',
   asyncData({ store, redirect }) {
     if (store.getters['auth/isLoggedIn']) {
       redirect('/')
diff --git a/webapp/pages/registration.vue b/webapp/pages/registration.vue
index 654942869..08ca0a682 100644
--- a/webapp/pages/registration.vue
+++ b/webapp/pages/registration.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  layout: 'blank',
+  layout: 'basic',
   asyncData({ store, redirect }) {
     if (store.getters['auth/isLoggedIn']) {
       redirect('/')
diff --git a/webapp/pages/terms-and-conditions.vue b/webapp/pages/terms-and-conditions.vue
index d627e863e..6b470b6f4 100644
--- a/webapp/pages/terms-and-conditions.vue
+++ b/webapp/pages/terms-and-conditions.vue
@@ -23,7 +23,7 @@
 
 <script>
 export default {
-  layout: 'blank',
+  layout: 'basic',
   head() {
     return {
       title: this.$t('site.termsAndConditions'),

From 5d73cad1688cbcd64bf2903eb9126353ea0ee732 Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Thu, 5 Sep 2019 14:17:59 +0100
Subject: [PATCH 06/14] refactor page footer to component

---
 webapp/components/PageFooter/PageFooter.vue | 15 +++++++++++++++
 webapp/layouts/basic.vue                    | 16 +++-------------
 webapp/layouts/default.vue                  | 13 ++++---------
 3 files changed, 22 insertions(+), 22 deletions(-)
 create mode 100644 webapp/components/PageFooter/PageFooter.vue

diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
new file mode 100644
index 000000000..d89739fcd
--- /dev/null
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -0,0 +1,15 @@
+<template>
+  <div id="footer" class="ds-footer">
+    <a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a>
+    &nbsp;-&nbsp;
+    <nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link>
+    &nbsp;‑&nbsp;
+    <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>
+    &nbsp;‑&nbsp;
+    <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>
+    &nbsp;‑&nbsp;
+    <nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link>
+    &nbsp;‑&nbsp;
+    <nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link>
+  </div>
+</template>
diff --git a/webapp/layouts/basic.vue b/webapp/layouts/basic.vue
index 37df16a05..6766390d2 100644
--- a/webapp/layouts/basic.vue
+++ b/webapp/layouts/basic.vue
@@ -22,19 +22,7 @@
         <nuxt />
       </div>
     </ds-container>
-    <div id="footer" class="ds-footer">
-      <a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a>
-      &nbsp;-&nbsp;
-      <nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link>
-      &nbsp;‑&nbsp;
-      <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>
-      &nbsp;‑&nbsp;
-      <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>
-      &nbsp;‑&nbsp;
-      <nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link>
-      &nbsp;‑&nbsp;
-      <nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link>
-    </div>
+    <page-footer></page-footer>
     <div id="overlay" />
   </div>
 </template>
@@ -42,10 +30,12 @@
 <script>
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import seo from '~/mixins/seo'
+import PageFooter from '~/components/PageFooter/PageFooter'
 
 export default {
   components: {
     LocaleSwitch,
+    PageFooter,
   },
   mixins: [seo],
   methods: {
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index e665e7d8a..cc15fcfc3 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -128,15 +128,7 @@
         <nuxt />
       </div>
     </ds-container>
-    <div id="footer" class="ds-footer">
-      <a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a>
-      &nbsp;-&nbsp;
-      <nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link>&nbsp;‑&nbsp;
-      <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>&nbsp;‑&nbsp;
-      <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>&nbsp;‑&nbsp;
-      <nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link>&nbsp;‑&nbsp;
-      <nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link>
-    </div>
+    <page-footer />
     <div id="overlay" />
     <client-only>
       <modal />
@@ -155,6 +147,8 @@ import HcAvatar from '~/components/Avatar/Avatar.vue'
 import seo from '~/mixins/seo'
 import FilterPosts from '~/components/FilterPosts/FilterPosts.vue'
 import CategoryQuery from '~/graphql/CategoryQuery.js'
+import PageFooter from '~/components/PageFooter/PageFooter'
+
 export default {
   components: {
     Dropdown,
@@ -164,6 +158,7 @@ export default {
     NotificationMenu,
     HcAvatar,
     FilterPosts,
+    PageFooter,
   },
   mixins: [seo],
   data() {

From f4b3c84815ae8bdd618c8958ff091dadb16bcae4 Mon Sep 17 00:00:00 2001
From: Vasily Belolapotkov <belolapotkov.v@gmail.com>
Date: Fri, 6 Sep 2019 09:29:06 +0300
Subject: [PATCH 07/14] moved footer styles into footer component and added
 shadow

---
 webapp/components/PageFooter/PageFooter.vue | 13 +++++++++++++
 webapp/layouts/default.vue                  |  9 ---------
 2 files changed, 13 insertions(+), 9 deletions(-)

diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
index d89739fcd..d90f08b11 100644
--- a/webapp/components/PageFooter/PageFooter.vue
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -13,3 +13,16 @@
     <nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link>
   </div>
 </template>
+
+<style lang="scss">
+.ds-footer {
+  text-align: center;
+  position: fixed;
+  bottom: 0px;
+  z-index: 10;
+  background-color: white;
+  width: 100%;
+  padding: 10px 10px;
+  box-shadow: 0px -6px 12px -4px rgba(0, 0, 0, 0.1);
+}
+</style>
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index cc15fcfc3..e9a4e8d4e 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -339,13 +339,4 @@ export default {
     display: none;
   }
 }
-.ds-footer {
-  text-align: center;
-  position: fixed;
-  bottom: 0px;
-  z-index: 10;
-  background-color: white;
-  width: 100%;
-  padding: 10px 10px;
-}
 </style>

From ea16d1652ab5a18170ee2282ff8a3922d125b1f3 Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Sat, 7 Sep 2019 09:51:27 +0100
Subject: [PATCH 08/14] used no header for login and password reset pages

- added locale switch back on login
- added locale switch to password reset
- increased width of login and password reset
- added logo to password reset

- co-authored-by: mattwr18 <mattwr18@gmail.com>
- co-authored-by: mikeaono <aonomike@gmail.com>
---
 webapp/components/PasswordReset/Request.vue | 113 +++++++++++++-------
 webapp/layouts/no-header.vue                |  29 +++++
 webapp/pages/login.vue                      |  11 +-
 webapp/pages/password-reset.vue             |   5 +-
 4 files changed, 113 insertions(+), 45 deletions(-)
 create mode 100644 webapp/layouts/no-header.vue

diff --git a/webapp/components/PasswordReset/Request.vue b/webapp/components/PasswordReset/Request.vue
index 8ca2da89b..ff2d0206d 100644
--- a/webapp/components/PasswordReset/Request.vue
+++ b/webapp/components/PasswordReset/Request.vue
@@ -1,58 +1,75 @@
 <template>
   <ds-card class="password-reset">
-    <ds-space margin="large">
-      <ds-form
-        v-if="!submitted"
-        @input="handleInput"
-        @input-valid="handleInputValid"
-        v-model="formData"
-        :schema="formSchema"
-        @submit="handleSubmit"
-      >
-        <ds-input
-          :placeholder="$t('login.email')"
-          type="email"
-          id="email"
-          model="email"
-          name="email"
-          icon="envelope"
-        />
-        <ds-space margin-botton="large">
-          <ds-text>
-            {{ $t('password-reset.form.description') }}
-          </ds-text>
+    <ds-flex gutter="small">
+      <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
+        <client-only>
+          <locale-switch class="login-locale-switch" offset="5" />
+        </client-only>
+        <ds-space margin-top="small" margin-bottom="xxx-small" centered>
+          <img class="login-image" alt="Human Connection" src="/img/sign-up/humanconnection.svg" />
         </ds-space>
-        <ds-button
-          :disabled="disabled"
-          :loading="$apollo.loading"
-          primary
-          fullwidth
-          name="submit"
-          type="submit"
-          icon="envelope"
+      </ds-flex-item>
+      <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
+        <ds-space margin="small">
+          <ds-text size="small">{{ $t('login.copy') }}</ds-text>
+        </ds-space>
+        <ds-form
+          v-if="!submitted"
+          @input="handleInput"
+          @input-valid="handleInputValid"
+          v-model="formData"
+          :schema="formSchema"
+          @submit="handleSubmit"
         >
-          {{ $t('password-reset.form.submit') }}
-        </ds-button>
-      </ds-form>
-      <div v-else>
-        <transition name="ds-transition-fade">
-          <ds-flex centered>
-            <sweetalert-icon icon="info" />
-          </ds-flex>
-        </transition>
-        <ds-text v-html="submitMessage" />
-      </div>
-    </ds-space>
+          <ds-input
+            :placeholder="$t('login.email')"
+            type="email"
+            id="email"
+            model="email"
+            name="email"
+            icon="envelope"
+          />
+          <ds-space margin-botton="large">
+            <ds-text>
+              {{ $t('password-reset.form.description') }}
+            </ds-text>
+          </ds-space>
+          <ds-button
+            :disabled="disabled"
+            :loading="$apollo.loading"
+            primary
+            fullwidth
+            name="submit"
+            type="submit"
+            icon="envelope"
+          >
+            {{ $t('password-reset.form.submit') }}
+          </ds-button>
+        </ds-form>
+        <div v-else>
+          <transition name="ds-transition-fade">
+            <ds-flex centered>
+              <sweetalert-icon icon="info" />
+            </ds-flex>
+          </transition>
+          <ds-text v-html="submitMessage" />
+        </div>
+      </ds-flex-item>
+    </ds-flex>
+
+    <ds-space margin="x-small"></ds-space>
   </ds-card>
 </template>
 
 <script>
 import gql from 'graphql-tag'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
+import LocaleSwitch from '../LocaleSwitch/LocaleSwitch'
 
 export default {
   components: {
     SweetalertIcon,
+    LocaleSwitch,
   },
   data() {
     return {
@@ -105,3 +122,17 @@ export default {
   },
 }
 </script>
+<style>
+.login-image {
+  width: 90%;
+  max-width: 200px;
+}
+.password-reset {
+  position: relative;
+}
+.login-locale-switch {
+  position: absolute;
+  top: 1em;
+  left: 1em;
+}
+</style>
diff --git a/webapp/layouts/no-header.vue b/webapp/layouts/no-header.vue
new file mode 100644
index 000000000..96f921d36
--- /dev/null
+++ b/webapp/layouts/no-header.vue
@@ -0,0 +1,29 @@
+<template>
+  <div class="layout-blank">
+    <ds-container>
+      <div style="padding: 5rem 2rem;">
+        <nuxt />
+      </div>
+    </ds-container>
+    <page-footer />
+    <div id="overlay" />
+  </div>
+</template>
+
+<script>
+import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
+import seo from '~/mixins/seo'
+import PageFooter from '~/components/PageFooter/PageFooter'
+
+export default {
+  components: {
+    PageFooter,
+  },
+  mixins: [seo],
+  methods: {
+    redirectToRoot() {
+      this.$router.replace('/')
+    },
+  },
+}
+</script>
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index f8a3e4565..fe5ef983f 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -1,6 +1,6 @@
 <template>
   <transition name="fade" appear>
-    <ds-container v-if="ready" width="small">
+    <ds-container v-if="ready" width="medium">
       <ds-space margin="small">
         <blockquote>
           <p>{{ $t('quotes.african.quote') }}</p>
@@ -10,6 +10,9 @@
       <ds-card class="login-card">
         <ds-flex gutter="small">
           <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
+            <client-only>
+              <locale-switch class="login-locale-switch" offset="5" />
+            </client-only>
             <ds-space margin-top="small" margin-bottom="xxx-small" centered>
               <img
                 class="login-image"
@@ -69,9 +72,13 @@
 <script>
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
+import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 
 export default {
-  layout: 'basic',
+  layout: 'no-header',
+  components: {
+    LocaleSwitch,
+  },
   data() {
     return {
       ready: false,
diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue
index 9b955747f..76590d62b 100644
--- a/webapp/pages/password-reset.vue
+++ b/webapp/pages/password-reset.vue
@@ -1,5 +1,5 @@
 <template>
-  <ds-container width="small">
+  <ds-container width="medium">
     <ds-flex>
       <ds-flex-item :width="{ base: '100%' }" centered>
         <ds-space style="text-align: center;" margin-top="small" margin-bottom="xxx-small" centered>
@@ -11,8 +11,9 @@
 </template>
 
 <script>
+
 export default {
-  layout: 'basic',
+  layout: 'no-header',
   asyncData({ store, redirect }) {
     if (store.getters['auth/isLoggedIn']) {
       redirect('/')

From 53408f4bf4c8a6fa4873b68eac1a9dd089e7b5f2 Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Sat, 7 Sep 2019 13:09:10 +0100
Subject: [PATCH 09/14] refactor create-user-account to have no header

- also added locale switch to card
---
 .../Registration/CreateUserAccount.vue        | 35 +++++++++++++------
 webapp/pages/registration.vue                 |  2 +-
 2 files changed, 25 insertions(+), 12 deletions(-)

diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index 9e4d899e7..532b3d91a 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -3,9 +3,11 @@
     <ds-card v-if="success" class="success">
       <ds-space>
         <sweetalert-icon icon="success" />
-        <ds-text align="center" bold color="success">
-          {{ $t('registration.create-user-account.success') }}
-        </ds-text>
+        <ds-text
+          align="center"
+          bold
+          color="success"
+        >{{ $t('registration.create-user-account.success') }}</ds-text>
       </ds-space>
     </ds-card>
     <ds-form
@@ -16,7 +18,10 @@
       @submit="submit"
     >
       <template slot-scope="{ errors }">
-        <ds-card :header="$t('registration.create-user-account.title')">
+        <ds-card class="login-card" :header="$t('registration.create-user-account.title')">
+          <client-only>
+            <locale-switch class="login-locale-switch" offset="5" />
+          </client-only>
           <ds-input
             id="name"
             model="name"
@@ -55,10 +60,7 @@
               v-model="termsAndConditionsConfirmed"
               :checked="termsAndConditionsConfirmed"
             />
-            <label
-              for="checkbox"
-              v-html="$t('termsAndConditions.termsAndConditionsConfirmed')"
-            ></label>
+            <label for="checkbox" v-html="$t('termsAndConditions.termsAndConditionsConfirmed')"></label>
           </ds-text>
 
           <template slot="footer">
@@ -72,9 +74,7 @@
               :loading="$apollo.loading"
               :disabled="errors || !termsAndConditionsConfirmed"
               primary
-            >
-              {{ $t('actions.save') }}
-            </ds-button>
+            >{{ $t('actions.save') }}</ds-button>
           </template>
         </ds-card>
       </template>
@@ -88,11 +88,13 @@ import { SweetalertIcon } from 'vue-sweetalert-icons'
 import PasswordForm from '~/components/utils/PasswordFormHelper'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
 import { SignupVerificationMutation } from '~/graphql/Registration.js'
+import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 
 export default {
   components: {
     PasswordStrength,
     SweetalertIcon,
+    LocaleSwitch,
   },
   data() {
     const passwordForm = PasswordForm({ translate: this.$t })
@@ -151,3 +153,14 @@ export default {
   },
 }
 </script>
+
+<style lang="scss">
+.login-card {
+  position: relative;
+}
+.login-locale-switch {
+  position: absolute;
+  top: 1em;
+  right: 1em;
+}
+</style>
diff --git a/webapp/pages/registration.vue b/webapp/pages/registration.vue
index 08ca0a682..7c7f03975 100644
--- a/webapp/pages/registration.vue
+++ b/webapp/pages/registration.vue
@@ -4,7 +4,7 @@
 
 <script>
 export default {
-  layout: 'basic',
+  layout: 'no-header',
   asyncData({ store, redirect }) {
     if (store.getters['auth/isLoggedIn']) {
       redirect('/')

From ca49c2296ce316ea6c135aa7e73036935bbc5517 Mon Sep 17 00:00:00 2001
From: Brent Vardy <brent.vardy@challengelogic.net>
Date: Sat, 7 Sep 2019 13:20:06 +0100
Subject: [PATCH 10/14] improved class names for current component

---
 webapp/components/Registration/CreateUserAccount.vue | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index 532b3d91a..bedc24402 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -18,9 +18,9 @@
       @submit="submit"
     >
       <template slot-scope="{ errors }">
-        <ds-card class="login-card" :header="$t('registration.create-user-account.title')">
+        <ds-card class="create-account-card" :header="$t('registration.create-user-account.title')">
           <client-only>
-            <locale-switch class="login-locale-switch" offset="5" />
+            <locale-switch class="create-account-locale-switch" offset="5" />
           </client-only>
           <ds-input
             id="name"
@@ -155,10 +155,10 @@ export default {
 </script>
 
 <style lang="scss">
-.login-card {
+.create-account-card {
   position: relative;
 }
-.login-locale-switch {
+.create-account-locale-switch {
   position: absolute;
   top: 1em;
   right: 1em;

From 17f2c990db2ce4fb2e66a2648be00c951946fc9c Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 10 Sep 2019 09:19:40 +0200
Subject: [PATCH 11/14] Fix lint

---
 webapp/layouts/no-header.vue    | 1 -
 webapp/pages/password-reset.vue | 1 -
 2 files changed, 2 deletions(-)

diff --git a/webapp/layouts/no-header.vue b/webapp/layouts/no-header.vue
index 96f921d36..119ac24e1 100644
--- a/webapp/layouts/no-header.vue
+++ b/webapp/layouts/no-header.vue
@@ -11,7 +11,6 @@
 </template>
 
 <script>
-import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import seo from '~/mixins/seo'
 import PageFooter from '~/components/PageFooter/PageFooter'
 
diff --git a/webapp/pages/password-reset.vue b/webapp/pages/password-reset.vue
index 76590d62b..e8f6ab4d6 100644
--- a/webapp/pages/password-reset.vue
+++ b/webapp/pages/password-reset.vue
@@ -11,7 +11,6 @@
 </template>
 
 <script>
-
 export default {
   layout: 'no-header',
   asyncData({ store, redirect }) {

From fa3053dca757833ec2fd5ffaca66cc03b5f5b3dd Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Tue, 10 Sep 2019 19:35:37 +0200
Subject: [PATCH 12/14] Tidy up, follow @roschaefer, @Tirokk PR suggestions

- Fix tests by stubbing LocaleSwitch/client-only
- Add portuguese translations
- Add back to login link
- Use span over &nbsp following @alina-becks PR review on another PR
---
 webapp/components/PageFooter/PageFooter.vue   | 15 ++++++-----
 .../components/PasswordReset/Request.spec.js  | 13 +++++++---
 webapp/components/PasswordReset/Request.vue   |  8 +++---
 .../Registration/CreateUserAccount.spec.js    | 10 +++++---
 .../Registration/CreateUserAccount.vue        | 17 +++++++------
 webapp/layouts/default.vue                    |  8 +++---
 webapp/locales/de.json                        |  6 ++---
 webapp/locales/en.json                        |  9 ++++---
 webapp/locales/pt.json                        | 25 +++++++++++++------
 webapp/pages/login.vue                        |  9 ++++---
 10 files changed, 74 insertions(+), 46 deletions(-)

diff --git a/webapp/components/PageFooter/PageFooter.vue b/webapp/components/PageFooter/PageFooter.vue
index d90f08b11..d970792bb 100644
--- a/webapp/components/PageFooter/PageFooter.vue
+++ b/webapp/components/PageFooter/PageFooter.vue
@@ -1,20 +1,20 @@
 <template>
   <div id="footer" class="ds-footer">
     <a href="https://human-connection.org" target="_blank" v-html="$t('site.made')"></a>
-    &nbsp;-&nbsp;
+    <span>-</span>
     <nuxt-link to="/imprint">{{ $t('site.imprint') }}</nuxt-link>
-    &nbsp;‑&nbsp;
+    <span>-</span>
     <nuxt-link to="/terms-and-conditions">{{ $t('site.termsAndConditions') }}</nuxt-link>
-    &nbsp;‑&nbsp;
+    <span>-</span>
     <nuxt-link to="/code-of-conduct">{{ $t('site.code-of-conduct') }}</nuxt-link>
-    &nbsp;‑&nbsp;
+    <span>-</span>
     <nuxt-link to="/data-privacy">{{ $t('site.data-privacy') }}</nuxt-link>
-    &nbsp;‑&nbsp;
+    <span>-</span>
     <nuxt-link to="/changelog">{{ $t('site.changelog') }}</nuxt-link>
   </div>
 </template>
 
-<style lang="scss">
+<style lang="scss" scoped>
 .ds-footer {
   text-align: center;
   position: fixed;
@@ -25,4 +25,7 @@
   padding: 10px 10px;
   box-shadow: 0px -6px 12px -4px rgba(0, 0, 0, 0.1);
 }
+span {
+  margin-right: 0.2rem;
+}
 </style>
diff --git a/webapp/components/PasswordReset/Request.spec.js b/webapp/components/PasswordReset/Request.spec.js
index 1804be6a6..63e51cf76 100644
--- a/webapp/components/PasswordReset/Request.spec.js
+++ b/webapp/components/PasswordReset/Request.spec.js
@@ -6,11 +6,11 @@ const localVue = createLocalVue()
 
 localVue.use(Styleguide)
 config.stubs['sweetalert-icon'] = '<span><slot /></span>'
+config.stubs['client-only'] = '<span><slot /></span>'
+config.stubs['nuxt-link'] = '<span><slot /></span>'
 
 describe('Request', () => {
-  let wrapper
-  let Wrapper
-  let mocks
+  let wrapper, Wrapper, mocks, stubs
 
   beforeEach(() => {
     mocks = {
@@ -23,6 +23,12 @@ describe('Request', () => {
         loading: false,
         mutate: jest.fn().mockResolvedValue({ data: { reqestPasswordReset: true } }),
       },
+      $i18n: {
+        locale: () => 'en',
+      },
+    }
+    stubs = {
+      LocaleSwitch: "<div class='stub'></div>",
     }
   })
 
@@ -33,6 +39,7 @@ describe('Request', () => {
       return mount(Request, {
         mocks,
         localVue,
+        stubs,
       })
     }
 
diff --git a/webapp/components/PasswordReset/Request.vue b/webapp/components/PasswordReset/Request.vue
index ff2d0206d..57f2808a5 100644
--- a/webapp/components/PasswordReset/Request.vue
+++ b/webapp/components/PasswordReset/Request.vue
@@ -30,9 +30,7 @@
             icon="envelope"
           />
           <ds-space margin-botton="large">
-            <ds-text>
-              {{ $t('password-reset.form.description') }}
-            </ds-text>
+            <ds-text>{{ $t('password-reset.form.description') }}</ds-text>
           </ds-space>
           <ds-button
             :disabled="disabled"
@@ -54,6 +52,10 @@
           </transition>
           <ds-text v-html="submitMessage" />
         </div>
+        <ds-space margin-bottom="small" />
+        <div>
+          <nuxt-link to="/login">{{ $t('site.login') }}</nuxt-link>
+        </div>
       </ds-flex-item>
     </ds-flex>
 
diff --git a/webapp/components/Registration/CreateUserAccount.spec.js b/webapp/components/Registration/CreateUserAccount.spec.js
index 75e1ade83..6551211c0 100644
--- a/webapp/components/Registration/CreateUserAccount.spec.js
+++ b/webapp/components/Registration/CreateUserAccount.spec.js
@@ -7,12 +7,10 @@ const localVue = createLocalVue()
 
 localVue.use(Styleguide)
 config.stubs['sweetalert-icon'] = '<span><slot /></span>'
+config.stubs['client-only'] = '<span><slot /></span>'
 
 describe('CreateUserAccount', () => {
-  let wrapper
-  let Wrapper
-  let mocks
-  let propsData
+  let wrapper, Wrapper, mocks, propsData, stubs
 
   beforeEach(() => {
     mocks = {
@@ -27,6 +25,9 @@ describe('CreateUserAccount', () => {
       },
     }
     propsData = {}
+    stubs = {
+      LocaleSwitch: "<div class='stub'></div>",
+    }
   })
 
   describe('mount', () => {
@@ -35,6 +36,7 @@ describe('CreateUserAccount', () => {
         mocks,
         propsData,
         localVue,
+        stubs,
       })
     }
 
diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index bedc24402..ebcfb9691 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -3,11 +3,9 @@
     <ds-card v-if="success" class="success">
       <ds-space>
         <sweetalert-icon icon="success" />
-        <ds-text
-          align="center"
-          bold
-          color="success"
-        >{{ $t('registration.create-user-account.success') }}</ds-text>
+        <ds-text align="center" bold color="success">
+          {{ $t('registration.create-user-account.success') }}
+        </ds-text>
       </ds-space>
     </ds-card>
     <ds-form
@@ -60,7 +58,10 @@
               v-model="termsAndConditionsConfirmed"
               :checked="termsAndConditionsConfirmed"
             />
-            <label for="checkbox" v-html="$t('termsAndConditions.termsAndConditionsConfirmed')"></label>
+            <label
+              for="checkbox"
+              v-html="$t('termsAndConditions.termsAndConditionsConfirmed')"
+            ></label>
           </ds-text>
 
           <template slot="footer">
@@ -74,7 +75,9 @@
               :loading="$apollo.loading"
               :disabled="errors || !termsAndConditionsConfirmed"
               primary
-            >{{ $t('actions.save') }}</ds-button>
+            >
+              {{ $t('actions.save') }}
+            </ds-button>
           </template>
         </ds-card>
       </template>
diff --git a/webapp/layouts/default.vue b/webapp/layouts/default.vue
index e9a4e8d4e..3e5a0f12c 100644
--- a/webapp/layouts/default.vue
+++ b/webapp/layouts/default.vue
@@ -88,11 +88,9 @@
                           {{ $t('login.hello') }}
                           <b>{{ userName }}</b>
                           <template v-if="user.role !== 'user'">
-                            <ds-text
-                              color="softer"
-                              size="small"
-                              style="margin-bottom: 0"
-                            >{{ user.role | camelCase }}</ds-text>
+                            <ds-text color="softer" size="small" style="margin-bottom: 0">
+                              {{ user.role | camelCase }}
+                            </ds-text>
                           </template>
                           <hr />
                           <ds-menu :routes="routes" :matcher="matcher">
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index a28baa2f9..20065bf0e 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -36,7 +36,8 @@
     "responsible": "Verantwortlicher gemäß § 55 Abs. 2 RStV ",
     "bank": "Bankverbindung",
     "germany": "Deutschland",
-    "code-of-conduct": "Verhaltenscodex"
+    "code-of-conduct": "Verhaltenscodex",
+    "login": "Zurück zum Anmeldung"
   },
   "sorting": {
     "newest": "Neuste",
@@ -56,7 +57,6 @@
     "success": "Du bist eingeloggt!"
   },
   "password-reset": {
-    "title": "Passwort zurücksetzen",
     "form": {
       "description": "Eine Mail zum Zurücksetzen des Passworts wird an die angegebene E-Mail Adresse geschickt.",
       "submit": "Email anfordern",
@@ -614,4 +614,4 @@
     "have-fun": "Jetzt aber viel Spaß mit der Alpha von Human Connection! Für den ersten Weltfrieden. ♥︎",
     "closing": "Herzlichst <br><br> Euer Human Connection Team"
   }
-}
+}
\ No newline at end of file
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index e08f7bdad..8cfa9a342 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -36,14 +36,15 @@
     "responsible": "responsible for contents of this page (§ 55 Abs. 2 RStV)",
     "bank": "bank account",
     "germany": "Germany",
-    "code-of-conduct": "Code of Conduct"
+    "code-of-conduct": "Code of Conduct",
+    "login": "Back to login"
   },
   "sorting": {
     "newest": "Newest",
     "oldest": "Oldest"
   },
   "login": {
-    "copy": "If you already have a human-connection account, login here.",
+    "copy": "If you already have a human-connection account, please login.",
     "login": "Login",
     "logout": "Logout",
     "email": "Your Email",
@@ -60,7 +61,7 @@
     "form": {
       "description": "A password reset email will be sent to the given email address.",
       "submit": "Request email",
-      "submitted": "A mail with further instruction has been sent to <b>{email}</b>"
+      "submitted": "An email with further instructions has been sent to <b>{email}</b>"
     }
   },
   "registration": {
@@ -614,4 +615,4 @@
     "have-fun": "Now have fun with the alpha version of Human Connection! For the first universal peace. ♥︎",
     "closing": "Thank you very much <br> <br> your Human Connection Team"
   }
-}
+}
\ No newline at end of file
diff --git a/webapp/locales/pt.json b/webapp/locales/pt.json
index 785844ebf..d08d569c2 100644
--- a/webapp/locales/pt.json
+++ b/webapp/locales/pt.json
@@ -1,28 +1,37 @@
 {
   "site": {
-    "made": "Com &#10084; feito",
+    "made": "Feito com &#10084;",
     "imprint": "Impressão",
-    "termsAc": "termos e condições",
-    "data-privacy": "protecção de dados",
+    "termsAc": "Termos e Condições",
+    "data-privacy": "Proteção de Dados",
     "changelog": "Mudanças e Histórico",
     "contact": "Contato",
-    "tribunal": "tribunal",
     "tribunal": "tribunal de registo",
     "register": "número de registo",
     "director": "Diretor Administrativo",
     "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)",
     "responsible": "Responsável segundo § 55 Abs. 2 RStV (Alemanha) ",
     "bank": "conta bancária",
-    "germany": "Alemanha"
+    "germany": "Alemanha",
+    "code-of-conduct": "Codigo de Conduto",
+    "login": "Voltar para o Login"
   },
   "login": {
-    "copy": "Se você já tem uma conta no Human Connection, entre aqui.",
+    "copy": "Se você já tem uma conta no Human Connection, por favor faça o login.",
     "login": "Entrar",
     "logout": "Sair",
     "email": "Seu email",
     "password": "Sua senha",
     "moreInfo": "O que é o Human Connection?",
-    "hello": "Olá"
+    "hello": "Olá",
+    "forgotPassword": "Esqueceu a sua senha?"
+  },
+  "password-reset": {
+    "form": {
+      "description": "Um e-mail de redefinição de senha será enviado para o endereço de e-mail fornecido.",
+      "submit": "Solicitar email",
+      "submitted": "Um e-mail com mais instruções foi enviado para <b>{email}</b>"
+    }
   },
   "profile": {
     "name": "Meu perfil",
@@ -203,4 +212,4 @@
   "shoutButton": {
     "shouted": "Aclamou"
   }
-}
+}
\ No newline at end of file
diff --git a/webapp/pages/login.vue b/webapp/pages/login.vue
index fe5ef983f..46168f1ab 100644
--- a/webapp/pages/login.vue
+++ b/webapp/pages/login.vue
@@ -53,13 +53,17 @@
                 name="submit"
                 type="submit"
                 icon="sign-in"
-              >{{ $t('login.login') }}</ds-button>
+              >
+                {{ $t('login.login') }}
+              </ds-button>
               <ds-space margin="x-small">
                 <a
                   :href="$t('login.moreInfoURL')"
                   :title="$t('login.moreInfoHint')"
                   target="_blank"
-                >{{ $t('login.moreInfo') }}</a>
+                >
+                  {{ $t('login.moreInfo') }}
+                </a>
               </ds-space>
             </form>
           </ds-flex-item>
@@ -72,7 +76,6 @@
 <script>
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
-import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 
 export default {
   layout: 'no-header',

From 1a65d75c108d7783b149d198b7e53120bfc2d897 Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 11 Sep 2019 08:19:40 +0200
Subject: [PATCH 13/14] Add back blank layout

- The new maintenance page will use a blank layout that does not have a
footer because we don't want users thinking they can click on a link
that will just lead back to the maintenance page
---
 webapp/layouts/blank.vue | 17 +++++++++++++++++
 1 file changed, 17 insertions(+)
 create mode 100644 webapp/layouts/blank.vue

diff --git a/webapp/layouts/blank.vue b/webapp/layouts/blank.vue
new file mode 100644
index 000000000..080323528
--- /dev/null
+++ b/webapp/layouts/blank.vue
@@ -0,0 +1,17 @@
+<template>
+  <div class="layout-blank">
+    <ds-container>
+      <div style="padding: 5rem 2rem;">
+        <nuxt />
+      </div>
+    </ds-container>
+    <div id="overlay" />
+  </div>
+</template>
+
+<script>
+import seo from '~/mixins/seo'
+export default {
+  mixins: [seo],
+}
+</script>

From 73db6c5e58b45553d68c7117a2d5ff274a9b48fe Mon Sep 17 00:00:00 2001
From: mattwr18 <mattwr18@gmail.com>
Date: Wed, 11 Sep 2019 16:39:22 +0200
Subject: [PATCH 14/14] Left align text on password-rest page

- to maintain consistency with login page

- Co-authored-by: Mike Aono <aonomike@gmail.com>
---
 webapp/components/PasswordReset/Request.vue | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/webapp/components/PasswordReset/Request.vue b/webapp/components/PasswordReset/Request.vue
index 57f2808a5..aa7e67fcf 100644
--- a/webapp/components/PasswordReset/Request.vue
+++ b/webapp/components/PasswordReset/Request.vue
@@ -11,7 +11,7 @@
       </ds-flex-item>
       <ds-flex-item :width="{ base: '100%', sm: '50%' }" centered>
         <ds-space margin="small">
-          <ds-text size="small">{{ $t('login.copy') }}</ds-text>
+          <ds-text size="small" align="left">{{ $t('login.copy') }}</ds-text>
         </ds-space>
         <ds-form
           v-if="!submitted"
@@ -30,7 +30,7 @@
             icon="envelope"
           />
           <ds-space margin-botton="large">
-            <ds-text>{{ $t('password-reset.form.description') }}</ds-text>
+            <ds-text align="left">{{ $t('password-reset.form.description') }}</ds-text>
           </ds-space>
           <ds-button
             :disabled="disabled"
@@ -50,7 +50,7 @@
               <sweetalert-icon icon="info" />
             </ds-flex>
           </transition>
-          <ds-text v-html="submitMessage" />
+          <ds-text v-html="submitMessage" align="left" />
         </div>
         <ds-space margin-bottom="small" />
         <div>