From d718153717c84bc8bd861e5e7eb303333f22bbbf Mon Sep 17 00:00:00 2001 From: negue Date: Sun, 20 Nov 2022 18:06:20 +0100 Subject: [PATCH] resetAccount --- .../client/src/pages/settings-overview.vue | 4 + .../src/pages/settings/generalSettings.vue | 3 + .../inlineSettings/_currentPasswordInput.vue | 2 +- .../inlineSettings/_saveCancelButtons.vue | 7 +- .../inlineSettings/displayNameSetting.vue | 2 +- .../inlineSettings/inlineSettingMixin.js | 6 +- .../inlineSettings/passwordSetting.vue | 8 +- .../settings/inlineSettings/resetAccount.vue | 114 ++++++++++++++++++ .../inlineSettings/userEmailSetting.vue | 8 +- .../inlineSettings/userNameSetting.vue | 8 +- website/common/locales/en/settings.json | 7 +- 11 files changed, 148 insertions(+), 21 deletions(-) create mode 100644 website/client/src/pages/settings/inlineSettings/resetAccount.vue diff --git a/website/client/src/pages/settings-overview.vue b/website/client/src/pages/settings-overview.vue index 93ce4a727a..e259747a99 100644 --- a/website/client/src/pages/settings-overview.vue +++ b/website/client/src/pages/settings-overview.vue @@ -119,6 +119,10 @@ font-size: 14px; font-weight: bold; color: $purple-300; + + &.danger { + color: $maroon-50; + } } .dialog-disclaimer { diff --git a/website/client/src/pages/settings/generalSettings.vue b/website/client/src/pages/settings/generalSettings.vue index 5f12ece39a..edb0752707 100644 --- a/website/client/src/pages/settings/generalSettings.vue +++ b/website/client/src/pages/settings/generalSettings.vue @@ -18,6 +18,7 @@ + @@ -56,9 +57,11 @@ import UserNameSetting from '@/pages/settings/inlineSettings/userNameSetting'; import UserEmailSetting from '@/pages/settings/inlineSettings/userEmailSetting'; import DisplayNameSetting from '@/pages/settings/inlineSettings/displayNameSetting'; import PasswordSetting from '@/pages/settings/inlineSettings/passwordSetting'; +import ResetAccount from '@/pages/settings/inlineSettings/resetAccount'; export default { components: { + ResetAccount, PasswordSetting, DisplayNameSetting, UserEmailSetting, diff --git a/website/client/src/pages/settings/inlineSettings/_currentPasswordInput.vue b/website/client/src/pages/settings/inlineSettings/_currentPasswordInput.vue index 562cd35c5b..88cca8f0ea 100644 --- a/website/client/src/pages/settings/inlineSettings/_currentPasswordInput.vue +++ b/website/client/src/pages/settings/inlineSettings/_currentPasswordInput.vue @@ -5,7 +5,7 @@ {{ $t(customLabel ?? "password") }}

@@ -22,7 +23,7 @@ diff --git a/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue b/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue index 3eda1312b7..5f903997a5 100644 --- a/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue +++ b/website/client/src/pages/settings/inlineSettings/displayNameSetting.vue @@ -184,7 +184,7 @@ export default { }, methods: { resetAndClose () { - this.show = false; + this.modalVisible = false; }, restoreDisplayName () { if (this.temporaryDisplayName.length < 1) { diff --git a/website/client/src/pages/settings/inlineSettings/inlineSettingMixin.js b/website/client/src/pages/settings/inlineSettings/inlineSettingMixin.js index 4c5d5623ce..ef81430c52 100644 --- a/website/client/src/pages/settings/inlineSettings/inlineSettingMixin.js +++ b/website/client/src/pages/settings/inlineSettings/inlineSettingMixin.js @@ -1,12 +1,12 @@ export const InlineSettingMixin = { data () { return { - show: false, + modalVisible: false, }; }, methods: { - resetAndClose () { - this.show = false; + closeModal () { + this.modalVisible = false; }, }, }; diff --git a/website/client/src/pages/settings/inlineSettings/passwordSetting.vue b/website/client/src/pages/settings/inlineSettings/passwordSetting.vue index c2cc19327f..d615d1d374 100644 --- a/website/client/src/pages/settings/inlineSettings/passwordSetting.vue +++ b/website/client/src/pages/settings/inlineSettings/passwordSetting.vue @@ -1,7 +1,7 @@