From 963b0db3d3f633ac45321d50f5d98bb60e3a59ee Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 19 Feb 2019 03:38:34 +0900 Subject: [PATCH] =?UTF-8?q?=E3=82=B3=E3=83=B3=E3=83=9D=E3=83=BC=E3=83=8D?= =?UTF-8?q?=E3=83=B3=E3=83=88=E6=95=B4=E7=90=86?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- locales/ja-JP.yml | 6 -- .../app/common/views/components/user-list.vue | 16 ++- .../app/desktop/views/components/index.ts | 2 - .../desktop/views/components/user-card.vue | 85 ---------------- .../app/mobile/views/components/index.ts | 4 - .../app/mobile/views/components/user-card.vue | 62 ------------ .../mobile/views/components/user-preview.vue | 99 ------------------- .../pages/user/home.followers-you-know.vue | 65 ------------ .../mobile/views/pages/user/home.friends.vue | 56 ----------- .../app/mobile/views/pages/user/home.vue | 98 ++++++------------ 10 files changed, 43 insertions(+), 450 deletions(-) delete mode 100644 src/client/app/desktop/views/components/user-card.vue delete mode 100644 src/client/app/mobile/views/components/user-card.vue delete mode 100644 src/client/app/mobile/views/components/user-preview.vue delete mode 100644 src/client/app/mobile/views/pages/user/home.followers-you-know.vue delete mode 100644 src/client/app/mobile/views/pages/user/home.friends.vue diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 7cd1f4d3c4..492c1eddb9 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -1794,12 +1794,6 @@ mobile/views/pages/user/home.vue: followers-you-know: "知り合いのフォロワー" last-used-at: "最終ログイン" -mobile/views/pages/user/home.followers-you-know.vue: - no-users: "知り合いのユーザーはいません" - -mobile/views/pages/user/home.friends.vue: - no-users: "よく話すユーザーはいません" - mobile/views/pages/user/home.notes.vue: no-notes: "投稿はありません" diff --git a/src/client/app/common/views/components/user-list.vue b/src/client/app/common/views/components/user-list.vue index 48ca54666f..80f43908f4 100644 --- a/src/client/app/common/views/components/user-list.vue +++ b/src/client/app/common/views/components/user-list.vue @@ -4,13 +4,13 @@ -
+

{{ $t('no-users') }}

-
+

@{{ user | acct }}

@@ -98,6 +98,18 @@ export default Vue.extend({ > .user > .body > .description display none + &.iconOnly + padding 12px + + > .user + display inline-block + padding 0 + border-bottom none + + > .avatar + display inline-block + margin 4px + > .no-users text-align center color var(--text) diff --git a/src/client/app/desktop/views/components/index.ts b/src/client/app/desktop/views/components/index.ts index 3840328ec4..bee10b940a 100644 --- a/src/client/app/desktop/views/components/index.ts +++ b/src/client/app/desktop/views/components/index.ts @@ -15,7 +15,6 @@ import notePreview from './note-preview.vue'; import noteDetail from './note-detail.vue'; import calendar from './calendar.vue'; import activity from './activity.vue'; -import userCard from './user-card.vue'; import userListTimeline from './user-list-timeline.vue'; import uiContainer from './ui-container.vue'; @@ -34,6 +33,5 @@ Vue.component('mk-note-preview', notePreview); Vue.component('mk-note-detail', noteDetail); Vue.component('mk-calendar', calendar); Vue.component('mk-activity', activity); -Vue.component('mk-user-card', userCard); Vue.component('mk-user-list-timeline', userListTimeline); Vue.component('ui-container', uiContainer); diff --git a/src/client/app/desktop/views/components/user-card.vue b/src/client/app/desktop/views/components/user-card.vue deleted file mode 100644 index 61b3be9305..0000000000 --- a/src/client/app/desktop/views/components/user-card.vue +++ /dev/null @@ -1,85 +0,0 @@ - - - - - diff --git a/src/client/app/mobile/views/components/index.ts b/src/client/app/mobile/views/components/index.ts index 6f2640373e..4df347ef4c 100644 --- a/src/client/app/mobile/views/components/index.ts +++ b/src/client/app/mobile/views/components/index.ts @@ -7,12 +7,10 @@ import mediaVideo from './media-video.vue'; import notePreview from './note-preview.vue'; import subNoteContent from './sub-note-content.vue'; import noteCard from './note-card.vue'; -import userCard from './user-card.vue'; import noteDetail from './note-detail.vue'; import notification from './notification.vue'; import notifications from './notifications.vue'; import notificationPreview from './notification-preview.vue'; -import userPreview from './user-preview.vue'; import userTimeline from './user-timeline.vue'; import userListTimeline from './user-list-timeline.vue'; import uiContainer from './ui-container.vue'; @@ -25,12 +23,10 @@ Vue.component('mk-media-video', mediaVideo); Vue.component('mk-note-preview', notePreview); Vue.component('mk-sub-note-content', subNoteContent); Vue.component('mk-note-card', noteCard); -Vue.component('mk-user-card', userCard); Vue.component('mk-note-detail', noteDetail); Vue.component('mk-notification', notification); Vue.component('mk-notifications', notifications); Vue.component('mk-notification-preview', notificationPreview); -Vue.component('mk-user-preview', userPreview); Vue.component('mk-user-timeline', userTimeline); Vue.component('mk-user-list-timeline', userListTimeline); Vue.component('ui-container', uiContainer); diff --git a/src/client/app/mobile/views/components/user-card.vue b/src/client/app/mobile/views/components/user-card.vue deleted file mode 100644 index c38d475690..0000000000 --- a/src/client/app/mobile/views/components/user-card.vue +++ /dev/null @@ -1,62 +0,0 @@ - - - - - diff --git a/src/client/app/mobile/views/components/user-preview.vue b/src/client/app/mobile/views/components/user-preview.vue deleted file mode 100644 index ea8bbe242f..0000000000 --- a/src/client/app/mobile/views/components/user-preview.vue +++ /dev/null @@ -1,99 +0,0 @@ - - - - - diff --git a/src/client/app/mobile/views/pages/user/home.followers-you-know.vue b/src/client/app/mobile/views/pages/user/home.followers-you-know.vue deleted file mode 100644 index 0c3efc85f2..0000000000 --- a/src/client/app/mobile/views/pages/user/home.followers-you-know.vue +++ /dev/null @@ -1,65 +0,0 @@ - - - - - diff --git a/src/client/app/mobile/views/pages/user/home.friends.vue b/src/client/app/mobile/views/pages/user/home.friends.vue deleted file mode 100644 index 177abe7aa2..0000000000 --- a/src/client/app/mobile/views/pages/user/home.friends.vue +++ /dev/null @@ -1,56 +0,0 @@ - - - - - diff --git a/src/client/app/mobile/views/pages/user/home.vue b/src/client/app/mobile/views/pages/user/home.vue index f9b7e7f90a..00c63c288d 100644 --- a/src/client/app/mobile/views/pages/user/home.vue +++ b/src/client/app/mobile/views/pages/user/home.vue @@ -1,36 +1,26 @@ @@ -39,66 +29,36 @@ import Vue from 'vue'; import i18n from '../../../../i18n'; import XNotes from './home.notes.vue'; import XPhotos from './home.photos.vue'; -import XFriends from './home.friends.vue'; -import XFollowersYouKnow from './home.followers-you-know.vue'; export default Vue.extend({ i18n: i18n('mobile/views/pages/user/home.vue'), components: { XNotes, XPhotos, - XFriends, - XFollowersYouKnow, XActivity: () => import('../../../../common/views/components/activity.vue').then(m => m.default) }, - props: ['user'] + props: ['user'], + data() { + return { + makeFrequentlyRepliedUsersPromise: () => this.$root.api('users/get_frequently_replied_users', { + userId: this.user.id + }).then(res => res.map(x => x.user)), + makeFollowersYouKnowPromise: () => this.$root.api('users/followers', { + userId: this.user.id, + iknow: true, + limit: 30 + }).then(res => res.users), + }; + } });