From 50b98d8d92097235db69e76a9ee6691dc94c8291 Mon Sep 17 00:00:00 2001
From: Sabe Jones <sabrecat@gmail.com>
Date: Wed, 27 Jun 2018 12:12:18 -0500
Subject: [PATCH] fix(deletion): show feedback for social accounts (#10467)

---
 .../components/settings/deleteModal.vue       | 44 +++++++------------
 1 file changed, 16 insertions(+), 28 deletions(-)

diff --git a/website/client/components/settings/deleteModal.vue b/website/client/components/settings/deleteModal.vue
index e52e4989f1..34838b0504 100644
--- a/website/client/components/settings/deleteModal.vue
+++ b/website/client/components/settings/deleteModal.vue
@@ -1,31 +1,19 @@
 <template lang="pug">
   b-modal#delete(:title="$t('deleteAccount')", :hide-footer='true' size='md')
-    .regular-delete(v-if='user.auth.local.email')
-      strong {{ $t('deleteLocalAccountText') }}
-        br
-        .row
-          .col-6
-            input.form-control(type='password', v-model='password')
-        br
-        .row
-          #feedback.col-12.form-group
-            label(for='feedbackTextArea') {{ $t('feedback') }}
-            textarea#feedbackTextArea.form-control(v-model='feedback')
-      .modal-footer
-        button.btn.btn-primary(@click='close()') {{ $t('neverMind') }}
-        button.btn.btn-danger(@click='deleteAccount()', :disabled='!password') {{ $t('deleteDo') }}
-        .modal-header
-    .social-delete(v-if='!user.auth.local.email')
-      h4 {{ $t('deleteAccount') }}
-      .modal-body
-        p {{ $t('deleteSocialAccountText', {magicWord: 'DELETE'}) }}
-        br
-        .row
-          .col-md-6
-            input.form-control(type='text', v-model='password')
-      .modal-footer
-        button.btn.btn-secondary(@click='close()') {{ $t('neverMind') }}
-        button.btn.btn-danger(:disabled='!password', @click='deleteAccount()') {{ $t('deleteDo') }}
+    .modal-body
+      br
+      strong(v-if='user.auth.local.email') {{ $t('deleteLocalAccountText') }}
+      strong(v-if='!user.auth.local.email') {{ $t('deleteSocialAccountText', {magicWord: 'DELETE'}) }}
+      .row.mt-3
+        .col-6
+          input.form-control(type='password', v-model='password')
+      .row.mt-3
+        #feedback.col-12.form-group
+          label(for='feedbackTextArea') {{ $t('feedback') }}
+          textarea#feedbackTextArea.form-control(v-model='feedback')
+    .modal-footer
+      button.btn.btn-primary(@click='close()') {{ $t('neverMind') }}
+      button.btn.btn-danger(@click='deleteAccount()', :disabled='!password') {{ $t('deleteDo') }}
 </template>
 
 <script>
@@ -44,7 +32,7 @@ export default {
   },
   methods: {
     close () {
-      this.$root.$emit('bv::hide::modal', 'reset');
+      this.$root.$emit('bv::hide::modal', 'delete');
     },
     async deleteAccount () {
       await axios.delete('/api/v4/user', {
@@ -55,7 +43,7 @@ export default {
       });
       localStorage.clear();
       window.location.href = '/static/home';
-      this.$root.$emit('bv::hide::modal', 'reset');
+      this.$root.$emit('bv::hide::modal', 'delete');
     },
   },
 };