From 262760d2586cac48da27cf7eb5389116d4023dfe Mon Sep 17 00:00:00 2001 From: Henry Jameson Date: Wed, 10 Apr 2019 21:48:42 +0300 Subject: [PATCH] revert unnecessary changes --- src/App.vue | 113 +-- src/boot/routes.js | 4 +- src/components/about/about.vue | 6 +- src/components/attachment/attachment.js | 2 +- src/components/attachment/attachment.vue | 100 +- .../basic_user_card/basic_user_card.vue | 47 +- src/components/block_card/block_card.vue | 14 +- src/components/chat_panel/chat_panel.js | 2 +- src/components/chat_panel/chat_panel.vue | 59 +- src/components/color_input/color_input.vue | 65 +- .../contrast_ratio/contrast_ratio.vue | 52 +- .../conversation-page/conversation-page.vue | 4 +- src/components/conversation/conversation.js | 10 +- src/components/conversation/conversation.vue | 25 +- src/components/delete_button/delete_button.js | 2 +- .../delete_button/delete_button.vue | 7 +- src/components/dm_timeline/dm_timeline.vue | 6 +- src/components/emoji-input/emoji-input.js | 5 +- src/components/emoji-input/emoji-input.vue | 41 +- .../export_import/export_import.vue | 33 +- .../favorite_button/favorite_button.js | 4 +- .../favorite_button/favorite_button.vue | 17 +- .../features_panel/features_panel.vue | 22 +- src/components/follow_card/follow_card.js | 2 +- src/components/follow_card/follow_card.vue | 19 +- .../follow_request_card.vue | 14 +- .../follow_requests/follow_requests.vue | 8 +- src/components/font_control/font_control.vue | 81 +- .../friends_timeline/friends_timeline.vue | 6 +- src/components/gallery/gallery.vue | 19 +- .../image_cropper/image_cropper.vue | 55 +- .../instance_specific_panel.vue | 8 +- .../interface_language_switcher.vue | 52 +- src/components/link-preview/link-preview.vue | 20 +- src/components/login_form/login_form.js | 2 +- src/components/login_form/login_form.vue | 100 +- src/components/media_modal/media_modal.vue | 22 +- src/components/media_upload/media_upload.js | 6 +- src/components/media_upload/media_upload.vue | 30 +- src/components/mentions/mentions.vue | 6 +- src/components/mobile_nav/mobile_nav.vue | 71 +- .../mobile_post_status_modal.vue | 42 +- src/components/mute_card/mute_card.vue | 14 +- src/components/nav_panel/nav_panel.vue | 17 +- src/components/notification/notification.vue | 87 +- .../notifications/notifications.vue | 61 +- .../oauth_callback/oauth_callback.js | 2 +- .../opacity_input/opacity_input.vue | 58 +- .../post_status_form/post_status_form.js | 29 +- .../post_status_form/post_status_form.vue | 262 ++---- .../public_and_external_timeline.vue | 6 +- .../public_timeline/public_timeline.vue | 6 +- src/components/range_input/range_input.vue | 79 +- src/components/registration/registration.js | 4 +- src/components/registration/registration.vue | 225 +---- .../remote_follow/remote_follow.vue | 22 +- .../retweet_button/retweet_button.js | 4 +- .../retweet_button/retweet_button.vue | 23 +- .../scope_selector/scope_selector.js | 8 +- .../scope_selector/scope_selector.vue | 56 +- src/components/settings/settings.vue | 747 ++++++--------- .../shadow_control/shadow_control.vue | 303 +++---- src/components/side_drawer/side_drawer.vue | 92 +- src/components/status/status.js | 8 +- src/components/status/status.vue | 362 ++------ src/components/still-image/still-image.vue | 18 +- src/components/style_switcher/preview.vue | 163 ++-- .../style_switcher/style_switcher.vue | 853 ++++++------------ src/components/tab_switcher/tab_switcher.js | 40 +- src/components/tag_timeline/tag_timeline.vue | 9 +- .../terms_of_service_panel.vue | 6 +- src/components/timeline/timeline.js | 2 +- src/components/timeline/timeline.vue | 59 +- src/components/user_avatar/user_avatar.vue | 2 +- src/components/user_card/user_card.js | 18 +- src/components/user_card/user_card.vue | 340 +++---- src/components/user_finder/user_finder.vue | 37 +- src/components/user_panel/user_panel.vue | 16 +- src/components/user_profile/user_profile.vue | 123 +-- src/components/user_search/user_search.js | 2 +- src/components/user_search/user_search.vue | 35 +- src/components/user_settings/user_settings.js | 26 +- .../user_settings/user_settings.vue | 389 ++------ .../video_attachment/video_attachment.vue | 5 +- src/components/who_to_follow/who_to_follow.js | 2 +- .../who_to_follow/who_to_follow.vue | 8 +- .../who_to_follow_panel.js | 2 +- .../who_to_follow_panel.vue | 19 +- src/hocs/with_list/with_list.js | 10 +- src/hocs/with_load_more/with_load_more.js | 56 +- .../with_subscription/with_subscription.js | 68 +- src/modules/api.js | 10 +- src/modules/chat.js | 4 +- src/modules/config.js | 4 +- src/modules/errors.js | 1 + src/modules/instance.js | 2 +- src/modules/oauth_tokens.js | 4 +- src/modules/statuses.js | 8 +- src/modules/users.js | 24 +- src/services/api/api.service.js | 80 +- .../backend_interactor_service.js | 78 +- src/services/color_convert/color_convert.js | 2 +- src/services/completion/completion.js | 2 +- .../file_size_format/file_size_format.js | 2 +- .../follow_request_fetcher.service.js | 2 +- src/services/new_api/oauth.js | 8 +- src/services/new_api/user_search.js | 6 +- src/services/new_api/utils.js | 4 +- .../notification_utils/notification_utils.js | 2 +- .../notifications_fetcher.service.js | 8 +- .../status_poster/status_poster.service.js | 2 +- src/services/style_setter/style_setter.js | 12 +- .../timeline_fetcher.service.js | 10 +- .../user_highlighter/user_highlighter.js | 2 +- test/unit/specs/modules/statuses.spec.js | 58 +- test/unit/specs/modules/users.spec.js | 4 +- .../entity_normalizer.spec.js | 16 +- .../file_size_format/file_size_format.spec.js | 66 +- .../status_parser/status_parses.spec.js | 4 +- yarn.lock | 7 - 120 files changed, 2128 insertions(+), 4290 deletions(-) diff --git a/src/App.vue b/src/App.vue index e1f6b4a55b..3b8623ad77 100644 --- a/src/App.vue +++ b/src/App.vue @@ -1,112 +1,51 @@ diff --git a/src/boot/routes.js b/src/boot/routes.js index 3538c1e606..7e54a98bcb 100644 --- a/src/boot/routes.js +++ b/src/boot/routes.js @@ -24,8 +24,8 @@ export default (store) => { path: '/', redirect: _to => { return (store.state.users.currentUser - ? store.state.instance.redirectRootLogin - : store.state.instance.redirectRootNoLogin) || '/main/all' + ? store.state.instance.redirectRootLogin + : store.state.instance.redirectRootNoLogin) || '/main/all' } }, { name: 'public-external-timeline', path: '/main/all', component: PublicAndExternalTimeline }, diff --git a/src/components/about/about.vue b/src/components/about/about.vue index 62ae16ea38..13dec87c55 100644 --- a/src/components/about/about.vue +++ b/src/components/about/about.vue @@ -1,8 +1,8 @@ diff --git a/src/components/attachment/attachment.js b/src/components/attachment/attachment.js index e93921fe11..3b7f08dcdb 100644 --- a/src/components/attachment/attachment.js +++ b/src/components/attachment/attachment.js @@ -51,7 +51,7 @@ const Attachment = { } }, methods: { - linkClicked ({ target }) { + linkClicked ({target}) { if (target.tagName === 'A') { window.open(target.href, '_blank') } diff --git a/src/components/attachment/attachment.vue b/src/components/attachment/attachment.vue index 12ed915898..c58bebd331 100644 --- a/src/components/attachment/attachment.vue +++ b/src/components/attachment/attachment.vue @@ -1,104 +1,54 @@