From 7896242f57b077275ceb0e48779e1bd5b2c99042 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 13 Nov 2018 16:19:46 +0900 Subject: [PATCH] [Client] Fix #3213 --- locales/ja-JP.yml | 9 +- .../common/views/components/follow-button.vue | 184 ++++++++++++++++++ .../app/common/views/components/index.ts | 2 + .../views/components/follow-button.vue | 157 --------------- .../app/desktop/views/components/index.ts | 2 - .../desktop/views/components/user-card.vue | 2 +- .../desktop/views/components/user-preview.vue | 4 +- .../views/pages/deck/deck.user-column.vue | 2 +- .../desktop/views/pages/user/user.friends.vue | 4 +- .../desktop/views/pages/user/user.profile.vue | 2 +- .../app/desktop/views/widgets/users.vue | 5 - .../mobile/views/components/follow-button.vue | 134 ------------- .../app/mobile/views/components/index.ts | 2 - .../app/mobile/views/components/user-card.vue | 4 +- src/client/app/mobile/views/pages/user.vue | 3 - 15 files changed, 196 insertions(+), 320 deletions(-) create mode 100644 src/client/app/common/views/components/follow-button.vue delete mode 100644 src/client/app/desktop/views/components/follow-button.vue delete mode 100644 src/client/app/mobile/views/components/follow-button.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index de21364b91..7d716f6ca3 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -668,13 +668,6 @@ desktop/views/components/media-video.vue: sensitive: "閲覧注意" click-to-show: "クリックして表示" -desktop/views/components/follow-button.vue: - following: "フォロー中" - follow: "フォロー" - request-pending: "フォロー許可待ち" - follow-processing: "フォロー処理中" - follow-request: "フォロー申請" - desktop/views/components/followers-window.vue: followers: "{} のフォロワー" @@ -1336,7 +1329,7 @@ mobile/views/components/media-video.vue: sensitive: "閲覧注意" click-to-show: "クリックして表示" -mobile/views/components/follow-button.vue: +common/views/components/follow-button.vue: following: "フォロー中" follow: "フォロー" request-pending: "フォロー許可待ち" diff --git a/src/client/app/common/views/components/follow-button.vue b/src/client/app/common/views/components/follow-button.vue new file mode 100644 index 0000000000..d88a11aca8 --- /dev/null +++ b/src/client/app/common/views/components/follow-button.vue @@ -0,0 +1,184 @@ + + + + + diff --git a/src/client/app/common/views/components/index.ts b/src/client/app/common/views/components/index.ts index f6ab63e63a..071c31a0d5 100644 --- a/src/client/app/common/views/components/index.ts +++ b/src/client/app/common/views/components/index.ts @@ -1,5 +1,6 @@ import Vue from 'vue'; +import followButton from './follow-button.vue'; import muteAndBlock from './mute-and-block.vue'; import error from './error.vue'; import apiSettings from './api-settings.vue'; @@ -51,6 +52,7 @@ import uiInfo from './ui/info.vue'; import formButton from './ui/form/button.vue'; import formRadio from './ui/form/radio.vue'; +Vue.component('mk-follow-button', followButton); Vue.component('mk-mute-and-block', muteAndBlock); Vue.component('mk-error', error); Vue.component('mk-api-settings', apiSettings); diff --git a/src/client/app/desktop/views/components/follow-button.vue b/src/client/app/desktop/views/components/follow-button.vue deleted file mode 100644 index 70711d1d8c..0000000000 --- a/src/client/app/desktop/views/components/follow-button.vue +++ /dev/null @@ -1,157 +0,0 @@ - - - - - diff --git a/src/client/app/desktop/views/components/index.ts b/src/client/app/desktop/views/components/index.ts index 6d516c118a..36636c98e3 100644 --- a/src/client/app/desktop/views/components/index.ts +++ b/src/client/app/desktop/views/components/index.ts @@ -14,7 +14,6 @@ import mediaVideo from './media-video.vue'; import notifications from './notifications.vue'; import noteForm from './post-form.vue'; import renoteForm from './renote-form.vue'; -import followButton from './follow-button.vue'; import notePreview from './note-preview.vue'; import noteDetail from './note-detail.vue'; import settings from './settings.vue'; @@ -39,7 +38,6 @@ Vue.component('mk-media-video', mediaVideo); Vue.component('mk-notifications', notifications); Vue.component('mk-post-form', noteForm); Vue.component('mk-renote-form', renoteForm); -Vue.component('mk-follow-button', followButton); Vue.component('mk-note-preview', notePreview); Vue.component('mk-note-detail', noteDetail); Vue.component('mk-settings', settings); diff --git a/src/client/app/desktop/views/components/user-card.vue b/src/client/app/desktop/views/components/user-card.vue index bd5c6eed09..54fa15a190 100644 --- a/src/client/app/desktop/views/components/user-card.vue +++ b/src/client/app/desktop/views/components/user-card.vue @@ -2,7 +2,7 @@
-
- +