From 3a216226bcb05811b147e99bc08e935bc88a68ad Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Fri, 5 Jun 2020 14:15:42 +0200
Subject: [PATCH] Paramterize all emails

---
 docker-compose.override.yml                          | 4 ++--
 webapp/components/PasswordReset/ChangePassword.vue   | 7 +++++--
 webapp/components/Registration/CreateUserAccount.vue | 6 +++---
 webapp/constants/emails.js                           | 6 +++---
 webapp/maintenance/source/pages/index.vue            | 9 +++++----
 webapp/pages/code-of-conduct.vue                     | 6 +++---
 webapp/pages/settings/my-email-address/verify.vue    | 8 +++++++-
 7 files changed, 28 insertions(+), 18 deletions(-)

diff --git a/docker-compose.override.yml b/docker-compose.override.yml
index c58df2292..b3493ce78 100644
--- a/docker-compose.override.yml
+++ b/docker-compose.override.yml
@@ -17,7 +17,7 @@ services:
     environment:
       - "APPLICATION_NAME={$APPLICATION_NAME:-'Human Connection'}"
       - NUXT_BUILD=/tmp/nuxt # avoid file permission issues when `rm -rf .nuxt/`
-      - PUBLIC_REGISTRATION=false
+      - PUBLIC_REGISTRATION=true
     command: yarn run dev
   backend:
     image: schoolsinmotion/backend:build-and-test
@@ -33,7 +33,7 @@ services:
       - SMTP_PORT=25
       - SMTP_IGNORE_TLS=true
       - "DEBUG=${DEBUG}"
-      - PUBLIC_REGISTRATION=false
+      - PUBLIC_REGISTRATION=true
   maintenance:
     image: schoolsinmotion/maintenance:latest
     build:
diff --git a/webapp/components/PasswordReset/ChangePassword.vue b/webapp/components/PasswordReset/ChangePassword.vue
index 2873505c6..5d1e02acf 100644
--- a/webapp/components/PasswordReset/ChangePassword.vue
+++ b/webapp/components/PasswordReset/ChangePassword.vue
@@ -49,8 +49,9 @@
           </p>
           <p>
             {{ $t('components.password-reset.change-password.help') }}
-            <br />
-            <a href="mailto:support@human-connection.org">support@human-connection.org</a>
+          </p>
+          <p>
+            <a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>
           </p>
         </ds-text>
       </template>
@@ -60,6 +61,7 @@
 </template>
 
 <script>
+import emails from '../../constants/emails.js'
 import PasswordStrength from '../Password/Strength'
 import gql from 'graphql-tag'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
@@ -77,6 +79,7 @@ export default {
   data() {
     const passwordForm = PasswordForm({ translate: this.$t })
     return {
+      supportEmail: emails.SUPPORT,
       formData: {
         ...passwordForm.formData,
       },
diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index 4603145c0..ed5e1d8b2 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -16,7 +16,7 @@
     </ds-text>
     <ds-text align="center">
       {{ $t('components.registration.create-user-account.help') }}
-      <a :href="supportEmail.href">{{ supportEmail.label }}</a>
+      <a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>
     </ds-text>
     <ds-space centered>
       <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
@@ -128,9 +128,9 @@
 import PasswordStrength from '../Password/Strength'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 import PasswordForm from '~/components/utils/PasswordFormHelper'
-import { SUPPORT_EMAIL } from '~/constants/emails.js'
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
 import { SignupVerificationMutation } from '~/graphql/Registration.js'
+import emails from '~/constants/emails'
 
 export default {
   components: {
@@ -140,7 +140,7 @@ export default {
   data() {
     const passwordForm = PasswordForm({ translate: this.$t })
     return {
-      supportEmail: SUPPORT_EMAIL,
+      supportEmail: emails.SUPPORT,
       formData: {
         name: '',
         about: '',
diff --git a/webapp/constants/emails.js b/webapp/constants/emails.js
index 14c53ee57..d59048e20 100644
--- a/webapp/constants/emails.js
+++ b/webapp/constants/emails.js
@@ -1,4 +1,4 @@
-export const SUPPORT_EMAIL = {
-  href: 'mailto:support@human-connection.org',
-  label: 'support@human-connection.org',
+export default {
+  SUPPORT: 'support@human-connection.org',
+  MODERATION: 'moderation@human-connection.org',
 }
diff --git a/webapp/maintenance/source/pages/index.vue b/webapp/maintenance/source/pages/index.vue
index f9cfe6b89..a0dcbc503 100644
--- a/webapp/maintenance/source/pages/index.vue
+++ b/webapp/maintenance/source/pages/index.vue
@@ -20,10 +20,7 @@
                 <ds-text>{{ $t('maintenance.explanation') }}</ds-text>
                 <ds-text>
                   {{ $t('maintenance.questions') }}
-                  <a href="mailto:support@human-connection.org" class="email-link">
-                    support@human-connection.org
-                  </a>
-                  .
+                  <a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>
                 </ds-text>
               </ds-space>
             </ds-flex-item>
@@ -35,6 +32,7 @@
 </template>
 
 <script>
+import emails from '~/constants/emails.js'
 import LocaleSwitch from '~/components/LocaleSwitch/LocaleSwitch'
 
 export default {
@@ -42,5 +40,8 @@ export default {
   components: {
     LocaleSwitch,
   },
+  data() {
+    return { supportEmail: emails.SUPPORT }
+  },
 }
 </script>
diff --git a/webapp/pages/code-of-conduct.vue b/webapp/pages/code-of-conduct.vue
index d7818a956..63ffce06b 100644
--- a/webapp/pages/code-of-conduct.vue
+++ b/webapp/pages/code-of-conduct.vue
@@ -25,9 +25,7 @@
 
       <p>
         {{ $t('code-of-conduct.get-help') }}
-        <a class="hc-editor-link-blot" href="moderation@human-connection.org" target="_blank">
-          moderation@human-connection.org
-        </a>
+        <a :href="'mailto:' + moderationEmail">{{ moderationEmail }}</a>
       </p>
       <br />
     </ds-container>
@@ -35,6 +33,7 @@
 </template>
 
 <script>
+import emails from '~/constants/emails.js'
 export default {
   layout: 'basic',
   head() {
@@ -44,6 +43,7 @@ export default {
   },
   data() {
     return {
+      moderationEmail: emails.MODERATION,
       sections: ['preamble', 'purpose'],
       listSections: [
         {
diff --git a/webapp/pages/settings/my-email-address/verify.vue b/webapp/pages/settings/my-email-address/verify.vue
index efb823b93..26f435182 100644
--- a/webapp/pages/settings/my-email-address/verify.vue
+++ b/webapp/pages/settings/my-email-address/verify.vue
@@ -29,7 +29,7 @@
               </ds-list-item>
             </ds-list>
             {{ $t('settings.email.verification-error.support') }}
-            <a href="mailto:support@human-connection.org">support@human-connection.org</a>
+            <a :href="'mailto:' + supportEmail">{{ supportEmail }}</a>
           </ds-text>
         </client-only>
       </ds-space>
@@ -38,6 +38,7 @@
 </template>
 
 <script>
+import emails from '~/constants/emails.js'
 import { VerifyEmailAddressMutation } from '~/graphql/EmailAddress.js'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 
@@ -57,6 +58,11 @@ export default {
       }, 3000)
     }
   },
+  data() {
+    return {
+      supportEmail: emails.SUPPORT,
+    }
+  },
   async asyncData(context) {
     const {
       store,