From 9108737d55300d8a4f822ba94335d8b53f04854d Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Sun, 7 Apr 2019 20:33:11 +0300 Subject: Webpack 4, ESLint with Vue, Node-sass, updated dependencies overall. New linting. --- src/components/user_settings/user_settings.vue | 389 ++++++++++++++++++------- 1 file changed, 290 insertions(+), 99 deletions(-) (limited to 'src/components/user_settings/user_settings.vue') diff --git a/src/components/user_settings/user_settings.vue b/src/components/user_settings/user_settings.vue index c08698dc..ee5d368b 100644 --- a/src/components/user_settings/user_settings.vue +++ b/src/components/user_settings/user_settings.vue @@ -2,15 +2,23 @@
- {{$t('settings.user_settings')}} + {{ $t('settings.user_settings') }}
@@ -19,132 +27,258 @@
-
-

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

-

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

- +

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

+

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

+ -

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

+

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

- - + +

- -
+ +
+ :show-all="true" + :user-default="newDefaultScope" + :on-scope-change="changeVis" + />

- - + +

- - + +

- - + +

- - - + + +

- +
-

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

-

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

-

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

- -

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

- - +

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

+

+ {{ $t('settings.avatar_size_instruction') }} +

+

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

+ +

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

+ +
-

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

-

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

- -

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

- +

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

+

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

+ +

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

+
- +
- - -
+ + +
Error: {{ bannerUploadError }} - +
-

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

-

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

- +

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

+

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

+
- +
- - -
+ + +
Error: {{ backgroundUploadError }} - +
-

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

+

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

-

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

- +

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

+
-

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

- +

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

+
-

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

- +

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

+
- -

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

-

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

-

{{changePasswordError}}

+ +

+ {{ $t('settings.changed_password') }} +

+

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

+

+ {{ changePasswordError }} +

-

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

+

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

- - - + + + - - - + + + @@ -153,56 +287,113 @@
-

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

-

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

+

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

+

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

-

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

-

{{$t('login.password')}}

- - +

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

+

{{ $t('login.password') }}

+ +
-

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

-

{{deleteAccountError}}

- +

+ {{ $t('settings.delete_account_error') }} +

+

+ {{ deleteAccountError }} +

+
-
+
-

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

-

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

+

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

+

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

- + - - + +
- -

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

+ +

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

- -

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

+ +

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

-
-

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

- +
+

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

+
-
-

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

+
+

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

- +
- +
-- cgit v1.2.3-70-g09d2
{{$t('settings.app_name')}}{{$t('settings.valid_until')}}{{ $t('settings.app_name') }}{{ $t('settings.valid_until') }}
{{oauthToken.appName}}{{oauthToken.validUntil}}
{{ oauthToken.appName }}{{ oauthToken.validUntil }} -