From ac3a1685b21e7828572566abcb9e1d1ea7f64db3 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 27 Feb 2021 19:04:12 +0100
Subject: [PATCH] Implement db mutation in createUserAccount and cleanup

---
 .../RegistrationItemCreateUserAccount.vue     | 23 +++----------------
 .../RegistrationItemEnterEmail.vue            | 13 -----------
 .../RegistrationItemEnterNonce.vue            | 14 -----------
 .../Registration/RegistrationSlider.story.js  |  3 +++
 4 files changed, 6 insertions(+), 47 deletions(-)

diff --git a/webapp/components/Registration/RegistrationItemCreateUserAccount.vue b/webapp/components/Registration/RegistrationItemCreateUserAccount.vue
index 861cb4310..8af73c98a 100644
--- a/webapp/components/Registration/RegistrationItemCreateUserAccount.vue
+++ b/webapp/components/Registration/RegistrationItemCreateUserAccount.vue
@@ -23,7 +23,7 @@
     </ds-space>
   </div>
   <div v-else class="create-account-card">
-    <!-- <ds-space margin-top="large">
+    <!-- Wolle <ds-space margin-top="large">
       <ds-heading size="h3">
         {{ $t('components.registration.create-user-account.title') }}
       </ds-heading>
@@ -121,23 +121,6 @@
             v-html="$t('components.registration.signup.form.no-political')"
           ></label>
         </ds-text>
-        <!-- Wolle <base-button
-          style="float: right"
-          icon="check"
-          type="submit"
-          filled
-          :loading="$apollo.loading"
-          :disabled="
-            errors ||
-            !termsAndConditionsConfirmed ||
-            !dataPrivacy ||
-            !minimumAge ||
-            !noCommercial ||
-            !noPolitical
-          "
-        >
-          {{ $t('actions.save') }}
-        </base-button> -->
       </template>
     </ds-form>
   </div>
@@ -183,7 +166,7 @@ export default {
         },
         ...passwordForm.formSchema,
       },
-      response: null,
+      response: null, // Wolle
       // TODO: Our styleguide does not support checkmarks.
       // Integrate termsAndConditionsConfirmed into `this.formData` once we
       // have checkmarks available.
@@ -301,7 +284,6 @@ export default {
     },
     async submit() {
       const { name, password, about } = this.formData
-      // Wolle const { email, nonce } = this
       const { email, nonce } = this.sliderData.collectedInputData
       const termsAndConditionsAgreedVersion = VERSION
       const locale = this.$i18n.locale()
@@ -330,6 +312,7 @@ export default {
       }
     },
     onNextClick() {
+      this.submit()
       return true
     },
   },
diff --git a/webapp/components/Registration/RegistrationItemEnterEmail.vue b/webapp/components/Registration/RegistrationItemEnterEmail.vue
index 156140104..df96bc93c 100644
--- a/webapp/components/Registration/RegistrationItemEnterEmail.vue
+++ b/webapp/components/Registration/RegistrationItemEnterEmail.vue
@@ -32,19 +32,8 @@
       name="email"
       icon="envelope"
     />
-    <!-- Wolle <base-button
-        :disabled="disabled"
-        :loading="$apollo.loading"
-        filled
-        name="submit"
-        type="submit"
-        icon="envelope"
-      >
-        {{ $t('components.registration.signup.form.submit') }}
-      </base-button> -->
     <slot></slot>
     <ds-text v-if="sliderData.collectedInputData.emailSend">
-      <!-- Wolle <ds-text v-if="sliderData.collectedInputData.emailSend"> -->
       <input id="checkbox" type="checkbox" v-model="sendEmailAgain" :checked="sendEmailAgain" />
       <label for="checkbox0">
         <!-- Wolle {{ $t('termsAndConditions.termsAndConditionsConfirmed') }} -->
@@ -120,8 +109,6 @@ export default {
       // Integrate termsAndConditionsConfirmed into `this.formData` once we
       // have checkmarks available.
       sendEmailAgain: false,
-      // Wolle disabled: true,
-      // Wolle data: null,
       error: null, // Wolle
     }
   },
diff --git a/webapp/components/Registration/RegistrationItemEnterNonce.vue b/webapp/components/Registration/RegistrationItemEnterNonce.vue
index ecf7a8710..3fcaeeb4f 100644
--- a/webapp/components/Registration/RegistrationItemEnterNonce.vue
+++ b/webapp/components/Registration/RegistrationItemEnterNonce.vue
@@ -22,9 +22,6 @@
     <ds-text>
       {{ $t('components.enter-nonce.form.description') }}
     </ds-text>
-    <!-- Wolle <base-button :disabled="disabled" filled name="submit" type="submit">
-      {{ $t('components.enter-nonce.form.next') }}
-    </base-button> -->
     <slot></slot>
   </ds-form>
 </template>
@@ -49,7 +46,6 @@ export default {
           message: this.$t('components.enter-nonce.form.validations.length'),
         },
       },
-      // Wolle disabled: true,
     }
   },
   mounted: function () {
@@ -89,22 +85,12 @@ export default {
       })
     },
     async handleInput() {
-      // this.disabled = true
-      // this.sliderData.setSliderValuesCallback(false)
       this.sendValidation()
     },
     async handleInputValid() {
-      // this.disabled = false
-      // const { nonce } = this.formData
-      // validate in backend?
-      // toaster?
-      // this.sliderData.setSliderValuesCallback(true, { nonce })
       this.sendValidation()
     },
     handleSubmitVerify() {
-      // const { nonce } = this.formData
-      // const email = this.email
-      // this.$emit('nonceEntered', { email, nonce })
     },
     onNextClick() {
       return true
diff --git a/webapp/components/Registration/RegistrationSlider.story.js b/webapp/components/Registration/RegistrationSlider.story.js
index 28d0ea5b3..a7a0c80da 100644
--- a/webapp/components/Registration/RegistrationSlider.story.js
+++ b/webapp/components/Registration/RegistrationSlider.story.js
@@ -17,6 +17,9 @@ const plugins = [
         if (JSON.stringify(data).includes('SignupByInvitation')) {
           return { data: { SignupByInvitation: { email: data.variables.email } } }
         }
+        if (JSON.stringify(data).includes('SignupVerification')) {
+          return { data: { SignupByInvitation: { ...data.variables } } }
+        }
         throw new Error(`Mutation name not found!`)
       },
       query: (data) => {