From 56ddeec8f3452a5b75af713a40d0b5e8fa75b3cd Mon Sep 17 00:00:00 2001 From: Foxhkron Date: Sun, 19 Aug 2018 01:23:03 +0200 Subject: [PATCH] Merge upstream --- src/components/user_settings/user_settings.js | 6 +++- .../user_settings/user_settings.vue | 32 +++++++++++++------ src/i18n/messages.js | 5 ++- 3 files changed, 32 insertions(+), 11 deletions(-) diff --git a/src/components/user_settings/user_settings.js b/src/components/user_settings/user_settings.js index 2b2de913..f046885e 100644 --- a/src/components/user_settings/user_settings.js +++ b/src/components/user_settings/user_settings.js @@ -18,7 +18,8 @@ const UserSettings = { deleteAccountError: false, changePasswordInputs: [ '', '', '' ], changedPassword: false, - changePasswordError: false + changePasswordError: false, + activeTab: 'profile' } }, components: { @@ -235,6 +236,9 @@ const UserSettings = { this.changePasswordError = res.error } }) + }, + activateTab (tabName) { + this.activeTab = tabName } } } diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index 1a52da0f..c3ca1dbd 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -4,7 +4,12 @@ {{$t('settings.user_settings')}}
-
+
+ + + +
+

{{$t('settings.name_bio')}}

{{$t('settings.name')}}

@@ -25,7 +30,7 @@
-
+

{{$t('settings.avatar')}}

{{$t('settings.current_avatar')}}

@@ -38,7 +43,7 @@
-
+

{{$t('settings.profile_banner')}}

{{$t('settings.current_profile_banner')}}

@@ -51,7 +56,7 @@
-
+

{{$t('settings.profile_background')}}

{{$t('settings.set_new_profile_background')}}

@@ -62,7 +67,7 @@
-
+

{{$t('settings.change_password')}}

{{$t('settings.current_password')}}

@@ -81,7 +86,7 @@

{{$t('settings.change_password_error')}}

{{changePasswordError}}

-
+

{{$t('settings.follow_import')}}

{{$t('settings.import_followers_from_a_csv_file')}}

@@ -98,15 +103,15 @@

{{$t('settings.follow_import_error')}}

-
+

{{$t('settings.follow_export')}}

-
+

{{$t('settings.follow_export_processing')}}


-
+

{{$t('settings.delete_account')}}

{{$t('settings.delete_account_description')}}

@@ -146,4 +151,13 @@ margin: 0.25em; } } + +.tab-switcher { + margin: 7px 7px; + display: inline-block; + + button { + height: 30px; + } +} diff --git a/src/i18n/messages.js b/src/i18n/messages.js index 185db5d9..38e58c4c 100644 --- a/src/i18n/messages.js +++ b/src/i18n/messages.js @@ -333,7 +333,10 @@ const en = { changed_password: 'Password changed successfully!', change_password_error: 'There was an issue changing your password.', lock_account_description: 'Restrict your account to approved followers only', - default_vis: 'Default visibility scope' + default_vis: 'Default visibility scope', + profile_tab: 'Profile', + security_tab: 'Security', + data_import_export_tab: 'Data Import / Export' }, notifications: { notifications: 'Notifications',