From 11349561d697b11df7bcaa3d57ed3498eb4dd3c5 Mon Sep 17 00:00:00 2001 From: syuilo Date: Tue, 20 Apr 2021 23:22:59 +0900 Subject: Use FontAwesome as web font instead of vue component (#7469) * wip * wip * wip * wip * wip * wip * wip * wip * wip * Update yarn.lock * wip * wip --- src/client/pages/instance/abuses.vue | 5 +- src/client/pages/instance/announcements.vue | 11 +-- src/client/pages/instance/emoji-edit-dialog.vue | 4 +- src/client/pages/instance/emojis.vue | 15 ++-- src/client/pages/instance/federation.vue | 18 ++-- src/client/pages/instance/file-dialog.vue | 7 +- src/client/pages/instance/files.vue | 11 +-- src/client/pages/instance/index.metrics.vue | 30 ++++--- src/client/pages/instance/index.vue | 16 ++-- src/client/pages/instance/instance.vue | 6 +- src/client/pages/instance/logs.vue | 7 +- src/client/pages/instance/queue.vue | 11 +-- src/client/pages/instance/relays.vue | 13 ++- src/client/pages/instance/settings.vue | 106 ++++++++++++------------ src/client/pages/instance/user-dialog.vue | 19 ++--- src/client/pages/instance/users.vue | 23 +++-- 16 files changed, 129 insertions(+), 173 deletions(-) (limited to 'src/client/pages/instance') diff --git a/src/client/pages/instance/abuses.vue b/src/client/pages/instance/abuses.vue index c8355b0683..7666bc1a44 100644 --- a/src/client/pages/instance/abuses.vue +++ b/src/client/pages/instance/abuses.vue @@ -63,8 +63,6 @@ diff --git a/src/client/pages/instance/bot-protection.vue b/src/client/pages/instance/bot-protection.vue new file mode 100644 index 0000000000..449b8a233d --- /dev/null +++ b/src/client/pages/instance/bot-protection.vue @@ -0,0 +1,138 @@ + + + diff --git a/src/client/pages/instance/database.vue b/src/client/pages/instance/database.vue new file mode 100644 index 0000000000..a41d61ce2b --- /dev/null +++ b/src/client/pages/instance/database.vue @@ -0,0 +1,60 @@ + + + diff --git a/src/client/pages/instance/email-settings.vue b/src/client/pages/instance/email-settings.vue new file mode 100644 index 0000000000..9965a1420f --- /dev/null +++ b/src/client/pages/instance/email-settings.vue @@ -0,0 +1,127 @@ + + + diff --git a/src/client/pages/instance/emojis.vue b/src/client/pages/instance/emojis.vue index 88bebb40e0..fd641703cb 100644 --- a/src/client/pages/instance/emojis.vue +++ b/src/client/pages/instance/emojis.vue @@ -1,50 +1,46 @@ @@ -67,6 +63,8 @@ export default defineComponent({ MkPagination, }, + emits: ['info'], + data() { return { [symbols.PAGE_INFO]: { @@ -99,6 +97,10 @@ export default defineComponent({ } }, + async mounted() { + this.$emit('info', this[symbols.PAGE_INFO]); + }, + methods: { async add(e) { const files = await selectFile(e.currentTarget || e.target, null, true); @@ -150,85 +152,86 @@ export default defineComponent({ diff --git a/src/client/pages/instance/index.vue b/src/client/pages/instance/index.vue index f0240718aa..10406f339b 100644 --- a/src/client/pages/instance/index.vue +++ b/src/client/pages/instance/index.vue @@ -1,171 +1,239 @@ - bytes, + diff --git a/src/client/pages/instance/instance-block.vue b/src/client/pages/instance/instance-block.vue new file mode 100644 index 0000000000..ed5740f339 --- /dev/null +++ b/src/client/pages/instance/instance-block.vue @@ -0,0 +1,71 @@ + + + diff --git a/src/client/pages/instance/integrations-discord.vue b/src/client/pages/instance/integrations-discord.vue new file mode 100644 index 0000000000..c7508918f8 --- /dev/null +++ b/src/client/pages/instance/integrations-discord.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/client/pages/instance/integrations-github.vue b/src/client/pages/instance/integrations-github.vue new file mode 100644 index 0000000000..16586b15b4 --- /dev/null +++ b/src/client/pages/instance/integrations-github.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/client/pages/instance/integrations-twitter.vue b/src/client/pages/instance/integrations-twitter.vue new file mode 100644 index 0000000000..b08b7f40a5 --- /dev/null +++ b/src/client/pages/instance/integrations-twitter.vue @@ -0,0 +1,85 @@ + + + diff --git a/src/client/pages/instance/integrations.vue b/src/client/pages/instance/integrations.vue new file mode 100644 index 0000000000..7debedc367 --- /dev/null +++ b/src/client/pages/instance/integrations.vue @@ -0,0 +1,73 @@ + + + diff --git a/src/client/pages/instance/metrics.vue b/src/client/pages/instance/metrics.vue new file mode 100644 index 0000000000..18cfe5eee2 --- /dev/null +++ b/src/client/pages/instance/metrics.vue @@ -0,0 +1,455 @@ + + + + + diff --git a/src/client/pages/instance/object-storage.vue b/src/client/pages/instance/object-storage.vue new file mode 100644 index 0000000000..814aeb6e48 --- /dev/null +++ b/src/client/pages/instance/object-storage.vue @@ -0,0 +1,154 @@ + + + diff --git a/src/client/pages/instance/other-settings.vue b/src/client/pages/instance/other-settings.vue new file mode 100644 index 0000000000..b3954149a8 --- /dev/null +++ b/src/client/pages/instance/other-settings.vue @@ -0,0 +1,68 @@ + + + diff --git a/src/client/pages/instance/overview.vue b/src/client/pages/instance/overview.vue new file mode 100644 index 0000000000..651ace08f9 --- /dev/null +++ b/src/client/pages/instance/overview.vue @@ -0,0 +1,131 @@ + + + diff --git a/src/client/pages/instance/proxy-account.vue b/src/client/pages/instance/proxy-account.vue new file mode 100644 index 0000000000..3e2df8dcb4 --- /dev/null +++ b/src/client/pages/instance/proxy-account.vue @@ -0,0 +1,86 @@ + + + diff --git a/src/client/pages/instance/queue.chart.vue b/src/client/pages/instance/queue.chart.vue index 0eb70debfb..446c979209 100644 --- a/src/client/pages/instance/queue.chart.vue +++ b/src/client/pages/instance/queue.chart.vue @@ -1,27 +1,29 @@ + + diff --git a/src/client/pages/instance/queue.vue b/src/client/pages/instance/queue.vue index 0c1e0e51b5..2dccf48d31 100644 --- a/src/client/pages/instance/queue.vue +++ b/src/client/pages/instance/queue.vue @@ -1,43 +1,47 @@ diff --git a/src/client/pages/instance/security.vue b/src/client/pages/instance/security.vue new file mode 100644 index 0000000000..e3397a113b --- /dev/null +++ b/src/client/pages/instance/security.vue @@ -0,0 +1,77 @@ + + + diff --git a/src/client/pages/instance/service-worker.vue b/src/client/pages/instance/service-worker.vue new file mode 100644 index 0000000000..a52932bb75 --- /dev/null +++ b/src/client/pages/instance/service-worker.vue @@ -0,0 +1,84 @@ + + + diff --git a/src/client/pages/instance/settings.vue b/src/client/pages/instance/settings.vue index b827a77649..66f01c42c7 100644 --- a/src/client/pages/instance/settings.vue +++ b/src/client/pages/instance/settings.vue @@ -1,581 +1,132 @@ - - diff --git a/src/client/pages/instance/user.vue b/src/client/pages/instance/user.vue new file mode 100644 index 0000000000..fbc10a3672 --- /dev/null +++ b/src/client/pages/instance/user.vue @@ -0,0 +1,229 @@ + + + + + diff --git a/src/client/pages/instance/users.vue b/src/client/pages/instance/users.vue index 4db965588c..452886abde 100644 --- a/src/client/pages/instance/users.vue +++ b/src/client/pages/instance/users.vue @@ -1,86 +1,71 @@ diff --git a/src/client/pages/instance/file-dialog.vue b/src/client/pages/instance/file-dialog.vue index ae6755465c..74a755fa15 100644 --- a/src/client/pages/instance/file-dialog.vue +++ b/src/client/pages/instance/file-dialog.vue @@ -82,7 +82,7 @@ export default defineComponent({ }, showUser() { - os.pageWindow(`/instance/user/${this.file.userId}`); + os.pageWindow(`/user-info/${this.file.userId}`); }, async del() { diff --git a/src/client/pages/instance/user.vue b/src/client/pages/instance/user.vue deleted file mode 100644 index fbc10a3672..0000000000 --- a/src/client/pages/instance/user.vue +++ /dev/null @@ -1,229 +0,0 @@ - - - - - diff --git a/src/client/pages/instance/users.vue b/src/client/pages/instance/users.vue index 452886abde..2808b70fba 100644 --- a/src/client/pages/instance/users.vue +++ b/src/client/pages/instance/users.vue @@ -162,7 +162,7 @@ export default defineComponent({ }, show(user) { - os.pageWindow(`/instance/user/${user.id}`); + os.pageWindow(`/user-info/${user.id}`); }, acct diff --git a/src/client/pages/user-info.vue b/src/client/pages/user-info.vue index 378fbb7b50..090e8cdda8 100644 --- a/src/client/pages/user-info.vue +++ b/src/client/pages/user-info.vue @@ -1,35 +1,55 @@ @@ -38,6 +58,7 @@ import { computed, defineAsyncComponent, defineComponent } from 'vue'; import FormObjectView from '@client/components/form/object-view.vue'; import FormTextarea from '@client/components/form/textarea.vue'; +import FormSwitch from '@client/components/form/switch.vue'; import FormLink from '@client/components/form/link.vue'; import FormBase from '@client/components/form/base.vue'; import FormGroup from '@client/components/form/group.vue'; @@ -49,11 +70,13 @@ import number from '@client/filters/number'; import bytes from '@client/filters/bytes'; import * as symbols from '@client/symbols'; import { url } from '@client/config'; +import { userPage, acct } from '@client/filters/user'; export default defineComponent({ components: { FormBase, FormTextarea, + FormSwitch, FormObjectView, FormButton, FormLink, @@ -72,7 +95,7 @@ export default defineComponent({ data() { return { [symbols.PAGE_INFO]: computed(() => ({ - title: this.$ts.userInfo, + title: this.user ? acct(this.user) : this.$ts.userInfo, icon: 'fas fa-info-circle', actions: this.user ? [this.user.url ? { text: this.user.url, @@ -84,17 +107,23 @@ export default defineComponent({ })), init: null, user: null, + info: null, + moderator: false, + silenced: false, + suspended: false, + } + }, + + computed: { + iAmModerator(): boolean { + return this.$i && (this.$i.isAdmin || this.$i.isModerator); } }, watch: { userId: { handler() { - this.init = () => os.api('users/show', { - userId: this.userId - }).then(user => { - this.user = user; - }); + this.init = this.createFetcher(); }, immediate: true } @@ -103,6 +132,114 @@ export default defineComponent({ methods: { number, bytes, + userPage, + acct, + + createFetcher() { + if (this.iAmModerator) { + return () => Promise.all([os.api('users/show', { + userId: this.userId + }), os.api('admin/show-user', { + userId: this.userId + })]).then(([user, info]) => { + this.user = user; + this.info = info; + this.moderator = this.info.isModerator; + this.silenced = this.info.isSilenced; + this.suspended = this.info.isSuspended; + }); + } else { + return () => os.api('users/show', { + userId: this.userId + }).then((user) => { + this.user = user; + }); + } + }, + + refreshUser() { + this.init = this.createFetcher(); + }, + + async updateRemoteUser() { + await os.apiWithDialog('admin/update-remote-user', { userId: this.user.id }); + this.refreshUser(); + }, + + async resetPassword() { + os.apiWithDialog('admin/reset-password', { + userId: this.user.id, + }, undefined, ({ password }) => { + os.dialog({ + type: 'success', + text: this.$t('newPasswordIs', { password }) + }); + }); + }, + + async toggleSilence(v) { + const confirm = await os.dialog({ + type: 'warning', + showCancelButton: true, + text: v ? this.$ts.silenceConfirm : this.$ts.unsilenceConfirm, + }); + if (confirm.canceled) { + this.silenced = !v; + } else { + await os.api(v ? 'admin/silence-user' : 'admin/unsilence-user', { userId: this.user.id }); + await this.refreshUser(); + } + }, + + async toggleSuspend(v) { + const confirm = await os.dialog({ + type: 'warning', + showCancelButton: true, + text: v ? this.$ts.suspendConfirm : this.$ts.unsuspendConfirm, + }); + if (confirm.canceled) { + this.suspended = !v; + } else { + await os.api(v ? 'admin/suspend-user' : 'admin/unsuspend-user', { userId: this.user.id }); + await this.refreshUser(); + } + }, + + async toggleModerator(v) { + await os.api(v ? 'admin/moderators/add' : 'admin/moderators/remove', { userId: this.user.id }); + await this.refreshUser(); + }, + + async deleteAllFiles() { + const confirm = await os.dialog({ + type: 'warning', + showCancelButton: true, + text: this.$ts.deleteAllFilesConfirm, + }); + if (confirm.canceled) return; + const process = async () => { + await os.api('admin/delete-all-files-of-a-user', { userId: this.user.id }); + os.success(); + }; + await process().catch(e => { + os.dialog({ + type: 'error', + text: e.toString() + }); + }); + await this.refreshUser(); + }, } }); + + diff --git a/src/client/router.ts b/src/client/router.ts index 93de287ea5..26a4dac499 100644 --- a/src/client/router.ts +++ b/src/client/router.ts @@ -59,7 +59,6 @@ export const router = createRouter({ { path: '/my/antennas', component: page('my-antennas/index') }, { path: '/my/clips', component: page('my-clips/index') }, { path: '/scratchpad', component: page('scratchpad') }, - { path: '/instance/user/:user', component: page('instance/user'), props: route => ({ userId: route.params.user }) }, { path: '/instance/:page(.*)?', component: page('instance/index'), props: route => ({ initialPage: route.params.page || null }) }, { path: '/instance', component: page('instance/index') }, { path: '/notes/:note', name: 'note', component: page('note'), props: route => ({ noteId: route.params.note }) }, diff --git a/src/client/scripts/get-user-menu.ts b/src/client/scripts/get-user-menu.ts index 9a003b5c38..ceb2bfe173 100644 --- a/src/client/scripts/get-user-menu.ts +++ b/src/client/scripts/get-user-menu.ts @@ -124,13 +124,7 @@ export function getUserMenu(user) { action: () => { copyToClipboard(`@${user.username}@${user.host || host}`); } - }, ($i && ($i.isAdmin || $i.isModerator)) ? { - icon: 'fas fa-info-circle', - text: i18n.locale.info, - action: () => { - os.pageWindow(`/instance/user/${user.id}`); - } - } : { + }, { icon: 'fas fa-info-circle', text: i18n.locale.info, action: () => { diff --git a/src/client/scripts/lookup-user.ts b/src/client/scripts/lookup-user.ts index 1bcfd8e9db..269777d874 100644 --- a/src/client/scripts/lookup-user.ts +++ b/src/client/scripts/lookup-user.ts @@ -10,7 +10,7 @@ export async function lookupUser() { if (canceled) return; const show = (user) => { - os.pageWindow(`/instance/user/${user.id}`); + os.pageWindow(`/user-info/${user.id}`); }; const usernamePromise = os.api('users/show', parseAcct(result)); -- cgit v1.2.3-freya From 70a8dd30e034eb713a15e04ffdb9c7970c1303fc Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 23 Apr 2021 13:01:52 +0900 Subject: Improve client --- locales/ja-JP.yml | 6 +- package.json | 2 +- src/client/pages/instance/index.vue | 8 +- src/client/pages/settings/accounts.vue | 148 +++++++++++++++++++++++++++++++++ src/client/pages/settings/index.vue | 20 +++++ src/client/ui/_common_/sidebar.vue | 8 +- src/client/ui/default.sidebar.vue | 8 +- 7 files changed, 187 insertions(+), 13 deletions(-) create mode 100644 src/client/pages/settings/accounts.vue (limited to 'src/client/pages/instance') diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index b557f86436..d20d720949 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -138,7 +138,7 @@ flagAsBotDescription: "このアカウントがプログラムによって運用 flagAsCat: "Catとして設定" flagAsCatDescription: "このアカウントが猫であることを示す場合は、このフラグをオンにします。" autoAcceptFollowed: "フォロー中ユーザーからのフォロリクを自動承認" -addAcount: "アカウント追加" +addAccount: "アカウントを追加" loginFailed: "ログインに失敗しました" showOnRemote: "リモートで表示" general: "全般" @@ -452,7 +452,7 @@ category: "カテゴリ" tags: "タグ" docSource: "このドキュメントのソース" createAccount: "アカウントを作成" -existingAcount: "既存のアカウント" +existingAccount: "既存のアカウント" regenerate: "再生成" fontSize: "フォントサイズ" noFollowRequests: "フォロー申請はありません" @@ -735,6 +735,8 @@ enabled: "有効" disabled: "無効" quickAction: "クイックアクション" user: "ユーザー" +administration: "管理" +accounts: "アカウント" _email: _follow: diff --git a/package.json b/package.json index 281bb67f3d..fc53fc4dc7 100644 --- a/package.json +++ b/package.json @@ -1,7 +1,7 @@ { "name": "misskey", "author": "syuilo ", - "version": "12.78.0-beta.4", + "version": "12.78.0-beta.5", "codename": "indigo", "repository": { "type": "git", diff --git a/src/client/pages/instance/index.vue b/src/client/pages/instance/index.vue index 10406f339b..5972a02de0 100644 --- a/src/client/pages/instance/index.vue +++ b/src/client/pages/instance/index.vue @@ -16,13 +16,13 @@ {{ $ts.invite }} + {{ $ts.users }} {{ $ts.customEmojis }} {{ $ts.federation }} {{ $ts.jobQueue }} {{ $ts.files }} {{ $ts.announcements }} - {{ $ts.database }} {{ $ts.abuseReports }} @@ -39,6 +39,10 @@ {{ $ts.proxyAccount }} {{ $ts.other }} + + + {{ $ts.database }} +
@@ -229,7 +233,7 @@ export default defineComponent({ .lxpfedzu { padding: 16px; - > img { + > .icon { display: block; margin: auto; height: 42px; diff --git a/src/client/pages/settings/accounts.vue b/src/client/pages/settings/accounts.vue new file mode 100644 index 0000000000..a3fa0d4eb0 --- /dev/null +++ b/src/client/pages/settings/accounts.vue @@ -0,0 +1,148 @@ + + + + + diff --git a/src/client/pages/settings/index.vue b/src/client/pages/settings/index.vue index ba4fc40ae7..049e912898 100644 --- a/src/client/pages/settings/index.vue +++ b/src/client/pages/settings/index.vue @@ -2,6 +2,14 @@
+ +
+
+ +
+
+ {{ $ts.accounts }} + {{ $ts.profile }} @@ -87,6 +95,7 @@ export default defineComponent({ const component = computed(() => { if (page.value == null) return null; switch (page.value) { + case 'accounts': return defineAsyncComponent(() => import('./accounts.vue')); case 'profile': return defineAsyncComponent(() => import('./profile.vue')); case 'privacy': return defineAsyncComponent(() => import('./privacy.vue')); case 'reaction': return defineAsyncComponent(() => import('./reaction.vue')); @@ -209,4 +218,15 @@ export default defineComponent({ } } } + +.lwjxoukj { + padding: 16px; + + > .avatar { + display: block; + margin: auto; + width: 42px; + height: 42px; + } +} diff --git a/src/client/ui/_common_/sidebar.vue b/src/client/ui/_common_/sidebar.vue index 45b1c079bd..df11877147 100644 --- a/src/client/ui/_common_/sidebar.vue +++ b/src/client/ui/_common_/sidebar.vue @@ -157,11 +157,11 @@ export default defineComponent({ avatar: this.$i, }, null, ...accountItemPromises, { icon: 'fas fa-plus', - text: this.$ts.addAcount, + text: this.$ts.addAccount, action: () => { os.modalMenu([{ - text: this.$ts.existingAcount, - action: () => { this.addAcount(); }, + text: this.$ts.existingAccount, + action: () => { this.addAccount(); }, }, { text: this.$ts.createAccount, action: () => { this.createAccount(); }, @@ -177,7 +177,7 @@ export default defineComponent({ }, 'closed'); }, - addAcount() { + addAccount() { os.popup(import('@client/components/signin-dialog.vue'), {}, { done: res => { addAccount(res.id, res.i); diff --git a/src/client/ui/default.sidebar.vue b/src/client/ui/default.sidebar.vue index 29ef99fc86..b07914679d 100644 --- a/src/client/ui/default.sidebar.vue +++ b/src/client/ui/default.sidebar.vue @@ -141,11 +141,11 @@ export default defineComponent({ avatar: this.$i, }, null, ...accountItemPromises, { icon: 'fas fa-plus', - text: this.$ts.addAcount, + text: this.$ts.addAccount, action: () => { os.modalMenu([{ - text: this.$ts.existingAcount, - action: () => { this.addAcount(); }, + text: this.$ts.existingAccount, + action: () => { this.addAccount(); }, }, { text: this.$ts.createAccount, action: () => { this.createAccount(); }, @@ -161,7 +161,7 @@ export default defineComponent({ }, 'closed'); }, - addAcount() { + addAccount() { os.popup(import('@client/components/signin-dialog.vue'), {}, { done: res => { addAccount(res.id, res.i); -- cgit v1.2.3-freya From e1e5283963e7ac11856f3348f05ffceacaef5208 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 23 Apr 2021 14:43:40 +0900 Subject: Improve usability --- locales/ja-JP.yml | 3 +++ src/client/pages/instance/overview.vue | 18 +++++++++++------- 2 files changed, 14 insertions(+), 7 deletions(-) (limited to 'src/client/pages/instance') diff --git a/locales/ja-JP.yml b/locales/ja-JP.yml index 90b9a40d96..3824d437fe 100644 --- a/locales/ja-JP.yml +++ b/locales/ja-JP.yml @@ -738,6 +738,9 @@ user: "ユーザー" administration: "管理" accounts: "アカウント" switch: "切り替え" +noMaintainerInformationWarning: "管理者情報が設定されていません。" +noBotProtectionWarning: "Bot防御が設定されていません。" +configure: "設定する" _email: _follow: diff --git a/src/client/pages/instance/overview.vue b/src/client/pages/instance/overview.vue index 651ace08f9..dca2529e1b 100644 --- a/src/client/pages/instance/overview.vue +++ b/src/client/pages/instance/overview.vue @@ -1,6 +1,9 @@