From b1e01cb65a91e34da4922814ba1c98707eeeeca7 Mon Sep 17 00:00:00 2001
From: roschaefer <git@roschaefer.de>
Date: Mon, 7 Oct 2019 23:25:49 +0200
Subject: [PATCH] refactor: better errors, introduce email constants

---
 .../Registration/CreateUserAccount.vue        | 31 +++++++++++++------
 webapp/constants/emails.js                    |  4 +++
 webapp/locales/de.json                        |  4 ++-
 webapp/locales/en.json                        |  4 ++-
 4 files changed, 31 insertions(+), 12 deletions(-)
 create mode 100644 webapp/constants/emails.js

diff --git a/webapp/components/Registration/CreateUserAccount.vue b/webapp/components/Registration/CreateUserAccount.vue
index 66b63239f..3b2ec3399 100644
--- a/webapp/components/Registration/CreateUserAccount.vue
+++ b/webapp/components/Registration/CreateUserAccount.vue
@@ -1,10 +1,23 @@
 <template>
-  <ds-space v-if="success">
+  <div v-if="response === 'success'">
     <sweetalert-icon icon="success" />
     <ds-text align="center" bold color="success">
-      {{ $t('registration.create-user-account.success') }}
+      {{ $t('components.registration.create-user-account.success') }}
     </ds-text>
-  </ds-space>
+  </div>
+  <div v-else-if="response === 'error'">
+    <sweetalert-icon icon="error" />
+    <ds-text align="center" bold color="danger">
+      {{ $t('components.registration.create-user-account.error') }}
+    </ds-text>
+    <ds-text align="center">
+      {{ $t('components.registration.create-user-account.help') }}
+      <a :href="supportEmail.href">{{ supportEmail.label }}</a>
+    </ds-text>
+    <ds-space centered>
+      <nuxt-link to="/login">{{ $t('site.back-to-login') }}</nuxt-link>
+    </ds-space>
+  </div>
   <div v-else class="create-account-card">
     <ds-space margin-top="large">
       <ds-heading size="h3">
@@ -57,9 +70,6 @@
             v-html="$t('termsAndConditions.termsAndConditionsConfirmed')"
           ></label>
         </ds-text>
-        <ds-space class="backendErrors" v-if="backendErrors">
-          <ds-text align="center" bold color="danger">{{ backendErrors.message }}</ds-text>
-        </ds-space>
         <ds-button
           style="float: right;"
           icon="check"
@@ -79,6 +89,7 @@
 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'
 
@@ -90,6 +101,7 @@ export default {
   data() {
     const passwordForm = PasswordForm({ translate: this.$t })
     return {
+      supportEmail: SUPPORT_EMAIL,
       formData: {
         name: '',
         about: '',
@@ -108,8 +120,7 @@ export default {
         ...passwordForm.formSchema,
       },
       disabled: true,
-      success: null,
-      backendErrors: null,
+      response: null,
       // TODO: Our styleguide does not support checkmarks.
       // Integrate termsAndConditionsConfirmed into `this.formData` once we
       // have checkmarks available.
@@ -130,7 +141,7 @@ export default {
           mutation: SignupVerificationMutation,
           variables: { name, password, about, email, nonce, termsAndConditionsAgreedVersion },
         })
-        this.success = true
+        this.response = 'success'
         setTimeout(() => {
           this.$emit('userCreated', {
             email,
@@ -138,7 +149,7 @@ export default {
           })
         }, 3000)
       } catch (err) {
-        this.backendErrors = err
+        this.response = 'error'
       }
     },
   },
diff --git a/webapp/constants/emails.js b/webapp/constants/emails.js
new file mode 100644
index 000000000..14c53ee57
--- /dev/null
+++ b/webapp/constants/emails.js
@@ -0,0 +1,4 @@
+export const SUPPORT_EMAIL = {
+  href: 'mailto:support@human-connection.org',
+  label: 'support@human-connection.org',
+}
diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index fc8cd8a69..ae783e618 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -40,7 +40,9 @@
       },
       "create-user-account": {
         "title": "Benutzerkonto anlegen",
-        "success": "Dein Benutzerkonto wurde erstellt!"
+        "success": "Dein Benutzerkonto wurde erstellt!",
+        "error": "Es konnte kein Benutzerkonto erstellt werden!",
+        "help": "Vielleicht war der Bestätigungscode falsch oder abgelaufen? Wenn das Problem weiterhin besteht, schick uns gerne eine E-Mail an:"
       }
     }
   },
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index bcbff1861..5e68ec50b 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -41,7 +41,9 @@
       },
       "create-user-account": {
         "title": "Create user account",
-        "success": "Your account has been created!"
+        "success": "Your account has been created!",
+        "error": "No user account could be created!",
+        "help": " Maybe the confirmation was invalid? In case of problems, feel free to ask for help by sending us a mail to:"
       }
     }
   },