From e88ce1746ddab75baa2fbb70efa594c0b126859d Mon Sep 17 00:00:00 2001 From: syuilo Date: Wed, 19 Dec 2018 07:22:01 +0900 Subject: [PATCH] =?UTF-8?q?=E3=83=AA=E3=82=B9=E3=83=88=E9=96=A2=E9=80=A3?= =?UTF-8?q?=E3=81=AE=E6=93=8D=E4=BD=9C=E3=82=92=E5=BC=B7=E5=8C=96?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Resolve #2069 Resolve #2051 Resolve #2807 Resolve #3647 --- locales/ja-JP.yml | 8 + .../views/components/user-list-editor.vue | 150 ++++++++++++++++++ .../views/components/ui.header.account.vue | 5 +- .../views/components/user-list-window.vue | 24 +++ .../views/components/user-lists-window.vue | 2 +- .../app/mobile/views/pages/user-list.vue | 21 +-- src/server/api/endpoints/users/lists/pull.ts | 64 ++++++++ 7 files changed, 257 insertions(+), 17 deletions(-) create mode 100644 src/client/app/common/views/components/user-list-editor.vue create mode 100644 src/client/app/desktop/views/components/user-list-window.vue create mode 100644 src/server/api/endpoints/users/lists/pull.ts diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 1627c13717..9e8be4b714 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -519,6 +519,14 @@ common/views/components/profile-editor.vue: email-verified: "メールアドレスが確認されました" email-not-verified: "メールアドレスが確認されていません。メールボックスをご確認ください。" +common/views/components/user-list-editor.vue: + users: "ユーザー" + rename: "リスト名を変更" + delete: "リストを削除" + remove-user: "このリストから削除" + delete-are-you-sure: "リスト「$1」を削除しますか?" + deleted: "削除しました" + common/views/widgets/broadcast.vue: fetching: "確認中" no-broadcasts: "お知らせはありません" diff --git a/src/client/app/common/views/components/user-list-editor.vue b/src/client/app/common/views/components/user-list-editor.vue new file mode 100644 index 0000000000..1b068da86a --- /dev/null +++ b/src/client/app/common/views/components/user-list-editor.vue @@ -0,0 +1,150 @@ + + + + + diff --git a/src/client/app/desktop/views/components/ui.header.account.vue b/src/client/app/desktop/views/components/ui.header.account.vue index 09f407b0ed..bba106616c 100644 --- a/src/client/app/desktop/views/components/ui.header.account.vue +++ b/src/client/app/desktop/views/components/ui.header.account.vue @@ -92,6 +92,7 @@ import Vue from 'vue'; import i18n from '../../../i18n'; import MkUserListsWindow from './user-lists-window.vue'; +import MkUserListWindow from './user-list-window.vue'; import MkFollowRequestsWindow from './received-follow-requests-window.vue'; import MkSettingsWindow from './settings-window.vue'; import MkDriveWindow from './drive-window.vue'; @@ -143,7 +144,9 @@ export default Vue.extend({ this.close(); const w = this.$root.new(MkUserListsWindow); w.$once('choosen', list => { - this.$router.push(`i/lists/${ list.id }`); + this.$root.new(MkUserListWindow, { + list + }); }); }, followRequests() { diff --git a/src/client/app/desktop/views/components/user-list-window.vue b/src/client/app/desktop/views/components/user-list-window.vue new file mode 100644 index 0000000000..054a133a4c --- /dev/null +++ b/src/client/app/desktop/views/components/user-list-window.vue @@ -0,0 +1,24 @@ + + + diff --git a/src/client/app/desktop/views/components/user-lists-window.vue b/src/client/app/desktop/views/components/user-lists-window.vue index 89a0d7b9e3..4ecbc760e5 100644 --- a/src/client/app/desktop/views/components/user-lists-window.vue +++ b/src/client/app/desktop/views/components/user-lists-window.vue @@ -1,5 +1,5 @@ @@ -15,13 +11,16 @@