From 197e6ab6d78914e5d08f11dd99594031e1fdbe1c Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Wed, 10 Feb 2021 14:55:25 +0100
Subject: [PATCH] Clean up

---
 .../RegistrationItemCreateUserAccount.vue     | 40 +++----------------
 .../RegistrationItemEnterEmail.vue            |  2 +-
 .../RegistrationItemEnterInvite.vue           | 10 +----
 .../RegistrationItemEnterNonce.vue            |  2 +-
 .../Registration/RegistrationSlider.story.js  |  2 -
 .../Registration/RegistrationSlider.vue       |  1 -
 .../Registration/WatchScopedSlotsCallback.vue | 34 ----------------
 7 files changed, 9 insertions(+), 82 deletions(-)
 delete mode 100644 webapp/components/Registration/WatchScopedSlotsCallback.vue

diff --git a/webapp/components/Registration/RegistrationItemCreateUserAccount.vue b/webapp/components/Registration/RegistrationItemCreateUserAccount.vue
index e7e7f8384..3c945c7d2 100644
--- a/webapp/components/Registration/RegistrationItemCreateUserAccount.vue
+++ b/webapp/components/Registration/RegistrationItemCreateUserAccount.vue
@@ -37,7 +37,7 @@
       @input="handleInput"
       @input-valid="handleInputValid"
     >
-      <!-- Wolle <template v-slot="{ errors }"> -->
+      <!-- <template v-slot="{ errors }"> --> <!-- leave this here in case the scoped variable is needed in the future nobody would remember this -->
       <template>
         <ds-input
           id="name"
@@ -120,12 +120,7 @@
             v-html="$t('components.registration.signup.form.no-political')"
           ></label>
         </ds-text>
-        <!-- this is neccessary to have the 'errors' status as 'formErrors' in Javascript. I didn't found another way yet -->
-        <!-- Wolle <watch-scoped-slots-callback
-          :scopedData="{ errors }"
-          :changeCallback="watchScopedSlotsCallback"
-        ></watch-scoped-slots-callback> -->
-        <!-- <base-button
+        <!-- Wolle <base-button
           style="float: right"
           icon="check"
           type="submit"
@@ -151,7 +146,6 @@
 import { VERSION } from '~/constants/terms-and-conditions-version.js'
 import links from '~/constants/links'
 import emails from '~/constants/emails'
-import WatchScopedSlotsCallback from './WatchScopedSlotsCallback'
 import PasswordStrength from '../Password/Strength'
 import { SweetalertIcon } from 'vue-sweetalert-icons'
 import PasswordForm from '~/components/utils/PasswordFormHelper'
@@ -162,7 +156,6 @@ export default {
   components: {
     PasswordStrength,
     SweetalertIcon,
-    WatchScopedSlotsCallback,
   },
   props: {
     sliderData: { type: Object, required: true },
@@ -189,7 +182,6 @@ export default {
         },
         ...passwordForm.formSchema,
       },
-      // Wolle formErrors: null,
       response: null,
       // TODO: Our styleguide does not support checkmarks.
       // Integrate termsAndConditionsConfirmed into `this.formData` once we
@@ -204,7 +196,6 @@ export default {
   mounted: function () {
     this.$nextTick(function () {
       // Code that will run only after the entire view has been rendered
-      // console.log('mounted !!! ')
       this.formData.name = this.sliderData.collectedInputData.name
         ? this.sliderData.collectedInputData.name
         : ''
@@ -238,10 +229,7 @@ export default {
   },
   computed: {
     valid() {
-      // console.log('valid !!! this.formData: ', this.formData, ' this.formData.password === this.formData.passwordConfirmation: ', this.formData.password === this.formData.passwordConfirmation)
-      // console.log('this.formData.name.length: ', this.formData.name.length, ' this.formData.password.length: ', this.formData.password.length)
       const isValid =
-        // !this.formErrors &&
         this.formData.name.length >= 3 &&
         this.formData.password.length >= 1 &&
         this.formData.password === this.formData.passwordConfirmation &&
@@ -255,10 +243,6 @@ export default {
     },
   },
   watch: {
-    // formData() {
-    //   console.log('formData: ', this.formData)
-    //   this.sendValidation()
-    // },
     termsAndConditionsConfirmed() {
       this.sendValidation()
     },
@@ -276,14 +260,8 @@ export default {
     },
   },
   methods: {
-    // Wolle watchScopedSlotsCallback({ errors }) {
-    //   this.formErrors = errors
-    //   console.log('watchScopedSlotsCallback !!! this.formErrors: ', this.formErrors)
-    // },
     sendValidation() {
       const { name, about, password, passwordConfirmation } = this.formData
-      // const { email, nonce } = this
-      // const { email, nonce } = this.sliderData.collectedInputData
       const termsAndConditionsAgreedVersion = VERSION
       const {
         termsAndConditionsConfirmed,
@@ -298,8 +276,6 @@ export default {
         about,
         password,
         passwordConfirmation,
-        // email,
-        // nonce,
         termsAndConditionsAgreedVersion,
         termsAndConditionsConfirmed,
         dataPrivacy,
@@ -308,25 +284,19 @@ export default {
         noPolitical,
         locale,
       }
-      console.log('sendValidation !!!', ' this.valid: ', this.valid, ' value: ', value)
+      // Wolle validate in backend
+      // toaster
       this.sliderData.validateCallback(this.valid, value)
     },
     async handleInput() {
-      // Wolle console.log('handleInput !!!')
-      // this.sliderData.validateCallback(false)
       this.sendValidation()
     },
     async handleInputValid() {
-      // Wolle console.log('handleInputValid !!!')
-      // const { inviteCode } = this.formData
-      // validate in backend
-      // toaster
-      // this.sliderData.validateCallback(true, { /* email, */ inviteCode })
       this.sendValidation()
     },
     async submit() {
       const { name, password, about } = this.formData
-      // const { email, nonce } = this
+      // Wolle const { email, nonce } = this
       const { email, nonce } = this.sliderData.collectedInputData
       const termsAndConditionsAgreedVersion = VERSION
       const locale = this.$i18n.locale()
diff --git a/webapp/components/Registration/RegistrationItemEnterEmail.vue b/webapp/components/Registration/RegistrationItemEnterEmail.vue
index b43519200..30daea695 100644
--- a/webapp/components/Registration/RegistrationItemEnterEmail.vue
+++ b/webapp/components/Registration/RegistrationItemEnterEmail.vue
@@ -30,7 +30,7 @@
         name="email"
         icon="envelope"
       />
-      <!-- <base-button
+      <!-- Wolle <base-button
         :disabled="disabled"
         :loading="$apollo.loading"
         filled
diff --git a/webapp/components/Registration/RegistrationItemEnterInvite.vue b/webapp/components/Registration/RegistrationItemEnterInvite.vue
index 0218ecd4f..b2848ad81 100644
--- a/webapp/components/Registration/RegistrationItemEnterInvite.vue
+++ b/webapp/components/Registration/RegistrationItemEnterInvite.vue
@@ -66,20 +66,14 @@ export default {
       const value = {
         inviteCode,
       }
-      // console.log('sendValidation !!! value: ', value)
+      // validate in backend
+      // toaster
       this.sliderData.validateCallback(this.valid, value)
     },
     async handleInput() {
-      // Wolle console.log('handleInput !!!')
-      // this.sliderData.validateCallback(false)
       this.sendValidation()
     },
     async handleInputValid() {
-      // Wolle console.log('handleInputValid !!!')
-      // const { inviteCode } = this.formData
-      // validate in backend
-      // toaster
-      // this.sliderData.validateCallback(true, { /* email, */ inviteCode })
       this.sendValidation()
     },
     handleSubmitVerify() {
diff --git a/webapp/components/Registration/RegistrationItemEnterNonce.vue b/webapp/components/Registration/RegistrationItemEnterNonce.vue
index c1c7c6875..25006779c 100644
--- a/webapp/components/Registration/RegistrationItemEnterNonce.vue
+++ b/webapp/components/Registration/RegistrationItemEnterNonce.vue
@@ -22,7 +22,7 @@
     <ds-text>
       {{ $t('components.enter-nonce.form.description') }}
     </ds-text>
-    <!-- <base-button :disabled="disabled" filled name="submit" type="submit">
+    <!-- Wolle <base-button :disabled="disabled" filled name="submit" type="submit">
       {{ $t('components.enter-nonce.form.next') }}
     </base-button> -->
     <slot></slot>
diff --git a/webapp/components/Registration/RegistrationSlider.story.js b/webapp/components/Registration/RegistrationSlider.story.js
index 579158388..fe5ad9b5d 100644
--- a/webapp/components/Registration/RegistrationSlider.story.js
+++ b/webapp/components/Registration/RegistrationSlider.story.js
@@ -12,7 +12,6 @@ storiesOf('RegistrationSlider', module)
     components: { RegistrationSlider },
     store: helpers.store,
     data: () => ({
-      // Wolle searchResults,
     }),
     template: `
       <registration-slider registrationType="invite-code" />
@@ -50,7 +49,6 @@ storiesOf('RegistrationSlider', module)
     components: { RegistrationSlider },
     store: helpers.store,
     data: () => ({
-      // Wolle searchResults,
     }),
     template: `
       <registration-slider registrationType="public-registration" />
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index 621318a4c..0a639145b 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -128,7 +128,6 @@ export default {
         },
       },
     ]
-    // Wolle console.log('this.registrationType: ', this.registrationType)
     let sliders = []
     switch (this.registrationType) {
       case 'invite-code':
diff --git a/webapp/components/Registration/WatchScopedSlotsCallback.vue b/webapp/components/Registration/WatchScopedSlotsCallback.vue
deleted file mode 100644
index 844f7b24b..000000000
--- a/webapp/components/Registration/WatchScopedSlotsCallback.vue
+++ /dev/null
@@ -1,34 +0,0 @@
-<template>
-  <div></div>
-</template>
-
-<script>
-export default {
-  name: 'WatchScopedSlotsCallback',
-  props: {
-    scopedData: { type: Object, required: true },
-    changeCallback: { type: Function, required: true },
-  },
-  data() {
-    // Wolle
-    return {}
-  },
-  computed: {
-    // Wolle
-  },
-  watch: {
-    scopedData: {
-      handler(value) {
-        this.changeCallback(value)
-      },
-      deep: true,
-      immediate: true,
-    },
-  },
-  methods: {
-    // Wolle
-  },
-}
-</script>
-
-<style lang="scss"></style>