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] 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('/')