From ea9aeef9d8790db51c59a99927cd47ea9423be88 Mon Sep 17 00:00:00 2001 From: syuilo Date: Thu, 18 Nov 2021 18:45:58 +0900 Subject: refactor(client): refactor dialog functions to improve type inference --- packages/client/src/pages/admin/ads.vue | 3 +-- packages/client/src/pages/admin/announcements.vue | 11 +++++------ packages/client/src/pages/admin/email-settings.vue | 7 +++---- packages/client/src/pages/admin/emoji-edit-dialog.vue | 3 +-- packages/client/src/pages/admin/file-dialog.vue | 3 +-- packages/client/src/pages/admin/files.vue | 5 ++--- packages/client/src/pages/admin/index.vue | 4 ++-- packages/client/src/pages/admin/queue.vue | 3 +-- packages/client/src/pages/admin/relays.vue | 11 +++++------ packages/client/src/pages/admin/users.vue | 7 +++---- 10 files changed, 24 insertions(+), 33 deletions(-) (limited to 'packages/client/src/pages/admin') diff --git a/packages/client/src/pages/admin/ads.vue b/packages/client/src/pages/admin/ads.vue index df6c9d5d00..5652080cd7 100644 --- a/packages/client/src/pages/admin/ads.vue +++ b/packages/client/src/pages/admin/ads.vue @@ -101,10 +101,9 @@ export default defineComponent({ }, remove(ad) { - os.dialog({ + os.confirm({ type: 'warning', text: this.$t('removeAreYouSure', { x: ad.url }), - showCancelButton: true }).then(({ canceled }) => { if (canceled) return; this.ads = this.ads.filter(x => x != ad); diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue index a64008967f..301b0f9f5f 100644 --- a/packages/client/src/pages/admin/announcements.vue +++ b/packages/client/src/pages/admin/announcements.vue @@ -76,10 +76,9 @@ export default defineComponent({ }, remove(announcement) { - os.dialog({ + os.confirm({ type: 'warning', text: this.$t('removeAreYouSure', { x: announcement.title }), - showCancelButton: true }).then(({ canceled }) => { if (canceled) return; this.announcements = this.announcements.filter(x => x != announcement); @@ -90,24 +89,24 @@ export default defineComponent({ save(announcement) { if (announcement.id == null) { os.api('admin/announcements/create', announcement).then(() => { - os.dialog({ + os.alert({ type: 'success', text: this.$ts.saved }); }).catch(e => { - os.dialog({ + os.alert({ type: 'error', text: e }); }); } else { os.api('admin/announcements/update', announcement).then(() => { - os.dialog({ + os.alert({ type: 'success', text: this.$ts.saved }); }).catch(e => { - os.dialog({ + os.alert({ type: 'error', text: e }); diff --git a/packages/client/src/pages/admin/email-settings.vue b/packages/client/src/pages/admin/email-settings.vue index 3733f53a23..aad971830e 100644 --- a/packages/client/src/pages/admin/email-settings.vue +++ b/packages/client/src/pages/admin/email-settings.vue @@ -96,11 +96,10 @@ export default defineComponent({ }, async testEmail() { - const { canceled, result: destination } = await os.dialog({ + const { canceled, result: destination } = await os.inputText({ title: this.$ts.destination, - input: { - placeholder: this.$instance.maintainerEmail - } + type: 'email', + placeholder: this.$instance.maintainerEmail }); if (canceled) return; os.apiWithDialog('admin/send-email', { diff --git a/packages/client/src/pages/admin/emoji-edit-dialog.vue b/packages/client/src/pages/admin/emoji-edit-dialog.vue index e612855105..dcc5a9cbee 100644 --- a/packages/client/src/pages/admin/emoji-edit-dialog.vue +++ b/packages/client/src/pages/admin/emoji-edit-dialog.vue @@ -89,10 +89,9 @@ export default defineComponent({ }, async del() { - const { canceled } = await os.dialog({ + const { canceled } = await os.confirm({ type: 'warning', text: this.$t('removeAreYouSure', { x: this.emoji.name }), - showCancelButton: true }); if (canceled) return; diff --git a/packages/client/src/pages/admin/file-dialog.vue b/packages/client/src/pages/admin/file-dialog.vue index 016a012ea5..0d36276553 100644 --- a/packages/client/src/pages/admin/file-dialog.vue +++ b/packages/client/src/pages/admin/file-dialog.vue @@ -86,10 +86,9 @@ export default defineComponent({ }, async del() { - const { canceled } = await os.dialog({ + const { canceled } = await os.confirm({ type: 'warning', text: this.$t('removeAreYouSure', { x: this.file.name }), - showCancelButton: true }); if (canceled) return; diff --git a/packages/client/src/pages/admin/files.vue b/packages/client/src/pages/admin/files.vue index e291d97bbc..30bef13356 100644 --- a/packages/client/src/pages/admin/files.vue +++ b/packages/client/src/pages/admin/files.vue @@ -124,10 +124,9 @@ export default defineComponent({ methods: { clear() { - os.dialog({ + os.confirm({ type: 'warning', text: this.$ts.clearCachedFilesConfirm, - showCancelButton: true }).then(({ canceled }) => { if (canceled) return; @@ -146,7 +145,7 @@ export default defineComponent({ this.show(file); }).catch(e => { if (e.code === 'NO_SUCH_FILE') { - os.dialog({ + os.alert({ type: 'error', text: this.$ts.notFound }); diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue index d3f9406db7..24ca2f65f2 100644 --- a/packages/client/src/pages/admin/index.vue +++ b/packages/client/src/pages/admin/index.vue @@ -281,12 +281,12 @@ export default defineComponent({ const invite = () => { os.api('admin/invite').then(x => { - os.dialog({ + os.alert({ type: 'info', text: x.code }); }).catch(e => { - os.dialog({ + os.alert({ type: 'error', text: e }); diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue index 896298840c..0886216c7b 100644 --- a/packages/client/src/pages/admin/queue.vue +++ b/packages/client/src/pages/admin/queue.vue @@ -57,11 +57,10 @@ export default defineComponent({ methods: { clear() { - os.dialog({ + os.confirm({ type: 'warning', title: this.$ts.clearQueueConfirmTitle, text: this.$ts.clearQueueConfirmText, - showCancelButton: true }).then(({ canceled }) => { if (canceled) return; diff --git a/packages/client/src/pages/admin/relays.vue b/packages/client/src/pages/admin/relays.vue index fd0ce97d57..f4cfc2a885 100644 --- a/packages/client/src/pages/admin/relays.vue +++ b/packages/client/src/pages/admin/relays.vue @@ -53,11 +53,10 @@ export default defineComponent({ methods: { async addRelay() { - const { canceled, result: inbox } = await os.dialog({ + const { canceled, result: inbox } = await os.inputText({ title: this.$ts.addRelay, - input: { - placeholder: this.$ts.inboxUrl - } + type: 'url', + placeholder: this.$ts.inboxUrl }); if (canceled) return; os.api('admin/relays/add', { @@ -65,7 +64,7 @@ export default defineComponent({ }).then((relay: any) => { this.refresh(); }).catch((e: any) => { - os.dialog({ + os.alert({ type: 'error', text: e.message || e }); @@ -78,7 +77,7 @@ export default defineComponent({ }).then(() => { this.refresh(); }).catch((e: any) => { - os.dialog({ + os.alert({ type: 'error', text: e.message || e }); diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue index f4a2ffa6d2..3c43c7aa36 100644 --- a/packages/client/src/pages/admin/users.vue +++ b/packages/client/src/pages/admin/users.vue @@ -150,15 +150,14 @@ export default defineComponent({ }, async addUser() { - const { canceled: canceled1, result: username } = await os.dialog({ + const { canceled: canceled1, result: username } = await os.inputText({ title: this.$ts.username, - input: true }); if (canceled1) return; - const { canceled: canceled2, result: password } = await os.dialog({ + const { canceled: canceled2, result: password } = await os.inputText({ title: this.$ts.password, - input: { type: 'password' } + type: 'password' }); if (canceled2) return; -- cgit v1.3.1-freya From 5d968afa7424d82f49502c12f63f546f86eae433 Mon Sep 17 00:00:00 2001 From: syuilo Date: Fri, 19 Nov 2021 19:36:12 +0900 Subject: update linr --- packages/client/.eslintrc.js | 12 ++++ .../client/src/components/abuse-report-window.vue | 2 +- packages/client/src/components/analog-clock.vue | 2 +- packages/client/src/components/autocomplete.vue | 28 ++++----- .../src/components/channel-follow-button.vue | 2 +- packages/client/src/components/channel-preview.vue | 10 ++-- packages/client/src/components/code-core.vue | 4 +- packages/client/src/components/debobigego/base.vue | 2 +- .../client/src/components/debobigego/group.vue | 4 +- .../client/src/components/debobigego/input.vue | 14 ++--- packages/client/src/components/debobigego/link.vue | 4 +- .../src/components/debobigego/object-view.vue | 4 +- .../src/components/debobigego/pagination.vue | 4 +- .../client/src/components/debobigego/range.vue | 2 +- .../client/src/components/debobigego/select.vue | 4 +- .../client/src/components/debobigego/suspense.vue | 6 +- .../client/src/components/debobigego/switch.vue | 4 +- .../client/src/components/debobigego/textarea.vue | 6 +- .../client/src/components/debobigego/tuple.vue | 2 +- packages/client/src/components/dialog.vue | 16 +++--- .../client/src/components/drive-file-thumbnail.vue | 2 +- .../client/src/components/drive-select-dialog.vue | 2 +- packages/client/src/components/drive.file.vue | 12 ++-- packages/client/src/components/drive.folder.vue | 6 +- packages/client/src/components/drive.vue | 32 +++++------ .../client/src/components/emoji-picker-dialog.vue | 4 +- .../client/src/components/emoji-picker.section.vue | 2 +- packages/client/src/components/emoji-picker.vue | 20 +++---- packages/client/src/components/featured-photos.vue | 2 +- packages/client/src/components/follow-button.vue | 2 +- packages/client/src/components/forgot-password.vue | 6 +- packages/client/src/components/form-dialog.vue | 4 +- packages/client/src/components/form/input.vue | 12 ++-- packages/client/src/components/form/range.vue | 2 +- packages/client/src/components/form/section.vue | 2 +- packages/client/src/components/form/select.vue | 12 ++-- packages/client/src/components/form/switch.vue | 4 +- packages/client/src/components/form/textarea.vue | 4 +- packages/client/src/components/global/acct.vue | 2 +- packages/client/src/components/global/ad.vue | 6 +- packages/client/src/components/global/avatar.vue | 4 +- packages/client/src/components/global/error.vue | 2 +- packages/client/src/components/global/header.vue | 18 +++--- packages/client/src/components/global/url.vue | 4 +- packages/client/src/components/google.vue | 2 +- .../client/src/components/img-with-blurhash.vue | 2 +- packages/client/src/components/launch-pad.vue | 10 ++-- packages/client/src/components/link.vue | 2 +- packages/client/src/components/media-banner.vue | 14 ++--- packages/client/src/components/media-caption.vue | 6 +- packages/client/src/components/media-image.vue | 6 +- packages/client/src/components/media-list.vue | 8 +-- packages/client/src/components/media-video.vue | 4 +- packages/client/src/components/mention.vue | 4 +- .../client/src/components/modal-page-window.vue | 2 +- packages/client/src/components/note-detailed.vue | 66 +++++++++++----------- packages/client/src/components/note-header.vue | 12 ++-- packages/client/src/components/note-preview.vue | 2 +- packages/client/src/components/note-simple.vue | 6 +- packages/client/src/components/note.sub.vue | 4 +- packages/client/src/components/note.vue | 58 +++++++++---------- packages/client/src/components/notes.vue | 10 ++-- packages/client/src/components/notification.vue | 8 +-- packages/client/src/components/notifications.vue | 10 ++-- packages/client/src/components/page-preview.vue | 2 +- packages/client/src/components/page-window.vue | 2 +- packages/client/src/components/page/page.block.vue | 2 +- .../client/src/components/page/page.button.vue | 2 +- packages/client/src/components/page/page.if.vue | 2 +- packages/client/src/components/page/page.note.vue | 4 +- .../src/components/page/page.number-input.vue | 2 +- packages/client/src/components/page/page.post.vue | 2 +- .../src/components/page/page.radio-button.vue | 2 +- .../client/src/components/page/page.section.vue | 2 +- .../client/src/components/page/page.text-input.vue | 2 +- packages/client/src/components/page/page.text.vue | 4 +- packages/client/src/components/page/page.vue | 4 +- packages/client/src/components/poll-editor.vue | 10 ++-- packages/client/src/components/poll.vue | 4 +- .../client/src/components/post-form-attaches.vue | 6 +- .../client/src/components/post-form-dialog.vue | 4 +- packages/client/src/components/post-form.vue | 46 +++++++-------- .../client/src/components/reaction-tooltip.vue | 2 +- .../src/components/reactions-viewer.details.vue | 4 +- .../src/components/reactions-viewer.reaction.vue | 6 +- .../client/src/components/reactions-viewer.vue | 2 +- packages/client/src/components/renote-button.vue | 4 +- packages/client/src/components/renote.details.vue | 4 +- packages/client/src/components/signin.vue | 24 ++++---- packages/client/src/components/signup.vue | 22 ++++---- .../client/src/components/sub-note-content.vue | 4 +- packages/client/src/components/taskmanager.vue | 8 +-- packages/client/src/components/timeline.vue | 2 +- packages/client/src/components/toast.vue | 2 +- packages/client/src/components/ui/container.vue | 6 +- packages/client/src/components/ui/context-menu.vue | 2 +- packages/client/src/components/ui/folder.vue | 4 +- packages/client/src/components/ui/menu.vue | 14 ++--- packages/client/src/components/ui/modal-window.vue | 12 ++-- packages/client/src/components/ui/modal.vue | 4 +- packages/client/src/components/ui/pagination.vue | 6 +- packages/client/src/components/ui/popup-menu.vue | 2 +- packages/client/src/components/ui/popup.vue | 2 +- packages/client/src/components/ui/super-menu.vue | 6 +- packages/client/src/components/ui/tooltip.vue | 2 +- packages/client/src/components/ui/window.vue | 6 +- .../client/src/components/url-preview-popup.vue | 2 +- packages/client/src/components/url-preview.vue | 24 ++++---- packages/client/src/components/user-info.vue | 4 +- packages/client/src/components/user-list.vue | 6 +- .../src/components/user-online-indicator.vue | 2 +- packages/client/src/components/user-preview.vue | 2 +- .../client/src/components/user-select-dialog.vue | 12 ++-- .../client/src/components/visibility-picker.vue | 10 ++-- packages/client/src/components/waiting-dialog.vue | 2 +- packages/client/src/components/widgets.vue | 6 +- packages/client/src/pages/_error_.vue | 4 +- packages/client/src/pages/about-misskey.vue | 6 +- packages/client/src/pages/admin/abuses.vue | 6 +- packages/client/src/pages/admin/ads.vue | 6 +- packages/client/src/pages/admin/announcements.vue | 4 +- packages/client/src/pages/admin/bot-protection.vue | 10 ++-- packages/client/src/pages/admin/database.vue | 2 +- packages/client/src/pages/admin/email-settings.vue | 4 +- .../client/src/pages/admin/emoji-edit-dialog.vue | 6 +- packages/client/src/pages/admin/emojis.vue | 12 ++-- packages/client/src/pages/admin/file-dialog.vue | 8 +-- packages/client/src/pages/admin/files-settings.vue | 2 +- packages/client/src/pages/admin/files.vue | 8 +-- packages/client/src/pages/admin/index.vue | 6 +- packages/client/src/pages/admin/instance-block.vue | 2 +- packages/client/src/pages/admin/instance.vue | 4 +- .../src/pages/admin/integrations-discord.vue | 2 +- .../client/src/pages/admin/integrations-github.vue | 2 +- .../src/pages/admin/integrations-twitter.vue | 2 +- packages/client/src/pages/admin/object-storage.vue | 2 +- packages/client/src/pages/admin/other-settings.vue | 2 +- packages/client/src/pages/admin/overview.vue | 12 ++-- packages/client/src/pages/admin/proxy-account.vue | 2 +- packages/client/src/pages/admin/queue.vue | 2 +- packages/client/src/pages/admin/relays.vue | 4 +- packages/client/src/pages/admin/security.vue | 8 +-- packages/client/src/pages/admin/service-worker.vue | 2 +- packages/client/src/pages/admin/settings.vue | 2 +- packages/client/src/pages/admin/users.vue | 14 ++--- .../client/src/pages/advanced-theme-editor.vue | 34 +++++------ packages/client/src/pages/announcements.vue | 8 +-- packages/client/src/pages/antenna-timeline.vue | 8 +-- packages/client/src/pages/api-console.vue | 4 +- packages/client/src/pages/auth.form.vue | 4 +- packages/client/src/pages/auth.vue | 14 ++--- packages/client/src/pages/channel-editor.vue | 2 +- packages/client/src/pages/channel.vue | 8 +-- packages/client/src/pages/channels.vue | 22 ++++---- packages/client/src/pages/clip.vue | 2 +- packages/client/src/pages/emojis.category.vue | 4 +- packages/client/src/pages/explore.vue | 12 ++-- packages/client/src/pages/federation.vue | 12 ++-- packages/client/src/pages/follow-requests.vue | 8 +-- packages/client/src/pages/gallery/edit.vue | 10 ++-- packages/client/src/pages/gallery/index.vue | 18 +++--- packages/client/src/pages/gallery/post.vue | 16 +++--- packages/client/src/pages/instance-info.vue | 4 +- packages/client/src/pages/messaging/index.vue | 14 ++--- .../src/pages/messaging/messaging-room.form.vue | 8 +-- .../src/pages/messaging/messaging-room.message.vue | 18 +++--- .../client/src/pages/messaging/messaging-room.vue | 16 +++--- packages/client/src/pages/miauth.vue | 18 +++--- packages/client/src/pages/my-antennas/editor.vue | 14 ++--- packages/client/src/pages/my-antennas/index.vue | 4 +- packages/client/src/pages/my-clips/index.vue | 4 +- packages/client/src/pages/my-groups/group.vue | 2 +- packages/client/src/pages/my-groups/index.vue | 24 ++++---- packages/client/src/pages/my-lists/index.vue | 4 +- packages/client/src/pages/my-lists/list.vue | 2 +- packages/client/src/pages/note.vue | 8 +-- packages/client/src/pages/notifications.vue | 2 +- .../page-editor/els/page-editor.el.button.vue | 2 +- .../page-editor/els/page-editor.el.canvas.vue | 2 +- .../page-editor/els/page-editor.el.counter.vue | 2 +- .../pages/page-editor/els/page-editor.el.if.vue | 6 +- .../pages/page-editor/els/page-editor.el.image.vue | 4 +- .../pages/page-editor/els/page-editor.el.note.vue | 6 +- .../els/page-editor.el.number-input.vue | 2 +- .../pages/page-editor/els/page-editor.el.post.vue | 2 +- .../els/page-editor.el.radio-button.vue | 2 +- .../page-editor/els/page-editor.el.section.vue | 8 +-- .../page-editor/els/page-editor.el.switch.vue | 2 +- .../page-editor/els/page-editor.el.text-input.vue | 2 +- .../pages/page-editor/els/page-editor.el.text.vue | 2 +- .../els/page-editor.el.textarea-input.vue | 2 +- .../page-editor/els/page-editor.el.textarea.vue | 2 +- .../src/pages/page-editor/page-editor.blocks.vue | 4 +- .../pages/page-editor/page-editor.container.vue | 8 +-- .../pages/page-editor/page-editor.script-block.vue | 10 ++-- .../client/src/pages/page-editor/page-editor.vue | 36 ++++++------ packages/client/src/pages/page.vue | 20 +++---- packages/client/src/pages/pages.vue | 20 +++---- packages/client/src/pages/reversi/game.board.vue | 38 ++++++------- packages/client/src/pages/reversi/game.setting.vue | 22 ++++---- packages/client/src/pages/reversi/index.vue | 12 ++-- packages/client/src/pages/room/room.vue | 44 +++++++-------- packages/client/src/pages/scratchpad.vue | 6 +- packages/client/src/pages/settings/2fa.vue | 8 +-- packages/client/src/pages/settings/accounts.vue | 4 +- packages/client/src/pages/settings/api.vue | 2 +- packages/client/src/pages/settings/apps.vue | 6 +- .../client/src/pages/settings/delete-account.vue | 4 +- packages/client/src/pages/settings/drive.vue | 2 +- .../client/src/pages/settings/email-address.vue | 6 +- packages/client/src/pages/settings/general.vue | 4 +- packages/client/src/pages/settings/index.vue | 4 +- packages/client/src/pages/settings/integration.vue | 18 +++--- packages/client/src/pages/settings/menu.vue | 2 +- .../client/src/pages/settings/plugin.install.vue | 2 +- .../client/src/pages/settings/plugin.manage.vue | 4 +- packages/client/src/pages/settings/profile.vue | 8 +-- packages/client/src/pages/settings/reaction.vue | 2 +- .../client/src/pages/settings/registry.keys.vue | 2 +- .../client/src/pages/settings/registry.value.vue | 4 +- packages/client/src/pages/settings/registry.vue | 2 +- packages/client/src/pages/settings/security.vue | 2 +- packages/client/src/pages/settings/sounds.vue | 2 +- .../client/src/pages/settings/theme.install.vue | 4 +- .../client/src/pages/settings/theme.manage.vue | 10 ++-- packages/client/src/pages/settings/theme.vue | 22 ++++---- packages/client/src/pages/settings/update.vue | 10 ++-- packages/client/src/pages/settings/word-mute.vue | 2 +- packages/client/src/pages/share.vue | 4 +- packages/client/src/pages/theme-editor.vue | 24 ++++---- packages/client/src/pages/timeline.tutorial.vue | 22 ++++---- packages/client/src/pages/timeline.vue | 8 +-- packages/client/src/pages/user-ap-info.vue | 2 +- packages/client/src/pages/user-info.vue | 6 +- packages/client/src/pages/user-list-timeline.vue | 8 +-- packages/client/src/pages/user/clips.vue | 2 +- packages/client/src/pages/user/follow-list.vue | 4 +- packages/client/src/pages/user/gallery.vue | 4 +- packages/client/src/pages/user/index.photos.vue | 6 +- packages/client/src/pages/user/index.timeline.vue | 22 ++++---- packages/client/src/pages/user/index.vue | 54 +++++++++--------- packages/client/src/pages/user/pages.vue | 4 +- packages/client/src/pages/user/reactions.vue | 4 +- packages/client/src/pages/welcome.entrance.a.vue | 8 +-- packages/client/src/pages/welcome.entrance.b.vue | 10 ++-- packages/client/src/pages/welcome.entrance.c.vue | 10 ++-- packages/client/src/pages/welcome.timeline.vue | 8 +-- packages/client/src/ui/_common_/common.vue | 6 +- packages/client/src/ui/_common_/sidebar.vue | 20 +++---- .../client/src/ui/_common_/stream-indicator.vue | 2 +- packages/client/src/ui/_common_/upload.vue | 6 +- packages/client/src/ui/chat/index.vue | 22 ++++---- packages/client/src/ui/chat/note-header.vue | 12 ++-- packages/client/src/ui/chat/note-preview.vue | 4 +- packages/client/src/ui/chat/note.sub.vue | 2 +- packages/client/src/ui/chat/note.vue | 54 +++++++++--------- packages/client/src/ui/chat/notes.vue | 10 ++-- packages/client/src/ui/chat/pages/channel.vue | 10 ++-- packages/client/src/ui/chat/pages/timeline.vue | 8 +-- packages/client/src/ui/chat/post-form.vue | 24 ++++---- packages/client/src/ui/chat/side.vue | 2 +- packages/client/src/ui/chat/sub-note-content.vue | 4 +- packages/client/src/ui/chat/widgets.vue | 4 +- packages/client/src/ui/classic.header.vue | 12 ++-- packages/client/src/ui/classic.side.vue | 6 +- packages/client/src/ui/classic.sidebar.vue | 18 +++--- packages/client/src/ui/classic.vue | 24 ++++---- packages/client/src/ui/classic.widgets.vue | 4 +- packages/client/src/ui/deck.vue | 8 +-- packages/client/src/ui/deck/column.vue | 12 ++-- packages/client/src/ui/deck/tl-column.vue | 4 +- packages/client/src/ui/universal.vue | 12 ++-- packages/client/src/ui/universal.widgets.vue | 4 +- packages/client/src/ui/visitor/a.vue | 14 ++--- packages/client/src/ui/visitor/b.vue | 12 ++-- packages/client/src/ui/visitor/header.vue | 12 ++-- packages/client/src/ui/visitor/kanban.vue | 10 ++-- packages/client/src/widgets/activity.vue | 4 +- packages/client/src/widgets/aichan.vue | 4 +- packages/client/src/widgets/aiscript.vue | 6 +- packages/client/src/widgets/clock.vue | 2 +- packages/client/src/widgets/digital-clock.vue | 4 +- packages/client/src/widgets/federation.vue | 4 +- packages/client/src/widgets/memo.vue | 4 +- packages/client/src/widgets/notifications.vue | 4 +- packages/client/src/widgets/photos.vue | 2 +- packages/client/src/widgets/post-form.vue | 2 +- packages/client/src/widgets/rss.vue | 4 +- .../client/src/widgets/server-metric/index.vue | 6 +- packages/client/src/widgets/timeline.vue | 4 +- packages/client/src/widgets/trends.vue | 4 +- 291 files changed, 1175 insertions(+), 1163 deletions(-) (limited to 'packages/client/src/pages/admin') diff --git a/packages/client/.eslintrc.js b/packages/client/.eslintrc.js index 6090a26bfe..b1d31fc04b 100644 --- a/packages/client/.eslintrc.js +++ b/packages/client/.eslintrc.js @@ -14,6 +14,18 @@ module.exports = { "plugin:vue/vue3-recommended" ], rules: { + "vue/attributes-order": ["error", { + "alphabetical": false + }], + "vue/no-use-v-if-with-v-for": ["error", { + "allowUsingIterationVar": false + }], + "vue/no-ref-as-operand": "error", + "vue/no-multi-spaces": ["error", { + "ignoreProperties": false + }], + "vue/no-v-html": "error", + "vue/order-in-components": "error", "vue/html-indent": ["warn", "tab", { "attribute": 1, "baseIndent": 0, diff --git a/packages/client/src/components/abuse-report-window.vue b/packages/client/src/components/abuse-report-window.vue index d6d229bc8d..6b07639f6d 100644 --- a/packages/client/src/components/abuse-report-window.vue +++ b/packages/client/src/components/abuse-report-window.vue @@ -16,7 +16,7 @@
- {{ $ts.send }} + {{ $ts.send }}
diff --git a/packages/client/src/components/analog-clock.vue b/packages/client/src/components/analog-clock.vue index bc572e5fff..450488b198 100644 --- a/packages/client/src/components/analog-clock.vue +++ b/packages/client/src/components/analog-clock.vue @@ -1,11 +1,11 @@