From 6bf1cbc0efefe7d3a04377b593bc80d2e4774324 Mon Sep 17 00:00:00 2001 From: Kainoa Kanter Date: Fri, 7 Apr 2023 17:01:42 -0700 Subject: [PATCH] fix: format script; chore: format --- CONTRIBUTING.md | 4 +- package.json | 2 +- packages/client/.prettierrc | 15 + packages/client/package.json | 5 +- .../client/src/components/MkAbuseReport.vue | 120 +- .../src/components/MkAbuseReportWindow.vue | 93 +- .../client/src/components/MkAnalogClock.vue | 245 ++-- .../client/src/components/MkAutocomplete.vue | 307 ++-- packages/client/src/components/MkAvatars.vue | 16 +- packages/client/src/components/MkButton.vue | 81 +- packages/client/src/components/MkCaptcha.vue | 80 +- .../src/components/MkChannelFollowButton.vue | 61 +- .../src/components/MkChannelPreview.vue | 81 +- packages/client/src/components/MkChart.vue | 1236 ++++++++++------- .../client/src/components/MkChartTooltip.vue | 43 +- .../client/src/components/MkChatPreview.vue | 109 +- .../src/components/MkCheatSheetDialog.vue | 36 +- .../client/src/components/MkCode.core.vue | 25 +- packages/client/src/components/MkCode.vue | 8 +- .../client/src/components/MkContainer.vue | 127 +- .../client/src/components/MkContextMenu.vue | 48 +- .../client/src/components/MkCropperDialog.vue | 115 +- packages/client/src/components/MkCwButton.vue | 38 +- .../src/components/MkDateSeparatedList.vue | 140 +- packages/client/src/components/MkDialog.vue | 252 +++- .../client/src/components/MkDigitalClock.vue | 75 +- .../client/src/components/MkDrive.file.vue | 246 ++-- .../client/src/components/MkDrive.folder.vue | 287 ++-- .../src/components/MkDrive.navFolder.vue | 75 +- packages/client/src/components/MkDrive.vue | 633 +++++---- .../src/components/MkDriveFileThumbnail.vue | 98 +- .../src/components/MkDriveSelectDialog.vue | 86 +- .../client/src/components/MkDriveWindow.vue | 36 +- .../src/components/MkEmojiPicker.section.vue | 47 +- .../client/src/components/MkEmojiPicker.vue | 358 +++-- .../src/components/MkEmojiPickerDialog.vue | 92 +- .../src/components/MkFeaturedPhotos.vue | 14 +- .../src/components/MkFileListForAdmin.vue | 102 +- .../client/src/components/MkFileTypeIcon.vue | 12 +- packages/client/src/components/MkFolder.vue | 87 +- .../client/src/components/MkFollowButton.vue | 154 +- .../src/components/MkForgotPassword.vue | 108 +- .../client/src/components/MkFormDialog.vue | 231 ++- packages/client/src/components/MkFormula.vue | 10 +- .../client/src/components/MkFormulaCore.vue | 20 +- .../src/components/MkGalleryPostPreview.vue | 40 +- packages/client/src/components/MkGoogle.vue | 20 +- packages/client/src/components/MkHeatmap.vue | 169 ++- .../client/src/components/MkImageViewer.vue | 57 +- .../src/components/MkImgWithBlurhash.vue | 62 +- packages/client/src/components/MkInfo.vue | 12 +- .../src/components/MkInstanceCardMini.vue | 80 +- .../src/components/MkInstanceSelectDialog.vue | 116 +- .../client/src/components/MkInstanceStats.vue | 193 ++- .../src/components/MkInstanceTicker.vue | 54 +- packages/client/src/components/MkKeyValue.vue | 49 +- .../client/src/components/MkLaunchPad.vue | 131 +- packages/client/src/components/MkLink.vue | 65 +- packages/client/src/components/MkMarquee.vue | 62 +- .../client/src/components/MkMediaBanner.vue | 120 +- .../client/src/components/MkMediaCaption.vue | 136 +- .../client/src/components/MkMediaImage.vue | 93 +- .../client/src/components/MkMediaList.vue | 160 ++- .../client/src/components/MkMediaVideo.vue | 98 +- packages/client/src/components/MkMention.vue | 74 +- .../client/src/components/MkMenu.child.vue | 48 +- packages/client/src/components/MkMenu.vue | 333 +++-- .../client/src/components/MkMiniChart.vue | 69 +- packages/client/src/components/MkModal.vue | 378 +++-- .../src/components/MkModalPageWindow.vue | 154 +- .../client/src/components/MkModalWindow.vue | 95 +- packages/client/src/components/MkMoved.vue | 17 +- packages/client/src/components/MkNote.vue | 600 +++++--- .../client/src/components/MkNoteDetailed.vue | 622 ++++++--- .../client/src/components/MkNoteHeader.vue | 88 +- .../client/src/components/MkNotePreview.vue | 25 +- .../client/src/components/MkNoteSimple.vue | 44 +- packages/client/src/components/MkNoteSub.vue | 440 ++++-- packages/client/src/components/MkNotes.vue | 59 +- .../client/src/components/MkNotification.vue | 410 ++++-- .../MkNotificationSettingWindow.vue | 116 +- .../src/components/MkNotificationToast.vue | 34 +- .../client/src/components/MkNotifications.vue | 119 +- packages/client/src/components/MkNumber.vue | 22 +- .../client/src/components/MkNumberDiff.vue | 11 +- .../src/components/MkObjectView.value.vue | 86 +- .../client/src/components/MkObjectView.vue | 11 +- .../client/src/components/MkPagePreview.vue | 50 +- .../client/src/components/MkPageWindow.vue | 157 ++- .../client/src/components/MkPagination.vue | 695 +++++---- packages/client/src/components/MkPoll.vue | 137 +- .../client/src/components/MkPollEditor.vue | 202 +-- .../client/src/components/MkPopupMenu.vue | 35 +- packages/client/src/components/MkPostForm.vue | 815 +++++++---- .../src/components/MkPostFormAttaches.vue | 166 ++- .../src/components/MkPostFormDialog.vue | 30 +- .../MkPushNotificationAllowButton.vue | 183 ++- .../client/src/components/MkQuoteButton.vue | 34 +- .../src/components/MkReactedUsersDialog.vue | 120 +- .../client/src/components/MkReactionIcon.vue | 10 +- .../src/components/MkReactionTooltip.vue | 30 +- .../components/MkReactionsViewer.details.vue | 46 +- .../components/MkReactionsViewer.reaction.vue | 105 +- .../src/components/MkReactionsViewer.vue | 25 +- .../client/src/components/MkRemoteCaution.vue | 13 +- .../client/src/components/MkRenoteButton.vue | 221 +-- packages/client/src/components/MkRipple.vue | 140 +- packages/client/src/components/MkSample.vue | 142 +- packages/client/src/components/MkSignin.vue | 387 ++++-- .../client/src/components/MkSigninDialog.vue | 53 +- packages/client/src/components/MkSignup.vue | 568 +++++--- .../client/src/components/MkSignupDialog.vue | 55 +- packages/client/src/components/MkSparkle.vue | 93 +- .../client/src/components/MkStarButton.vue | 78 +- .../src/components/MkSubNoteContent.vue | 148 +- .../client/src/components/MkSuperMenu.vue | 73 +- packages/client/src/components/MkTab.vue | 44 +- packages/client/src/components/MkTagCloud.vue | 65 +- packages/client/src/components/MkTimeline.vue | 130 +- packages/client/src/components/MkToast.vue | 37 +- .../src/components/MkTokenGenerateWindow.vue | 117 +- packages/client/src/components/MkTooltip.vue | 77 +- .../src/components/MkTutorialDialog.vue | 338 +++-- packages/client/src/components/MkUpdated.vue | 65 +- .../client/src/components/MkUrlPreview.vue | 204 ++- .../src/components/MkUrlPreviewPopup.vue | 30 +- .../client/src/components/MkUserCardMini.vue | 73 +- packages/client/src/components/MkUserInfo.vue | 86 +- packages/client/src/components/MkUserList.vue | 45 +- .../src/components/MkUserOnlineIndicator.vue | 20 +- .../client/src/components/MkUserPreview.vue | 165 ++- .../src/components/MkUserSelectDialog.vue | 167 ++- .../client/src/components/MkUsersTooltip.vue | 29 +- .../client/src/components/MkVisibility.vue | 55 +- .../src/components/MkVisibilityPicker.vue | 162 ++- .../client/src/components/MkWaitingDialog.vue | 54 +- packages/client/src/components/MkWidgets.vue | 176 ++- packages/client/src/components/MkWindow.vue | 358 +++-- .../client/src/components/form/checkbox.vue | 59 +- .../client/src/components/form/folder.vue | 47 +- packages/client/src/components/form/input.vue | 162 ++- packages/client/src/components/form/link.vue | 46 +- packages/client/src/components/form/radio.vue | 43 +- .../client/src/components/form/radios.vue | 81 +- packages/client/src/components/form/range.vue | 162 ++- .../client/src/components/form/section.vue | 13 +- .../client/src/components/form/select.vue | 138 +- packages/client/src/components/form/slot.vue | 14 +- packages/client/src/components/form/split.vue | 23 +- .../client/src/components/form/suspense.vue | 56 +- .../client/src/components/form/switch.vue | 51 +- .../client/src/components/form/textarea.vue | 91 +- packages/client/src/components/global/MkA.vue | 121 +- .../client/src/components/global/MkAcct.vue | 18 +- .../client/src/components/global/MkAd.vue | 91 +- .../client/src/components/global/MkAvatar.vue | 154 +- .../src/components/global/MkEllipsis.vue | 4 +- .../client/src/components/global/MkEmoji.vue | 55 +- .../client/src/components/global/MkError.vue | 27 +- .../src/components/global/MkLoading.vue | 61 +- .../global/MkMisskeyFlavoredMarkdown.vue | 324 +++-- .../src/components/global/MkPageHeader.vue | 226 ++- .../client/src/components/global/MkSpacer.vue | 44 +- .../components/global/MkStickyContainer.vue | 42 +- .../client/src/components/global/MkTime.vue | 65 +- .../client/src/components/global/MkUrl.vue | 82 +- .../src/components/global/MkUserName.vue | 27 +- .../src/components/global/RouterView.vue | 53 +- .../client/src/components/page/page.block.vue | 68 +- .../src/components/page/page.button.vue | 54 +- .../src/components/page/page.canvas.vue | 24 +- .../src/components/page/page.counter.vue | 35 +- .../client/src/components/page/page.if.vue | 28 +- .../client/src/components/page/page.image.vue | 31 +- .../client/src/components/page/page.note.vue | 43 +- .../src/components/page/page.number-input.vue | 37 +- .../client/src/components/page/page.post.vue | 78 +- .../src/components/page/page.radio-button.vue | 37 +- .../src/components/page/page.section.vue | 36 +- .../src/components/page/page.switch.vue | 32 +- .../src/components/page/page.text-input.vue | 37 +- .../client/src/components/page/page.text.vue | 60 +- .../components/page/page.textarea-input.vue | 37 +- .../src/components/page/page.textarea.vue | 28 +- packages/client/src/components/page/page.vue | 57 +- .../client/src/components/queue-chart.vue | 129 -- packages/client/src/pages/_empty_.vue | 4 +- packages/client/src/pages/_error_.vue | 100 +- packages/client/src/pages/_loading_.vue | 5 +- packages/client/src/pages/about-calckey.vue | 236 +++- packages/client/src/pages/about.emojis.vue | 106 +- .../client/src/pages/about.federation.vue | 202 ++- packages/client/src/pages/about.vue | 501 ++++--- packages/client/src/pages/admin-file.vue | 343 +++-- packages/client/src/pages/admin/_header_.vue | 160 ++- packages/client/src/pages/admin/abuses.vue | 142 +- .../client/src/pages/admin/announcements.vue | 163 ++- .../client/src/pages/admin/bot-protection.vue | 146 +- .../client/src/pages/admin/custom-css.vue | 38 +- packages/client/src/pages/admin/database.vue | 86 +- .../client/src/pages/admin/email-settings.vue | 196 ++- .../src/pages/admin/emoji-edit-dialog.vue | 113 +- packages/client/src/pages/admin/emojis.vue | 503 ++++--- .../client/src/pages/admin/federation.vue | 40 +- packages/client/src/pages/admin/files.vue | 203 ++- packages/client/src/pages/admin/index.vue | 484 ++++--- .../client/src/pages/admin/instance-block.vue | 62 +- .../src/pages/admin/integrations.discord.vue | 71 +- .../src/pages/admin/integrations.github.vue | 73 +- .../client/src/pages/admin/integrations.vue | 75 +- packages/client/src/pages/admin/metrics.vue | 606 ++++---- .../client/src/pages/admin/object-storage.vue | 232 ++-- .../client/src/pages/admin/other-settings.vue | 51 +- .../src/pages/admin/overview.active-users.vue | 118 +- .../src/pages/admin/overview.ap-requests.vue | 186 +-- .../src/pages/admin/overview.federation.vue | 152 +- .../src/pages/admin/overview.heatmap.vue | 32 +- .../src/pages/admin/overview.instances.vue | 43 +- .../src/pages/admin/overview.moderators.vue | 42 +- .../client/src/pages/admin/overview.pie.vue | 58 +- .../src/pages/admin/overview.queue-chart.vue | 133 +- .../src/pages/admin/overview.queue.chart.vue | 91 +- .../client/src/pages/admin/overview.queue.vue | 90 +- .../client/src/pages/admin/overview.stats.vue | 145 +- .../client/src/pages/admin/overview.user.vue | 37 +- .../client/src/pages/admin/overview.users.vue | 42 +- packages/client/src/pages/admin/overview.vue | 138 +- .../client/src/pages/admin/promotions.vue | 153 +- .../client/src/pages/admin/proxy-account.vue | 70 +- .../src/pages/admin/queue.chart.chart.vue | 90 +- .../client/src/pages/admin/queue.chart.vue | 116 +- packages/client/src/pages/admin/queue.vue | 79 +- packages/client/src/pages/admin/relays.vue | 120 +- packages/client/src/pages/admin/security.vue | 412 ++++-- packages/client/src/pages/admin/settings.vue | 626 ++++++--- packages/client/src/pages/admin/users.vue | 252 ++-- packages/client/src/pages/announcements.vue | 71 +- .../client/src/pages/antenna-timeline.vue | 126 +- packages/client/src/pages/api-console.vue | 141 +- packages/client/src/pages/apps.vue | 182 ++- packages/client/src/pages/auth.form.vue | 62 +- packages/client/src/pages/auth.vue | 175 ++- packages/client/src/pages/channel-editor.vue | 126 +- packages/client/src/pages/channel.vue | 198 ++- packages/client/src/pages/channels.vue | 198 ++- packages/client/src/pages/clip.vue | 192 +-- packages/client/src/pages/drive.vue | 28 +- packages/client/src/pages/emojis.emoji.vue | 75 +- .../client/src/pages/explore.featured.vue | 41 +- packages/client/src/pages/explore.users.vue | 326 +++-- packages/client/src/pages/explore.vue | 123 +- packages/client/src/pages/favorites.vue | 6 +- packages/client/src/pages/follow-requests.vue | 128 +- packages/client/src/pages/follow.vue | 41 +- packages/client/src/pages/gallery/edit.vue | 166 ++- packages/client/src/pages/gallery/index.vue | 230 +-- packages/client/src/pages/gallery/post.vue | 265 ++-- packages/client/src/pages/instance-info.vue | 578 +++++--- packages/client/src/pages/messaging/index.vue | 316 +++-- .../pages/messaging/messaging-room.form.vue | 207 +-- .../messaging/messaging-room.message.vue | 131 +- .../src/pages/messaging/messaging-room.vue | 258 ++-- packages/client/src/pages/mfm-cheat-sheet.vue | 652 +++++---- packages/client/src/pages/miauth.vue | 124 +- .../client/src/pages/my-antennas/create.vue | 26 +- .../client/src/pages/my-antennas/edit.vue | 40 +- .../client/src/pages/my-antennas/editor.vue | 261 ++-- .../client/src/pages/my-antennas/index.vue | 93 +- packages/client/src/pages/my-clips/index.vue | 74 +- packages/client/src/pages/my-groups/group.vue | 67 +- packages/client/src/pages/my-groups/index.vue | 104 +- packages/client/src/pages/my-lists/index.vue | 83 +- packages/client/src/pages/my-lists/list.vue | 139 +- packages/client/src/pages/not-found.vue | 20 +- packages/client/src/pages/note.vue | 250 ++-- packages/client/src/pages/notifications.vue | 230 +-- .../page-editor/els/page-editor.el.button.vue | 171 ++- .../page-editor/els/page-editor.el.canvas.vue | 74 +- .../els/page-editor.el.counter.vue | 66 +- .../page-editor/els/page-editor.el.if.vue | 101 +- .../page-editor/els/page-editor.el.image.vue | 64 +- .../page-editor/els/page-editor.el.note.vue | 104 +- .../els/page-editor.el.number-input.vue | 66 +- .../page-editor/els/page-editor.el.post.vue | 64 +- .../els/page-editor.el.radio-button.vue | 86 +- .../els/page-editor.el.section.vue | 72 +- .../page-editor/els/page-editor.el.switch.vue | 60 +- .../els/page-editor.el.text-input.vue | 58 +- .../page-editor/els/page-editor.el.text.vue | 38 +- .../els/page-editor.el.textarea-input.vue | 60 +- .../els/page-editor.el.textarea.vue | 38 +- .../pages/page-editor/page-editor.blocks.vue | 102 +- .../page-editor/page-editor.container.vue | 73 +- .../page-editor/page-editor.script-block.vue | 405 ++++-- .../src/pages/page-editor/page-editor.vue | 536 ++++--- packages/client/src/pages/page.vue | 331 +++-- packages/client/src/pages/pages.vue | 204 +-- packages/client/src/pages/preview.vue | 24 +- packages/client/src/pages/registry.keys.vue | 103 +- packages/client/src/pages/registry.value.vue | 129 +- packages/client/src/pages/registry.vue | 70 +- packages/client/src/pages/reset-password.vue | 78 +- packages/client/src/pages/scratchpad.vue | 161 ++- packages/client/src/pages/search.vue | 94 +- packages/client/src/pages/settings/2fa.vue | 372 +++-- .../src/pages/settings/account-info.vue | 312 +++-- .../client/src/pages/settings/accounts.vue | 162 ++- packages/client/src/pages/settings/api.vue | 70 +- packages/client/src/pages/settings/apps.vue | 105 +- .../client/src/pages/settings/custom-css.vue | 40 +- .../src/pages/settings/custom-katex-macro.vue | 63 +- packages/client/src/pages/settings/deck.vue | 53 +- .../src/pages/settings/delete-account.vue | 44 +- packages/client/src/pages/settings/drive.vue | 164 ++- packages/client/src/pages/settings/email.vue | 177 ++- .../client/src/pages/settings/general.vue | 480 ++++--- .../src/pages/settings/import-export.vue | 308 ++-- packages/client/src/pages/settings/index.vue | 441 +++--- .../src/pages/settings/instance-mute.vue | 58 +- .../client/src/pages/settings/integration.vue | 106 +- .../client/src/pages/settings/migration.vue | 86 +- .../client/src/pages/settings/mute-block.vue | 88 +- packages/client/src/pages/settings/navbar.vue | 102 +- .../src/pages/settings/notifications.vue | 152 +- packages/client/src/pages/settings/other.vue | 56 +- .../src/pages/settings/plugin.install.vue | 143 +- packages/client/src/pages/settings/plugin.vue | 125 +- .../pages/settings/preferences-backups.vue | 453 +++--- .../client/src/pages/settings/privacy.vue | 202 ++- .../client/src/pages/settings/profile.vue | 365 +++-- .../client/src/pages/settings/reaction.vue | 222 +-- .../client/src/pages/settings/security.vue | 124 +- packages/client/src/pages/settings/sounds.vue | 110 +- .../pages/settings/statusbar.statusbar.vue | 299 ++-- .../client/src/pages/settings/statusbar.vue | 48 +- .../src/pages/settings/theme.install.vue | 64 +- .../src/pages/settings/theme.manage.vue | 116 +- packages/client/src/pages/settings/theme.vue | 353 +++-- .../src/pages/settings/webhook.edit.vue | 122 +- .../client/src/pages/settings/webhook.new.vue | 110 +- .../client/src/pages/settings/webhook.vue | 96 +- .../client/src/pages/settings/word-mute.vue | 140 +- packages/client/src/pages/share.vue | 185 ++- packages/client/src/pages/signup-complete.vue | 30 +- packages/client/src/pages/tag.vue | 32 +- packages/client/src/pages/theme-editor.vue | 381 +++-- packages/client/src/pages/timeline.vue | 373 ++--- packages/client/src/pages/user-info.vue | 680 ++++++--- .../client/src/pages/user-list-timeline.vue | 104 +- packages/client/src/pages/user/clips.vue | 40 +- .../client/src/pages/user/follow-list.vue | 42 +- packages/client/src/pages/user/followers.vue | 94 +- packages/client/src/pages/user/following.vue | 94 +- packages/client/src/pages/user/gallery.vue | 39 +- packages/client/src/pages/user/home.vue | 532 ++++--- .../client/src/pages/user/index.activity.vue | 87 +- .../client/src/pages/user/index.photos.vue | 87 +- .../client/src/pages/user/index.timeline.vue | 38 +- packages/client/src/pages/user/index.vue | 179 +-- packages/client/src/pages/user/pages.vue | 29 +- packages/client/src/pages/user/reactions.vue | 44 +- .../client/src/pages/welcome.entrance.a.vue | 249 ++-- .../client/src/pages/welcome.entrance.b.vue | 218 ++- .../client/src/pages/welcome.entrance.c.vue | 225 +-- packages/client/src/pages/welcome.setup.vue | 114 +- .../client/src/pages/welcome.timeline.vue | 63 +- packages/client/src/pages/welcome.vue | 32 +- packages/client/src/ui/_common_/common.vue | 81 +- .../src/ui/_common_/navbar-for-mobile.vue | 238 +++- packages/client/src/ui/_common_/navbar.vue | 292 ++-- .../src/ui/_common_/statusbar-federation.vue | 94 +- .../client/src/ui/_common_/statusbar-rss.vue | 64 +- .../src/ui/_common_/statusbar-user-list.vue | 79 +- .../client/src/ui/_common_/statusbars.vue | 77 +- .../src/ui/_common_/stream-indicator.vue | 31 +- packages/client/src/ui/_common_/upload.vue | 188 ++- packages/client/src/ui/classic.header.vue | 175 ++- packages/client/src/ui/classic.sidebar.vue | 293 ++-- packages/client/src/ui/classic.vue | 244 ++-- packages/client/src/ui/classic.widgets.vue | 92 +- packages/client/src/ui/deck.vue | 381 +++-- .../client/src/ui/deck/antenna-column.vue | 62 +- packages/client/src/ui/deck/column-core.vue | 82 +- packages/client/src/ui/deck/column.vue | 333 +++-- packages/client/src/ui/deck/direct-column.vue | 32 +- packages/client/src/ui/deck/list-column.vue | 62 +- packages/client/src/ui/deck/main-column.vue | 84 +- .../client/src/ui/deck/mentions-column.vue | 27 +- .../src/ui/deck/notifications-column.vue | 69 +- packages/client/src/ui/deck/tl-column.vue | 136 +- .../client/src/ui/deck/widgets-column.vue | 62 +- packages/client/src/ui/universal.vue | 446 +++--- packages/client/src/ui/universal.widgets.vue | 75 +- packages/client/src/ui/visitor.vue | 14 +- packages/client/src/ui/visitor/a.vue | 158 ++- packages/client/src/ui/visitor/b.vue | 190 ++- packages/client/src/ui/visitor/header.vue | 180 ++- packages/client/src/ui/visitor/kanban.vue | 157 ++- packages/client/src/ui/zen.vue | 26 +- .../client/src/widgets/activity.calendar.vue | 73 +- .../client/src/widgets/activity.chart.vue | 102 +- packages/client/src/widgets/activity.vue | 85 +- packages/client/src/widgets/aiscript.vue | 157 ++- packages/client/src/widgets/button.vue | 98 +- packages/client/src/widgets/calendar.vue | 116 +- packages/client/src/widgets/clock.vue | 283 ++-- packages/client/src/widgets/digital-clock.vue | 108 +- packages/client/src/widgets/federation.vue | 120 +- .../client/src/widgets/instance-cloud.vue | 102 +- packages/client/src/widgets/job-queue.vue | 222 ++- packages/client/src/widgets/memo.vue | 71 +- packages/client/src/widgets/notifications.vue | 90 +- packages/client/src/widgets/online-users.vue | 56 +- packages/client/src/widgets/photos.vue | 83 +- packages/client/src/widgets/post-form.vue | 30 +- packages/client/src/widgets/rss-ticker.vue | 110 +- packages/client/src/widgets/rss.vue | 68 +- .../src/widgets/server-metric/cpu-mem.vue | 208 +-- .../client/src/widgets/server-metric/cpu.vue | 26 +- .../client/src/widgets/server-metric/disk.vue | 22 +- .../src/widgets/server-metric/index.vue | 102 +- .../client/src/widgets/server-metric/mem.vue | 30 +- .../client/src/widgets/server-metric/net.vue | 141 +- .../client/src/widgets/server-metric/pie.vue | 50 +- packages/client/src/widgets/slideshow.vue | 80 +- packages/client/src/widgets/timeline.vue | 200 ++- packages/client/src/widgets/trends.vue | 84 +- packages/client/src/widgets/unix-clock.vue | 73 +- packages/client/src/widgets/user-list.vue | 68 +- pnpm-lock.yaml | 18 + 430 files changed, 36649 insertions(+), 21793 deletions(-) create mode 100644 packages/client/.prettierrc delete mode 100644 packages/client/src/components/queue-chart.vue diff --git a/CONTRIBUTING.md b/CONTRIBUTING.md index f824432e2..7a1fdee31 100644 --- a/CONTRIBUTING.md +++ b/CONTRIBUTING.md @@ -48,8 +48,8 @@ Thank you for your PR! Before creating a PR, please check the following: - If there is an Issue which will be resolved by this PR, please include a reference to the Issue in the text. Good examples include `Closing: #21` or `Resolves: #21` - Check if there are any documents that need to be created or updated due to this change. - If you have added a feature or fixed a bug, please add a test case if possible. -- Please make sure that tests and Lint are passed in advance. - - You can run it with `pnpm run test` and `pnpm run lint`. [See more info](#testing) +- Please make sure that formatting, tests and Lint are passed in advance. + - You can run it with `pnpm run format`, `pnpm run test` and `pnpm run lint`. [See more info](#testing) - If this PR includes UI changes, please attach a screenshot in the text. Thanks for your cooperation 🤗 diff --git a/package.json b/package.json index e990a5851..3a324fa0b 100644 --- a/package.json +++ b/package.json @@ -27,7 +27,7 @@ "e2e": "start-server-and-test start:test http://localhost:61812 cy:run", "mocha": "pnpm --filter backend run mocha", "test": "pnpm run mocha", - "format": "gulp format", + "format": "pnpm rome format packages/**/* --write && pnpm --filter client run format", "clean": "pnpm node ./scripts/clean.js", "clean-all": "pnpm node ./scripts/clean-all.js", "cleanall": "pnpm run clean-all" diff --git a/packages/client/.prettierrc b/packages/client/.prettierrc new file mode 100644 index 000000000..77a5016a4 --- /dev/null +++ b/packages/client/.prettierrc @@ -0,0 +1,15 @@ +{ + "tabWidth": 4, + "useTabs": true, + "singleQuote": false, + "vueIndentScriptAndStyle": false, + "plugins": ["vue"], + "overrides": [ + { + "files": "*.vue", + "options": { + "parser": "vue" + } + } + ] +} diff --git a/packages/client/package.json b/packages/client/package.json index b1da8e0a0..24af5b143 100644 --- a/packages/client/package.json +++ b/packages/client/package.json @@ -4,7 +4,8 @@ "scripts": { "watch": "pnpm vite build --watch --mode development", "build": "pnpm vite build", - "lint": "pnpm rome check \"src/**/*.{ts,vue}\"" + "lint": "pnpm rome check \"src/**/*.{ts,vue}\"", + "format": "pnpm prettier --write '**/*.vue'" }, "devDependencies": { "@discordapp/twemoji": "14.0.2", @@ -54,6 +55,8 @@ "matter-js": "0.18.0", "mfm-js": "0.23.2", "photoswipe": "5.3.4", + "prettier": "2.8.7", + "prettier-plugin-vue": "1.1.6", "prismjs": "1.29.0", "punycode": "2.1.1", "querystring": "0.2.1", diff --git a/packages/client/src/components/MkAbuseReport.vue b/packages/client/src/components/MkAbuseReport.vue index 9a3464b64..ccb85d722 100644 --- a/packages/client/src/components/MkAbuseReport.vue +++ b/packages/client/src/components/MkAbuseReport.vue @@ -1,64 +1,93 @@ @@ -81,7 +110,16 @@ function resolve() { padding: 14px; border-radius: 8px; --c: rgb(255 196 0 / 15%); - background-image: linear-gradient(45deg, var(--c) 16.67%, transparent 16.67%, transparent 50%, var(--c) 50%, var(--c) 66.67%, transparent 66.67%, transparent 100%); + background-image: linear-gradient( + 45deg, + var(--c) 16.67%, + transparent 16.67%, + transparent 50%, + var(--c) 50%, + var(--c) 66.67%, + transparent 66.67%, + transparent 100% + ); background-size: 16px 16px; > .avatar { diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue index f1b3ae431..19b8ba526 100644 --- a/packages/client/src/components/MkAbuseReportWindow.vue +++ b/packages/client/src/components/MkAbuseReportWindow.vue @@ -1,35 +1,52 @@ diff --git a/packages/client/src/components/MkAnalogClock.vue b/packages/client/src/components/MkAnalogClock.vue index 40ef626ae..43d81f2a9 100644 --- a/packages/client/src/components/MkAnalogClock.vue +++ b/packages/client/src/components/MkAnalogClock.vue @@ -1,32 +1,62 @@ @@ -214,11 +269,11 @@ onBeforeUnmount(() => { transform-origin: 50% 50%; &.animate.elastic { - transition: transform .2s cubic-bezier(.4,2.08,.55,.44); + transition: transform 0.2s cubic-bezier(0.4, 2.08, 0.55, 0.44); } &.animate.easeOut { - transition: transform .7s cubic-bezier(0,.7,.3,1); + transition: transform 0.7s cubic-bezier(0, 0.7, 0.3, 1); } } } diff --git a/packages/client/src/components/MkAutocomplete.vue b/packages/client/src/components/MkAutocomplete.vue index ae708026e..0455bd9d5 100644 --- a/packages/client/src/components/MkAutocomplete.vue +++ b/packages/client/src/components/MkAutocomplete.vue @@ -1,49 +1,107 @@ @@ -399,7 +484,8 @@ onBeforeUnmount(() => { font-size: 0.9em; cursor: default; - &, * { + &, + * { user-select: none; } @@ -412,10 +498,11 @@ onBeforeUnmount(() => { background: var(--X3); } - &[data-selected='true'] { + &[data-selected="true"] { background: var(--accent); - &, * { + &, + * { color: #fff !important; } } @@ -423,7 +510,8 @@ onBeforeUnmount(() => { &:active { background: var(--accentDarken); - &, * { + &, + * { color: #fff !important; } } @@ -431,7 +519,6 @@ onBeforeUnmount(() => { } > .users > li { - .avatar { min-width: 28px; min-height: 28px; @@ -447,7 +534,6 @@ onBeforeUnmount(() => { } > .emojis > li { - .emoji { display: inline-block; margin: 0 4px 0 0; @@ -465,7 +551,6 @@ onBeforeUnmount(() => { } > .mfmTags > li { - .name { } } diff --git a/packages/client/src/components/MkAvatars.vue b/packages/client/src/components/MkAvatars.vue index 52fda8b1d..d92eee22c 100644 --- a/packages/client/src/components/MkAvatars.vue +++ b/packages/client/src/components/MkAvatars.vue @@ -1,14 +1,14 @@ diff --git a/packages/client/src/components/MkButton.vue b/packages/client/src/components/MkButton.vue index 9042500b4..5f1a5bdb7 100644 --- a/packages/client/src/components/MkButton.vue +++ b/packages/client/src/components/MkButton.vue @@ -1,34 +1,36 @@ diff --git a/packages/client/src/components/MkChannelFollowButton.vue b/packages/client/src/components/MkChannelFollowButton.vue index 7c23b91ed..b4cb1a87f 100644 --- a/packages/client/src/components/MkChannelFollowButton.vue +++ b/packages/client/src/components/MkChannelFollowButton.vue @@ -1,34 +1,41 @@