From eeb5006e247567373749183da357eff8c2612675 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Wolfgang=20Hu=C3=9F?= <wolle.huss@pjannto.com>
Date: Sat, 27 Feb 2021 18:16:01 +0100
Subject: [PATCH] Cleanup

---
 .../RegistrationItemEnterEmail.vue            | 19 +++------------
 .../RegistrationItemEnterInvite.vue           |  7 +++---
 .../Registration/RegistrationSlider.vue       | 23 -------------------
 3 files changed, 6 insertions(+), 43 deletions(-)

diff --git a/webapp/components/Registration/RegistrationItemEnterEmail.vue b/webapp/components/Registration/RegistrationItemEnterEmail.vue
index 0130d2dcc..f6e485b4c 100644
--- a/webapp/components/Registration/RegistrationItemEnterEmail.vue
+++ b/webapp/components/Registration/RegistrationItemEnterEmail.vue
@@ -174,19 +174,9 @@ export default {
     async handleInputValid() {
       this.sendValidation()
     },
-    // enterEmailButtonTitle(emailSend) {
-    //   // return emailSend ? 'Resend e-mail' : 'Send e-mail'
-    //   return emailSend ? (this.sendEmailAgain ? 'Resend e-mail' : 'Skip resend') : 'Send e-mail' // Wolle
-    // },
-    // enterEmailButtonIcon(emailSend) {
-    //   // return emailSend ? 'Resend e-mail' : 'Send e-mail'
-    //   return emailSend ? (this.sendEmailAgain ? 'envelope' : 'arrow-right') : 'envelope' // Wolle
-    // },
     buttonValues() {
       return {
         sliderSettings: {
-          // buttonTitle: this.enterEmailButtonTitle(this.sliderData.collectedInputData.emailSend),
-          // buttonIcon: this.enterEmailButtonIcon(this.sliderData.collectedInputData.emailSend),
           buttonTitle: this.sliderData.collectedInputData.emailSend
             ? this.sendEmailAgain
               ? 'Resend e-mail'
@@ -217,10 +207,9 @@ export default {
         this.sendEmailAgain ||
         !this.sliderData.sliders[this.sliderIndex].data.request ||
         (this.sliderData.sliders[this.sliderIndex].data.request &&
-          !this.sliderData.sliders[this.sliderIndex].data.request.variables) ||
-        (this.sliderData.sliders[this.sliderIndex].data.request &&
-          this.sliderData.sliders[this.sliderIndex].data.request.variables &&
-          !this.sliderData.sliders[this.sliderIndex].data.request.variables === variables)
+          (!this.sliderData.sliders[this.sliderIndex].data.request.variables ||
+            (this.sliderData.sliders[this.sliderIndex].data.request.variables &&
+              !this.sliderData.sliders[this.sliderIndex].data.request.variables === variables)))
       ) {
         this.sliderData.setSliderValuesCallback(
           this.sliderData.sliders[this.sliderIndex].validated,
@@ -235,7 +224,6 @@ export default {
           )
 
           if (this.sliderData.sliders[this.sliderIndex].data.response) {
-            // this.sliderData.collectedInputData.emailSend = true
             this.sliderData.setSliderValuesCallback(this.validInput, {
               collectedInputData: { emailSend: true },
             })
@@ -254,7 +242,6 @@ export default {
             this.sliderData.sliders[this.sliderIndex].validated,
             { sliderData: { request: null, response: null } },
           )
-          // this.sliderData.collectedInputData.emailSend = false
           this.sliderData.setSliderValuesCallback(this.validInput, {
             collectedInputData: { emailSend: false },
           })
diff --git a/webapp/components/Registration/RegistrationItemEnterInvite.vue b/webapp/components/Registration/RegistrationItemEnterInvite.vue
index e0548315b..e133c2fba 100644
--- a/webapp/components/Registration/RegistrationItemEnterInvite.vue
+++ b/webapp/components/Registration/RegistrationItemEnterInvite.vue
@@ -95,10 +95,9 @@ export default {
       if (
         !this.sliderData.sliders[this.sliderIndex].data.request ||
         (this.sliderData.sliders[this.sliderIndex].data.request &&
-          !this.sliderData.sliders[this.sliderIndex].data.request.variables) ||
-        (this.sliderData.sliders[this.sliderIndex].data.request &&
-          this.sliderData.sliders[this.sliderIndex].data.request.variables &&
-          !this.sliderData.sliders[this.sliderIndex].data.request.variables === variables)
+          (!this.sliderData.sliders[this.sliderIndex].data.request.variables ||
+            (this.sliderData.sliders[this.sliderIndex].data.request.variables &&
+              !this.sliderData.sliders[this.sliderIndex].data.request.variables === variables)))
       ) {
         this.sliderData.setSliderValuesCallback(
           this.sliderData.sliders[this.sliderIndex].validated,
diff --git a/webapp/components/Registration/RegistrationSlider.vue b/webapp/components/Registration/RegistrationSlider.vue
index d58e6b809..5bafc39a3 100644
--- a/webapp/components/Registration/RegistrationSlider.vue
+++ b/webapp/components/Registration/RegistrationSlider.vue
@@ -222,10 +222,6 @@ export default {
           this.sliderData.sliders[this.sliderIndex].button.sliderCallback = buttonSliderCallback
         }
       }
-
-      // Wolle if (sliderCallback) {
-      //   this.sliderData.sliders[this.sliderIndex].button.sliderCallback = sliderCallback
-      // }
     },
     sliderSelectorCallback(selectedIndex) {
       if (selectedIndex <= this.sliderIndex + 1 && selectedIndex < this.sliderData.sliders.length) {
@@ -233,25 +229,6 @@ export default {
       }
     },
     buttonCallback(success) {
-      // Wolle
-      // if (this.sliderData.sliders[this.sliderIndex].name === 'enter-email') {
-      //   // if (this.sliderData.sliders[this.sliderIndex].button.sliderCallback) {
-      //   //   this.sliderData.sliders[this.sliderIndex].button.sliderCallback()
-      //   // }
-      //   this.sliderData.sliders[this.sliderIndex].button.title = this.enterEmailButtonTitle(
-      //     this.sliderData.collectedInputData.emailSend,
-      //   )
-      // }
-      // if (this.sliderIndex === this.sliderData.sliders.length - 1) {
-      //   // console.log('submit data: ', this.sliderData.collectedInputData)
-      // } else {
-      //   if (this.sliderIndex < this.sliderData.sliders.length - 1) {
-      //     this.sliderData.sliderIndex++
-      //     if (this.sliderData.sliders[this.sliderIndex] === 'create-user-account') {
-      //       this.sliderData.sliders[this.sliderIndex].validated = false
-      //     }
-      //   }
-      // }
       return success
     },
   },