diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2022-09-06 18:21:49 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2022-09-06 18:21:49 +0900 |
| commit | a9e13693a593ff1fb4b2ed1f2e1cb90a8ef7bd3b (patch) | |
| tree | de951d9242addd6195c20c23ce6cdf853884760f /packages | |
| parent | refactor(client): use setup syntax (diff) | |
| download | sharkey-a9e13693a593ff1fb4b2ed1f2e1cb90a8ef7bd3b.tar.gz sharkey-a9e13693a593ff1fb4b2ed1f2e1cb90a8ef7bd3b.tar.bz2 sharkey-a9e13693a593ff1fb4b2ed1f2e1cb90a8ef7bd3b.zip | |
refactor(client): refactor file name and directory structure
Diffstat (limited to 'packages')
187 files changed, 246 insertions, 246 deletions
diff --git a/packages/client/src/components/MkAbuseReport.vue b/packages/client/src/components/MkAbuseReport.vue index 42bd1af3fb..9a3464b640 100644 --- a/packages/client/src/components/MkAbuseReport.vue +++ b/packages/client/src/components/MkAbuseReport.vue @@ -36,7 +36,7 @@ </template> <script lang="ts" setup> -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkSwitch from '@/components/form/switch.vue'; import MkKeyValue from '@/components/MkKeyValue.vue'; import { acct, userPage } from '@/filters/user'; diff --git a/packages/client/src/components/MkAbuseReportWindow.vue b/packages/client/src/components/MkAbuseReportWindow.vue index 6b8e36c4da..1862d0a0e4 100644 --- a/packages/client/src/components/MkAbuseReportWindow.vue +++ b/packages/client/src/components/MkAbuseReportWindow.vue @@ -25,9 +25,9 @@ <script setup lang="ts"> import { ref } from 'vue'; import * as Misskey from 'misskey-js'; -import XWindow from '@/components/ui/window.vue'; +import XWindow from '@/components/MkWindow.vue'; import MkTextarea from '@/components/form/textarea.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/components/ui/button.vue b/packages/client/src/components/MkButton.vue index a052f8f7a9..a052f8f7a9 100644 --- a/packages/client/src/components/ui/button.vue +++ b/packages/client/src/components/MkButton.vue diff --git a/packages/client/src/components/MkChartTooltip.vue b/packages/client/src/components/MkChartTooltip.vue index 9b57a1b3d5..a92dd36b61 100644 --- a/packages/client/src/components/MkChartTooltip.vue +++ b/packages/client/src/components/MkChartTooltip.vue @@ -14,7 +14,7 @@ <script lang="ts" setup> import { } from 'vue'; -import MkTooltip from './ui/tooltip.vue'; +import MkTooltip from './MkTooltip.vue'; const props = defineProps<{ showing: boolean; diff --git a/packages/client/src/components/ui/container.vue b/packages/client/src/components/MkContainer.vue index 4be59adc2a..4be59adc2a 100644 --- a/packages/client/src/components/ui/container.vue +++ b/packages/client/src/components/MkContainer.vue diff --git a/packages/client/src/components/ui/context-menu.vue b/packages/client/src/components/MkContextMenu.vue index 165c3db462..cfc9502b41 100644 --- a/packages/client/src/components/ui/context-menu.vue +++ b/packages/client/src/components/MkContextMenu.vue @@ -8,7 +8,7 @@ <script lang="ts" setup> import { onMounted, onBeforeUnmount } from 'vue'; -import MkMenu from './menu.vue'; +import MkMenu from './MkMenu.vue'; import { MenuItem } from './types/menu.vue'; import contains from '@/scripts/contains'; import * as os from '@/os'; diff --git a/packages/client/src/components/MkCropperDialog.vue b/packages/client/src/components/MkCropperDialog.vue index c320b21d72..9a09834bf7 100644 --- a/packages/client/src/components/MkCropperDialog.vue +++ b/packages/client/src/components/MkCropperDialog.vue @@ -30,7 +30,7 @@ import { nextTick, onMounted } from 'vue'; import * as misskey from 'misskey-js'; import Cropper from 'cropperjs'; import tinycolor from 'tinycolor2'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import XModalWindow from '@/components/MkModalWindow.vue'; import * as os from '@/os'; import { $i } from '@/account'; import { defaultStore } from '@/store'; diff --git a/packages/client/src/components/MkDialog.vue b/packages/client/src/components/MkDialog.vue index b090f3cb4e..155473cd75 100644 --- a/packages/client/src/components/MkDialog.vue +++ b/packages/client/src/components/MkDialog.vue @@ -40,8 +40,8 @@ <script lang="ts" setup> import { onBeforeUnmount, onMounted, ref } from 'vue'; -import MkModal from '@/components/ui/modal.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkModal from '@/components/MkModal.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import MkSelect from '@/components/form/select.vue'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/components/MkDrive.vue b/packages/client/src/components/MkDrive.vue index 9f0016adc2..002ca58d04 100644 --- a/packages/client/src/components/MkDrive.vue +++ b/packages/client/src/components/MkDrive.vue @@ -90,7 +90,7 @@ <script lang="ts" setup> import { markRaw, nextTick, onActivated, onBeforeUnmount, onMounted, ref, watch } from 'vue'; import * as Misskey from 'misskey-js'; -import MkButton from './ui/button.vue'; +import MkButton from './MkButton.vue'; import XNavFolder from '@/components/MkDrive.navFolder.vue'; import XFolder from '@/components/MkDrive.folder.vue'; import XFile from '@/components/MkDrive.file.vue'; diff --git a/packages/client/src/components/MkDriveSelectDialog.vue b/packages/client/src/components/MkDriveSelectDialog.vue index 95a9a6fdb5..baab7f1324 100644 --- a/packages/client/src/components/MkDriveSelectDialog.vue +++ b/packages/client/src/components/MkDriveSelectDialog.vue @@ -22,7 +22,7 @@ import { ref } from 'vue'; import * as Misskey from 'misskey-js'; import XDrive from '@/components/MkDrive.vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import XModalWindow from '@/components/MkModalWindow.vue'; import number from '@/filters/number'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/components/MkDriveWindow.vue b/packages/client/src/components/MkDriveWindow.vue index 113aabb9f3..617200321b 100644 --- a/packages/client/src/components/MkDriveWindow.vue +++ b/packages/client/src/components/MkDriveWindow.vue @@ -17,7 +17,7 @@ import { } from 'vue'; import * as Misskey from 'misskey-js'; import XDrive from '@/components/MkDrive.vue'; -import XWindow from '@/components/ui/window.vue'; +import XWindow from '@/components/MkWindow.vue'; import { i18n } from '@/i18n'; defineProps<{ diff --git a/packages/client/src/components/MkEmojiPickerDialog.vue b/packages/client/src/components/MkEmojiPickerDialog.vue index 94e66b971a..3b41f9d75b 100644 --- a/packages/client/src/components/MkEmojiPickerDialog.vue +++ b/packages/client/src/components/MkEmojiPickerDialog.vue @@ -27,7 +27,7 @@ <script lang="ts" setup> import { ref } from 'vue'; -import MkModal from '@/components/ui/modal.vue'; +import MkModal from '@/components/MkModal.vue'; import MkEmojiPicker from '@/components/MkEmojiPicker.vue'; import { defaultStore } from '@/store'; diff --git a/packages/client/src/components/MkEmojiPickerWindow.vue b/packages/client/src/components/MkEmojiPickerWindow.vue index a1a2fd9328..523e4ba695 100644 --- a/packages/client/src/components/MkEmojiPickerWindow.vue +++ b/packages/client/src/components/MkEmojiPickerWindow.vue @@ -13,7 +13,7 @@ <script lang="ts" setup> import { } from 'vue'; -import MkWindow from '@/components/ui/window.vue'; +import MkWindow from '@/components/MkWindow.vue'; import MkEmojiPicker from '@/components/MkEmojiPicker.vue'; withDefaults(defineProps<{ diff --git a/packages/client/src/components/MkFileListForAdmin.vue b/packages/client/src/components/MkFileListForAdmin.vue index e03b8b94d8..b6429eaf8d 100644 --- a/packages/client/src/components/MkFileListForAdmin.vue +++ b/packages/client/src/components/MkFileListForAdmin.vue @@ -35,7 +35,7 @@ import { computed } from 'vue'; import * as Acct from 'misskey-js/built/acct'; import MkSwitch from '@/components/ui/switch.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue'; import bytes from '@/filters/bytes'; import * as os from '@/os'; diff --git a/packages/client/src/components/ui/folder.vue b/packages/client/src/components/MkFolder.vue index 7daa82cbd3..7daa82cbd3 100644 --- a/packages/client/src/components/ui/folder.vue +++ b/packages/client/src/components/MkFolder.vue diff --git a/packages/client/src/components/MkForgotPassword.vue b/packages/client/src/components/MkForgotPassword.vue index 6ed89d45d7..1b55451c94 100644 --- a/packages/client/src/components/MkForgotPassword.vue +++ b/packages/client/src/components/MkForgotPassword.vue @@ -33,8 +33,8 @@ <script lang="ts" setup> import { } from 'vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; -import MkButton from '@/components/ui/button.vue'; +import XModalWindow from '@/components/MkModalWindow.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import * as os from '@/os'; import { instance } from '@/instance'; diff --git a/packages/client/src/components/MkFormDialog.vue b/packages/client/src/components/MkFormDialog.vue index f05dde16f8..b2bf76a8c7 100644 --- a/packages/client/src/components/MkFormDialog.vue +++ b/packages/client/src/components/MkFormDialog.vue @@ -61,9 +61,9 @@ import FormTextarea from './form/textarea.vue'; import FormSwitch from './form/switch.vue'; import FormSelect from './form/select.vue'; import FormRange from './form/range.vue'; -import MkButton from './ui/button.vue'; +import MkButton from './MkButton.vue'; import FormRadios from './form/radios.vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import XModalWindow from '@/components/MkModalWindow.vue'; export default defineComponent({ components: { diff --git a/packages/client/src/components/MkImageViewer.vue b/packages/client/src/components/MkImageViewer.vue index 7bc88399ef..f074b1a2f2 100644 --- a/packages/client/src/components/MkImageViewer.vue +++ b/packages/client/src/components/MkImageViewer.vue @@ -17,7 +17,7 @@ import { } from 'vue'; import * as misskey from 'misskey-js'; import bytes from '@/filters/bytes'; import number from '@/filters/number'; -import MkModal from '@/components/ui/modal.vue'; +import MkModal from '@/components/MkModal.vue'; const props = withDefaults(defineProps<{ image: misskey.entities.DriveFile; diff --git a/packages/client/src/components/ui/info.vue b/packages/client/src/components/MkInfo.vue index 4fdfc5c5e6..4fdfc5c5e6 100644 --- a/packages/client/src/components/ui/info.vue +++ b/packages/client/src/components/MkInfo.vue diff --git a/packages/client/src/components/MkLaunchPad.vue b/packages/client/src/components/MkLaunchPad.vue index 7891f61bf1..19283178c9 100644 --- a/packages/client/src/components/MkLaunchPad.vue +++ b/packages/client/src/components/MkLaunchPad.vue @@ -21,7 +21,7 @@ <script lang="ts" setup> import { } from 'vue'; -import MkModal from '@/components/ui/modal.vue'; +import MkModal from '@/components/MkModal.vue'; import { navbarItemDef } from '@/navbar'; import { instanceName } from '@/config'; import { defaultStore } from '@/store'; diff --git a/packages/client/src/components/MkMediaCaption.vue b/packages/client/src/components/MkMediaCaption.vue index feed3854f9..c25755d762 100644 --- a/packages/client/src/components/MkMediaCaption.vue +++ b/packages/client/src/components/MkMediaCaption.vue @@ -30,8 +30,8 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { length } from 'stringz'; -import MkModal from '@/components/ui/modal.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkModal from '@/components/MkModal.vue'; +import MkButton from '@/components/MkButton.vue'; import bytes from '@/filters/bytes'; import number from '@/filters/number'; diff --git a/packages/client/src/components/ui/menu.child.vue b/packages/client/src/components/MkMenu.child.vue index b67224d3e1..3ada4afbdc 100644 --- a/packages/client/src/components/ui/menu.child.vue +++ b/packages/client/src/components/MkMenu.child.vue @@ -7,7 +7,7 @@ <script lang="ts" setup> import { on } from 'events'; import { nextTick, onBeforeUnmount, onMounted, onUnmounted, ref, watch } from 'vue'; -import MkMenu from './menu.vue'; +import MkMenu from './MkMenu.vue'; import { MenuItem } from '@/types/menu'; import * as os from '@/os'; diff --git a/packages/client/src/components/ui/menu.vue b/packages/client/src/components/MkMenu.vue index 60b68954d6..578e736c83 100644 --- a/packages/client/src/components/ui/menu.vue +++ b/packages/client/src/components/MkMenu.vue @@ -63,7 +63,7 @@ import { MenuItem, InnerMenuItem, MenuPending, MenuAction } from '@/types/menu'; import * as os from '@/os'; import { i18n } from '@/i18n'; -const XChild = defineAsyncComponent(() => import('./menu.child.vue')); +const XChild = defineAsyncComponent(() => import('./MkMenu.child.vue')); const props = defineProps<{ items: MenuItem[]; diff --git a/packages/client/src/components/ui/modal.vue b/packages/client/src/components/MkModal.vue index 2305a02794..2305a02794 100644 --- a/packages/client/src/components/ui/modal.vue +++ b/packages/client/src/components/MkModal.vue diff --git a/packages/client/src/components/MkModalPageWindow.vue b/packages/client/src/components/MkModalPageWindow.vue index 2fed0d35e8..cc3f4c96cc 100644 --- a/packages/client/src/components/MkModalPageWindow.vue +++ b/packages/client/src/components/MkModalPageWindow.vue @@ -22,7 +22,7 @@ <script lang="ts" setup> import { ComputedRef, provide } from 'vue'; -import MkModal from '@/components/ui/modal.vue'; +import MkModal from '@/components/MkModal.vue'; import { popout as _popout } from '@/scripts/popout'; import copyToClipboard from '@/scripts/copy-to-clipboard'; import { url } from '@/config'; diff --git a/packages/client/src/components/ui/modal-window.vue b/packages/client/src/components/MkModalWindow.vue index b29ea4fd81..5acd8c921f 100644 --- a/packages/client/src/components/ui/modal-window.vue +++ b/packages/client/src/components/MkModalWindow.vue @@ -18,7 +18,7 @@ <script lang="ts" setup> import { onMounted, onUnmounted } from 'vue'; -import MkModal from './modal.vue'; +import MkModal from './MkModal.vue'; const props = withDefaults(defineProps<{ withOkButton: boolean; diff --git a/packages/client/src/components/MkNotes.vue b/packages/client/src/components/MkNotes.vue index 67e894a09c..5abcdc2298 100644 --- a/packages/client/src/components/MkNotes.vue +++ b/packages/client/src/components/MkNotes.vue @@ -21,7 +21,7 @@ import { ref } from 'vue'; import XNote from '@/components/MkNote.vue'; import XList from '@/components/MkDateSeparatedList.vue'; -import MkPagination, { Paging } from '@/components/ui/pagination.vue'; +import MkPagination, { Paging } from '@/components/MkPagination.vue'; import { i18n } from '@/i18n'; const props = defineProps<{ diff --git a/packages/client/src/components/MkNotificationSettingWindow.vue b/packages/client/src/components/MkNotificationSettingWindow.vue index bf0a148f59..75bea2976c 100644 --- a/packages/client/src/components/MkNotificationSettingWindow.vue +++ b/packages/client/src/components/MkNotificationSettingWindow.vue @@ -31,9 +31,9 @@ import { } from 'vue'; import { notificationTypes } from 'misskey-js'; import MkSwitch from './form/switch.vue'; -import MkInfo from './ui/info.vue'; -import MkButton from './ui/button.vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import MkInfo from './MkInfo.vue'; +import MkButton from './MkButton.vue'; +import XModalWindow from '@/components/MkModalWindow.vue'; import { i18n } from '@/i18n'; const emit = defineEmits<{ diff --git a/packages/client/src/components/MkNotifications.vue b/packages/client/src/components/MkNotifications.vue index 1ee091a229..0e1cc06743 100644 --- a/packages/client/src/components/MkNotifications.vue +++ b/packages/client/src/components/MkNotifications.vue @@ -19,7 +19,7 @@ <script lang="ts" setup> import { defineComponent, markRaw, onUnmounted, onMounted, computed, ref } from 'vue'; import { notificationTypes } from 'misskey-js'; -import MkPagination, { Paging } from '@/components/ui/pagination.vue'; +import MkPagination, { Paging } from '@/components/MkPagination.vue'; import XNotification from '@/components/MkNotification.vue'; import XList from '@/components/MkDateSeparatedList.vue'; import XNote from '@/components/MkNote.vue'; diff --git a/packages/client/src/components/MkPageWindow.vue b/packages/client/src/components/MkPageWindow.vue index 76eb77825f..d58b914036 100644 --- a/packages/client/src/components/MkPageWindow.vue +++ b/packages/client/src/components/MkPageWindow.vue @@ -26,7 +26,7 @@ <script lang="ts" setup> import { ComputedRef, inject, provide } from 'vue'; import RouterView from '@/components/global/RouterView.vue'; -import XWindow from '@/components/ui/window.vue'; +import XWindow from '@/components/MkWindow.vue'; import { popout as _popout } from '@/scripts/popout'; import copyToClipboard from '@/scripts/copy-to-clipboard'; import { url } from '@/config'; diff --git a/packages/client/src/components/ui/pagination.vue b/packages/client/src/components/MkPagination.vue index 7650c5b33a..291409171a 100644 --- a/packages/client/src/components/ui/pagination.vue +++ b/packages/client/src/components/MkPagination.vue @@ -36,7 +36,7 @@ import { computed, ComputedRef, isRef, markRaw, onActivated, onDeactivated, Ref, import * as misskey from 'misskey-js'; import * as os from '@/os'; import { onScrollTop, isTopVisible, getScrollPosition, getScrollContainer } from '@/scripts/scroll'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { i18n } from '@/i18n'; const SECOND_FETCH_LIMIT = 30; diff --git a/packages/client/src/components/MkPollEditor.vue b/packages/client/src/components/MkPollEditor.vue index 6c1a4cc89f..3b08a63535 100644 --- a/packages/client/src/components/MkPollEditor.vue +++ b/packages/client/src/components/MkPollEditor.vue @@ -52,7 +52,7 @@ import { ref, watch } from 'vue'; import MkInput from './form/input.vue'; import MkSelect from './form/select.vue'; import MkSwitch from './form/switch.vue'; -import MkButton from './ui/button.vue'; +import MkButton from './MkButton.vue'; import { formatDateTimeString } from '@/scripts/format-time-string'; import { addTime } from '@/scripts/time'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/components/ui/popup-menu.vue b/packages/client/src/components/MkPopupMenu.vue index c29aff45e7..f04c7f5618 100644 --- a/packages/client/src/components/ui/popup-menu.vue +++ b/packages/client/src/components/MkPopupMenu.vue @@ -6,8 +6,8 @@ <script lang="ts" setup> import { } from 'vue'; -import MkModal from './modal.vue'; -import MkMenu from './menu.vue'; +import MkModal from './MkModal.vue'; +import MkMenu from './MkMenu.vue'; import { MenuItem } from '@/types/menu'; defineProps<{ diff --git a/packages/client/src/components/MkPostForm.vue b/packages/client/src/components/MkPostForm.vue index a499a62dde..0c57a5a57a 100644 --- a/packages/client/src/components/MkPostForm.vue +++ b/packages/client/src/components/MkPostForm.vue @@ -84,7 +84,7 @@ import * as os from '@/os'; import { stream } from '@/stream'; import { selectFiles } from '@/scripts/select-file'; import { defaultStore, notePostInterruptors, postFormActions } from '@/store'; -import MkInfo from '@/components/ui/info.vue'; +import MkInfo from '@/components/MkInfo.vue'; import { i18n } from '@/i18n'; import { instance } from '@/instance'; import { $i, getAccounts, openAccountMenu as openAccountMenu_ } from '@/account'; diff --git a/packages/client/src/components/MkPostFormDialog.vue b/packages/client/src/components/MkPostFormDialog.vue index 90b281d2ce..6dabb1db14 100644 --- a/packages/client/src/components/MkPostFormDialog.vue +++ b/packages/client/src/components/MkPostFormDialog.vue @@ -6,7 +6,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import MkModal from '@/components/ui/modal.vue'; +import MkModal from '@/components/MkModal.vue'; import MkPostForm from '@/components/MkPostForm.vue'; export default defineComponent({ diff --git a/packages/client/src/components/MkReactionTooltip.vue b/packages/client/src/components/MkReactionTooltip.vue index 44f2681700..2da97cf4f3 100644 --- a/packages/client/src/components/MkReactionTooltip.vue +++ b/packages/client/src/components/MkReactionTooltip.vue @@ -9,7 +9,7 @@ <script lang="ts" setup> import { } from 'vue'; -import MkTooltip from './ui/tooltip.vue'; +import MkTooltip from './MkTooltip.vue'; import XReactionIcon from '@/components/MkReactionIcon.vue'; const props = defineProps<{ diff --git a/packages/client/src/components/MkReactionsViewer.details.vue b/packages/client/src/components/MkReactionsViewer.details.vue index e886ff5023..8c423807ba 100644 --- a/packages/client/src/components/MkReactionsViewer.details.vue +++ b/packages/client/src/components/MkReactionsViewer.details.vue @@ -18,7 +18,7 @@ <script lang="ts" setup> import { } from 'vue'; -import MkTooltip from './ui/tooltip.vue'; +import MkTooltip from './MkTooltip.vue'; import XReactionIcon from '@/components/MkReactionIcon.vue'; const props = defineProps<{ diff --git a/packages/client/src/components/MkSample.vue b/packages/client/src/components/MkSample.vue index f80b9c96b7..1169654d09 100644 --- a/packages/client/src/components/MkSample.vue +++ b/packages/client/src/components/MkSample.vue @@ -29,7 +29,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import MkSwitch from '@/components/form/switch.vue'; import MkTextarea from '@/components/form/textarea.vue'; diff --git a/packages/client/src/components/MkSignin.vue b/packages/client/src/components/MkSignin.vue index e841631717..5613e5cf02 100644 --- a/packages/client/src/components/MkSignin.vue +++ b/packages/client/src/components/MkSignin.vue @@ -51,9 +51,9 @@ <script lang="ts" setup> import { defineAsyncComponent } from 'vue'; import { toUnicode } from 'punycode/'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; -import MkInfo from '@/components/ui/info.vue'; +import MkInfo from '@/components/MkInfo.vue'; import { apiUrl, host as configHost } from '@/config'; import { byteify, hexify } from '@/scripts/2fa'; import * as os from '@/os'; diff --git a/packages/client/src/components/MkSigninDialog.vue b/packages/client/src/components/MkSigninDialog.vue index 19b82b36d5..fd27244516 100644 --- a/packages/client/src/components/MkSigninDialog.vue +++ b/packages/client/src/components/MkSigninDialog.vue @@ -15,7 +15,7 @@ <script lang="ts" setup> import { } from 'vue'; import MkSignin from '@/components/MkSignin.vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import XModalWindow from '@/components/MkModalWindow.vue'; import { i18n } from '@/i18n'; const props = withDefaults(defineProps<{ diff --git a/packages/client/src/components/MkSignup.vue b/packages/client/src/components/MkSignup.vue index dbd332ce6e..a324bb6f5a 100644 --- a/packages/client/src/components/MkSignup.vue +++ b/packages/client/src/components/MkSignup.vue @@ -67,7 +67,7 @@ import { } from 'vue'; import getPasswordStrength from 'syuilo-password-strength'; import { toUnicode } from 'punycode/'; -import MkButton from './ui/button.vue'; +import MkButton from './MkButton.vue'; import MkInput from './form/input.vue'; import MkSwitch from './form/switch.vue'; import MkCaptcha from '@/components/MkCaptcha.vue'; diff --git a/packages/client/src/components/MkSignupDialog.vue b/packages/client/src/components/MkSignupDialog.vue index 3e989fcb71..d6d4553bc6 100644 --- a/packages/client/src/components/MkSignupDialog.vue +++ b/packages/client/src/components/MkSignupDialog.vue @@ -19,7 +19,7 @@ <script lang="ts" setup> import { } from 'vue'; import XSignup from '@/components/MkSignup.vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import XModalWindow from '@/components/MkModalWindow.vue'; import { i18n } from '@/i18n'; const props = withDefaults(defineProps<{ diff --git a/packages/client/src/components/ui/super-menu.vue b/packages/client/src/components/MkSuperMenu.vue index 8ce2dc5dc2..8ce2dc5dc2 100644 --- a/packages/client/src/components/ui/super-menu.vue +++ b/packages/client/src/components/MkSuperMenu.vue diff --git a/packages/client/src/components/MkTokenGenerateWindow.vue b/packages/client/src/components/MkTokenGenerateWindow.vue index 789218a8cd..b846034a24 100644 --- a/packages/client/src/components/MkTokenGenerateWindow.vue +++ b/packages/client/src/components/MkTokenGenerateWindow.vue @@ -33,9 +33,9 @@ import { } from 'vue'; import { permissions as kinds } from 'misskey-js'; import MkInput from './form/input.vue'; import MkSwitch from './form/switch.vue'; -import MkButton from './ui/button.vue'; -import MkInfo from './ui/info.vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import MkButton from './MkButton.vue'; +import MkInfo from './MkInfo.vue'; +import XModalWindow from '@/components/MkModalWindow.vue'; const props = withDefaults(defineProps<{ title?: string | null; diff --git a/packages/client/src/components/ui/tooltip.vue b/packages/client/src/components/MkTooltip.vue index 4c6258d245..4c6258d245 100644 --- a/packages/client/src/components/ui/tooltip.vue +++ b/packages/client/src/components/MkTooltip.vue diff --git a/packages/client/src/components/MkUpdated.vue b/packages/client/src/components/MkUpdated.vue index f3ce2731b9..48aeb30224 100644 --- a/packages/client/src/components/MkUpdated.vue +++ b/packages/client/src/components/MkUpdated.vue @@ -11,8 +11,8 @@ <script lang="ts" setup> import { ref } from 'vue'; -import MkModal from '@/components/ui/modal.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkModal from '@/components/MkModal.vue'; +import MkButton from '@/components/MkButton.vue'; import MkSparkle from '@/components/MkSparkle.vue'; import { version } from '@/config'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/components/MkUserList.vue b/packages/client/src/components/MkUserList.vue index d8e28e17db..e1f47c7673 100644 --- a/packages/client/src/components/MkUserList.vue +++ b/packages/client/src/components/MkUserList.vue @@ -18,7 +18,7 @@ <script lang="ts" setup> import { ref } from 'vue'; import MkUserInfo from '@/components/MkUserInfo.vue'; -import MkPagination, { Paging } from '@/components/ui/pagination.vue'; +import MkPagination, { Paging } from '@/components/MkPagination.vue'; import { userPage } from '@/filters/user'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/components/MkUserSelectDialog.vue b/packages/client/src/components/MkUserSelectDialog.vue index 4d8e427a72..07caedfe3a 100644 --- a/packages/client/src/components/MkUserSelectDialog.vue +++ b/packages/client/src/components/MkUserSelectDialog.vue @@ -56,7 +56,7 @@ import { nextTick, onMounted } from 'vue'; import * as misskey from 'misskey-js'; import MkInput from '@/components/form/input.vue'; import FormSplit from '@/components/form/split.vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; +import XModalWindow from '@/components/MkModalWindow.vue'; import * as os from '@/os'; import { defaultStore } from '@/store'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/components/MkUsersTooltip.vue b/packages/client/src/components/MkUsersTooltip.vue index 2df19bcd3f..4ccc44b47e 100644 --- a/packages/client/src/components/MkUsersTooltip.vue +++ b/packages/client/src/components/MkUsersTooltip.vue @@ -12,7 +12,7 @@ <script lang="ts" setup> import { } from 'vue'; -import MkTooltip from './ui/tooltip.vue'; +import MkTooltip from './MkTooltip.vue'; const props = defineProps<{ users: any[]; // TODO diff --git a/packages/client/src/components/MkVisibilityPicker.vue b/packages/client/src/components/MkVisibilityPicker.vue index f4830cd2c6..ecc022eca0 100644 --- a/packages/client/src/components/MkVisibilityPicker.vue +++ b/packages/client/src/components/MkVisibilityPicker.vue @@ -45,7 +45,7 @@ <script lang="ts" setup> import { nextTick, watch } from 'vue'; import * as misskey from 'misskey-js'; -import MkModal from '@/components/ui/modal.vue'; +import MkModal from '@/components/MkModal.vue'; import { i18n } from '@/i18n'; const modal = $ref<InstanceType<typeof MkModal>>(); diff --git a/packages/client/src/components/MkWaitingDialog.vue b/packages/client/src/components/MkWaitingDialog.vue index 9e631b55b1..77b664d3b1 100644 --- a/packages/client/src/components/MkWaitingDialog.vue +++ b/packages/client/src/components/MkWaitingDialog.vue @@ -10,7 +10,7 @@ <script lang="ts" setup> import { watch, ref } from 'vue'; -import MkModal from '@/components/ui/modal.vue'; +import MkModal from '@/components/MkModal.vue'; const modal = ref<InstanceType<typeof MkModal>>(); diff --git a/packages/client/src/components/MkWidgets.vue b/packages/client/src/components/MkWidgets.vue index 54d4c57af3..fcb0d11af4 100644 --- a/packages/client/src/components/MkWidgets.vue +++ b/packages/client/src/components/MkWidgets.vue @@ -34,7 +34,7 @@ import { defineAsyncComponent, reactive, ref, computed } from 'vue'; import { v4 as uuid } from 'uuid'; import MkSelect from '@/components/form/select.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { widgets as widgetDefs } from '@/widgets'; import * as os from '@/os'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/components/ui/window.vue b/packages/client/src/components/MkWindow.vue index 758d4d47b6..758d4d47b6 100644 --- a/packages/client/src/components/ui/window.vue +++ b/packages/client/src/components/MkWindow.vue diff --git a/packages/client/src/components/form/input.vue b/packages/client/src/components/form/input.vue index 1c9fee8c77..382b2ed528 100644 --- a/packages/client/src/components/form/input.vue +++ b/packages/client/src/components/form/input.vue @@ -36,7 +36,7 @@ <script lang="ts" setup> import { onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue'; import { debounce } from 'throttle-debounce'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { useInterval } from '@/scripts/use-interval'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/components/form/range.vue b/packages/client/src/components/form/range.vue index 8301d27830..c0fc8c6510 100644 --- a/packages/client/src/components/form/range.vue +++ b/packages/client/src/components/form/range.vue @@ -96,7 +96,7 @@ const onMousedown = (ev: MouseEvent | TouchEvent) => { ev.preventDefault(); const tooltipShowing = ref(true); - os.popup(defineAsyncComponent(() => import('@/components/ui/tooltip.vue')), { + os.popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), { showing: tooltipShowing, text: computed(() => { return props.textConverter(finalValue.value); diff --git a/packages/client/src/components/form/select.vue b/packages/client/src/components/form/select.vue index 70db2dbae3..313ba41cd3 100644 --- a/packages/client/src/components/form/select.vue +++ b/packages/client/src/components/form/select.vue @@ -28,7 +28,7 @@ <script lang="ts" setup> import { onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs, VNode, useSlots } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { useInterval } from '@/scripts/use-interval'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/components/form/suspense.vue b/packages/client/src/components/form/suspense.vue index 2ad55dacae..132eafd138 100644 --- a/packages/client/src/components/form/suspense.vue +++ b/packages/client/src/components/form/suspense.vue @@ -17,7 +17,7 @@ <script lang="ts"> import { defineComponent, PropType, ref, watch } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; export default defineComponent({ components: { diff --git a/packages/client/src/components/form/textarea.vue b/packages/client/src/components/form/textarea.vue index 73633399de..ca57aa62a5 100644 --- a/packages/client/src/components/form/textarea.vue +++ b/packages/client/src/components/form/textarea.vue @@ -29,7 +29,7 @@ <script lang="ts"> import { defineComponent, onMounted, onUnmounted, nextTick, ref, watch, computed, toRefs } from 'vue'; import { debounce } from 'throttle-debounce'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { i18n } from '@/i18n'; export default defineComponent({ diff --git a/packages/client/src/components/global/MkAd.vue b/packages/client/src/components/global/MkAd.vue index e1b7ae6aff..8161ef3792 100644 --- a/packages/client/src/components/global/MkAd.vue +++ b/packages/client/src/components/global/MkAd.vue @@ -22,7 +22,7 @@ import { ref } from 'vue'; import { instance } from '@/instance'; import { host } from '@/config'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { defaultStore } from '@/store'; import * as os from '@/os'; diff --git a/packages/client/src/components/global/MkError.vue b/packages/client/src/components/global/MkError.vue index 4e2ba07d30..6e75a69ec3 100644 --- a/packages/client/src/components/global/MkError.vue +++ b/packages/client/src/components/global/MkError.vue @@ -9,7 +9,7 @@ </template> <script lang="ts" setup> -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { i18n } from '@/i18n'; </script> diff --git a/packages/client/src/components/page/page.button.vue b/packages/client/src/components/page/page.button.vue index a87f6e9f02..e8878df8de 100644 --- a/packages/client/src/components/page/page.button.vue +++ b/packages/client/src/components/page/page.button.vue @@ -6,7 +6,7 @@ <script lang="ts"> import { defineComponent, PropType, unref } from 'vue'; -import MkButton from '../ui/button.vue'; +import MkButton from '../MkButton.vue'; import * as os from '@/os'; import { ButtonBlock } from '@/scripts/hpml/block'; import { Hpml } from '@/scripts/hpml/evaluator'; diff --git a/packages/client/src/components/page/page.counter.vue b/packages/client/src/components/page/page.counter.vue index b1af8954b0..6eeef71431 100644 --- a/packages/client/src/components/page/page.counter.vue +++ b/packages/client/src/components/page/page.counter.vue @@ -6,7 +6,7 @@ <script lang="ts"> import { computed, defineComponent, PropType } from 'vue'; -import MkButton from '../ui/button.vue'; +import MkButton from '../MkButton.vue'; import * as os from '@/os'; import { CounterVarBlock } from '@/scripts/hpml/block'; import { Hpml } from '@/scripts/hpml/evaluator'; diff --git a/packages/client/src/components/page/page.post.vue b/packages/client/src/components/page/page.post.vue index 3401f945bd..f655196359 100644 --- a/packages/client/src/components/page/page.post.vue +++ b/packages/client/src/components/page/page.post.vue @@ -11,7 +11,7 @@ <script lang="ts"> import { defineComponent, PropType } from 'vue'; import MkTextarea from '../form/textarea.vue'; -import MkButton from '../ui/button.vue'; +import MkButton from '../MkButton.vue'; import { apiUrl } from '@/config'; import * as os from '@/os'; import { PostBlock } from '@/scripts/hpml/block'; diff --git a/packages/client/src/directives/tooltip.ts b/packages/client/src/directives/tooltip.ts index 8b68771cad..5d13497b5f 100644 --- a/packages/client/src/directives/tooltip.ts +++ b/packages/client/src/directives/tooltip.ts @@ -46,7 +46,7 @@ export default { if (self.text == null) return; const showing = ref(true); - popup(defineAsyncComponent(() => import('@/components/ui/tooltip.vue')), { + popup(defineAsyncComponent(() => import('@/components/MkTooltip.vue')), { showing, text: self.text, asMfm: binding.modifiers.mfm, diff --git a/packages/client/src/os.ts b/packages/client/src/os.ts index e014eb529e..515fc47819 100644 --- a/packages/client/src/os.ts +++ b/packages/client/src/os.ts @@ -514,7 +514,7 @@ export function popupMenu(items: MenuItem[] | Ref<MenuItem[]>, src?: HTMLElement }) { return new Promise((resolve, reject) => { let dispose; - popup(defineAsyncComponent(() => import('@/components/ui/popup-menu.vue')), { + popup(defineAsyncComponent(() => import('@/components/MkPopupMenu.vue')), { items, src, width: options?.width, @@ -535,7 +535,7 @@ export function contextMenu(items: MenuItem[] | Ref<MenuItem[]>, ev: MouseEvent) ev.preventDefault(); return new Promise((resolve, reject) => { let dispose; - popup(defineAsyncComponent(() => import('@/components/ui/context-menu.vue')), { + popup(defineAsyncComponent(() => import('@/components/MkContextMenu.vue')), { items, ev, }, { diff --git a/packages/client/src/pages/_error_.vue b/packages/client/src/pages/_error_.vue index 6ac1f4297a..a90a023cb6 100644 --- a/packages/client/src/pages/_error_.vue +++ b/packages/client/src/pages/_error_.vue @@ -20,7 +20,7 @@ <script lang="ts" setup> import { } from 'vue'; import * as misskey from 'misskey-js'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { version } from '@/config'; import * as os from '@/os'; import { unisonReload } from '@/scripts/unison-reload'; diff --git a/packages/client/src/pages/about-misskey.vue b/packages/client/src/pages/about-misskey.vue index 06c0161160..7bcccea98f 100644 --- a/packages/client/src/pages/about-misskey.vue +++ b/packages/client/src/pages/about-misskey.vue @@ -67,7 +67,7 @@ import { nextTick, onBeforeUnmount } from 'vue'; import { version } from '@/config'; import FormLink from '@/components/form/link.vue'; import FormSection from '@/components/form/section.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkLink from '@/components/MkLink.vue'; import { physics } from '@/scripts/physics'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/about.emojis.vue b/packages/client/src/pages/about.emojis.vue index 8049975da3..df64378c01 100644 --- a/packages/client/src/pages/about.emojis.vue +++ b/packages/client/src/pages/about.emojis.vue @@ -30,14 +30,14 @@ <script lang="ts"> import { defineComponent, computed } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import XEmoji from './emojis.emoji.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import MkSelect from '@/components/form/select.vue'; -import MkFolder from '@/components/ui/folder.vue'; +import MkFolder from '@/components/MkFolder.vue'; import MkTab from '@/components/MkTab.vue'; import * as os from '@/os'; import { emojiCategories, emojiTags } from '@/instance'; -import XEmoji from './emojis.emoji.vue'; export default defineComponent({ components: { @@ -66,7 +66,7 @@ export default defineComponent({ handler() { this.search(); }, - deep: true + deep: true, }, }, @@ -90,8 +90,8 @@ export default defineComponent({ } else { this.selectedTags.add(tag); } - } - } + }, + }, }); </script> diff --git a/packages/client/src/pages/about.federation.vue b/packages/client/src/pages/about.federation.vue index 51a49ba59f..c501a77582 100644 --- a/packages/client/src/pages/about.federation.vue +++ b/packages/client/src/pages/about.federation.vue @@ -48,10 +48,10 @@ <script lang="ts" setup> import { computed } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import MkSelect from '@/components/form/select.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import MkInstanceCardMini from '@/components/MkInstanceCardMini.vue'; import FormSplit from '@/components/form/split.vue'; import * as os from '@/os'; diff --git a/packages/client/src/pages/admin-file.vue b/packages/client/src/pages/admin-file.vue index dfdbb1f0da..a62e0f630f 100644 --- a/packages/client/src/pages/admin-file.vue +++ b/packages/client/src/pages/admin-file.vue @@ -63,14 +63,14 @@ <script lang="ts" setup> import { computed } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkSwitch from '@/components/form/switch.vue'; import MkObjectView from '@/components/MkObjectView.vue'; import MkDriveFileThumbnail from '@/components/MkDriveFileThumbnail.vue'; import MkKeyValue from '@/components/MkKeyValue.vue'; import FormSection from '@/components/form/section.vue'; import MkUserCardMini from '@/components/MkUserCardMini.vue'; -import MkInfo from '@/components/ui/info.vue'; +import MkInfo from '@/components/MkInfo.vue'; import bytes from '@/filters/bytes'; import * as os from '@/os'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/admin/_header_.vue b/packages/client/src/pages/admin/_header_.vue index b2c33fdc95..bdb41b2d2c 100644 --- a/packages/client/src/pages/admin/_header_.vue +++ b/packages/client/src/pages/admin/_header_.vue @@ -33,7 +33,7 @@ import tinycolor from 'tinycolor2'; import { popupMenu } from '@/os'; import { url } from '@/config'; import { scrollToTop } from '@/scripts/scroll'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { i18n } from '@/i18n'; import { globalEvents } from '@/events'; import { injectPageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/admin/abuses.vue b/packages/client/src/pages/admin/abuses.vue index 25fd8bcb6d..9907d4d235 100644 --- a/packages/client/src/pages/admin/abuses.vue +++ b/packages/client/src/pages/admin/abuses.vue @@ -52,7 +52,7 @@ import { computed } from 'vue'; import XHeader from './_header_.vue'; import MkInput from '@/components/form/input.vue'; import MkSelect from '@/components/form/select.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import XAbuseReport from '@/components/MkAbuseReport.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/admin/ads.vue b/packages/client/src/pages/admin/ads.vue index 21feafc0bb..9a28d2ad61 100644 --- a/packages/client/src/pages/admin/ads.vue +++ b/packages/client/src/pages/admin/ads.vue @@ -49,7 +49,7 @@ <script lang="ts" setup> import { } from 'vue'; import XHeader from './_header_.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import MkTextarea from '@/components/form/textarea.vue'; import FormRadios from '@/components/form/radios.vue'; diff --git a/packages/client/src/pages/admin/announcements.vue b/packages/client/src/pages/admin/announcements.vue index 5107c2f302..f10693314a 100644 --- a/packages/client/src/pages/admin/announcements.vue +++ b/packages/client/src/pages/admin/announcements.vue @@ -29,7 +29,7 @@ <script lang="ts" setup> import { } from 'vue'; import XHeader from './_header_.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import MkTextarea from '@/components/form/textarea.vue'; import * as os from '@/os'; diff --git a/packages/client/src/pages/admin/bot-protection.vue b/packages/client/src/pages/admin/bot-protection.vue index 2c404380af..72d5e379de 100644 --- a/packages/client/src/pages/admin/bot-protection.vue +++ b/packages/client/src/pages/admin/bot-protection.vue @@ -47,7 +47,7 @@ import { defineAsyncComponent } from 'vue'; import FormRadios from '@/components/form/radios.vue'; import FormInput from '@/components/form/input.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import FormSuspense from '@/components/form/suspense.vue'; import FormSlot from '@/components/form/slot.vue'; import * as os from '@/os'; diff --git a/packages/client/src/pages/admin/email-settings.vue b/packages/client/src/pages/admin/email-settings.vue index 46cfd3db72..64137f0c3e 100644 --- a/packages/client/src/pages/admin/email-settings.vue +++ b/packages/client/src/pages/admin/email-settings.vue @@ -50,7 +50,7 @@ import { } from 'vue'; import XHeader from './_header_.vue'; import FormSwitch from '@/components/form/switch.vue'; import FormInput from '@/components/form/input.vue'; -import FormInfo from '@/components/ui/info.vue'; +import FormInfo from '@/components/MkInfo.vue'; import FormSuspense from '@/components/form/suspense.vue'; import FormSplit from '@/components/form/split.vue'; import FormSection from '@/components/form/section.vue'; diff --git a/packages/client/src/pages/admin/emoji-edit-dialog.vue b/packages/client/src/pages/admin/emoji-edit-dialog.vue index af91044e7d..090dd9afc1 100644 --- a/packages/client/src/pages/admin/emoji-edit-dialog.vue +++ b/packages/client/src/pages/admin/emoji-edit-dialog.vue @@ -30,8 +30,8 @@ <script lang="ts" setup> import { } from 'vue'; -import XModalWindow from '@/components/ui/modal-window.vue'; -import MkButton from '@/components/ui/button.vue'; +import XModalWindow from '@/components/MkModalWindow.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import * as os from '@/os'; import { unique } from '@/scripts/array'; diff --git a/packages/client/src/pages/admin/emojis.vue b/packages/client/src/pages/admin/emojis.vue index cb886ee37f..94f152d7db 100644 --- a/packages/client/src/pages/admin/emojis.vue +++ b/packages/client/src/pages/admin/emojis.vue @@ -70,9 +70,9 @@ <script lang="ts" setup> import { computed, defineAsyncComponent, defineComponent, ref, toRef } from 'vue'; import XHeader from './_header_.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import MkTab from '@/components/MkTab.vue'; import MkSwitch from '@/components/form/switch.vue'; import FormSplit from '@/components/form/split.vue'; diff --git a/packages/client/src/pages/admin/files.vue b/packages/client/src/pages/admin/files.vue index f919571cef..2e3a807ba6 100644 --- a/packages/client/src/pages/admin/files.vue +++ b/packages/client/src/pages/admin/files.vue @@ -36,7 +36,7 @@ import { computed, defineAsyncComponent } from 'vue'; import * as Acct from 'misskey-js/built/acct'; import XHeader from './_header_.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import MkSelect from '@/components/form/select.vue'; import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue'; diff --git a/packages/client/src/pages/admin/index.vue b/packages/client/src/pages/admin/index.vue index 154b854809..9200b5d547 100644 --- a/packages/client/src/pages/admin/index.vue +++ b/packages/client/src/pages/admin/index.vue @@ -25,8 +25,8 @@ <script lang="ts" setup> import { defineAsyncComponent, inject, nextTick, onMounted, onUnmounted, provide, watch } from 'vue'; import { i18n } from '@/i18n'; -import MkSuperMenu from '@/components/ui/super-menu.vue'; -import MkInfo from '@/components/ui/info.vue'; +import MkSuperMenu from '@/components/MkSuperMenu.vue'; +import MkInfo from '@/components/MkInfo.vue'; import { scroll } from '@/scripts/scroll'; import { instance } from '@/instance'; import * as os from '@/os'; diff --git a/packages/client/src/pages/admin/instance-block.vue b/packages/client/src/pages/admin/instance-block.vue index 6d479e8f0d..94b740a4d5 100644 --- a/packages/client/src/pages/admin/instance-block.vue +++ b/packages/client/src/pages/admin/instance-block.vue @@ -17,7 +17,7 @@ <script lang="ts" setup> import { } from 'vue'; import XHeader from './_header_.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import FormTextarea from '@/components/form/textarea.vue'; import FormSuspense from '@/components/form/suspense.vue'; import * as os from '@/os'; diff --git a/packages/client/src/pages/admin/integrations.discord.vue b/packages/client/src/pages/admin/integrations.discord.vue index eff318dc17..0ab6ecbb4f 100644 --- a/packages/client/src/pages/admin/integrations.discord.vue +++ b/packages/client/src/pages/admin/integrations.discord.vue @@ -28,8 +28,8 @@ import { } from 'vue'; import FormSwitch from '@/components/form/switch.vue'; import FormInput from '@/components/form/input.vue'; -import FormButton from '@/components/ui/button.vue'; -import FormInfo from '@/components/ui/info.vue'; +import FormButton from '@/components/MkButton.vue'; +import FormInfo from '@/components/MkInfo.vue'; import FormSuspense from '@/components/form/suspense.vue'; import * as os from '@/os'; import { fetchInstance } from '@/instance'; diff --git a/packages/client/src/pages/admin/integrations.github.vue b/packages/client/src/pages/admin/integrations.github.vue index f6e56e1ed3..34761e9a7b 100644 --- a/packages/client/src/pages/admin/integrations.github.vue +++ b/packages/client/src/pages/admin/integrations.github.vue @@ -28,8 +28,8 @@ import { } from 'vue'; import FormSwitch from '@/components/form/switch.vue'; import FormInput from '@/components/form/input.vue'; -import FormButton from '@/components/ui/button.vue'; -import FormInfo from '@/components/ui/info.vue'; +import FormButton from '@/components/MkButton.vue'; +import FormInfo from '@/components/MkInfo.vue'; import FormSuspense from '@/components/form/suspense.vue'; import * as os from '@/os'; import { fetchInstance } from '@/instance'; diff --git a/packages/client/src/pages/admin/integrations.twitter.vue b/packages/client/src/pages/admin/integrations.twitter.vue index 48da4648f4..a870d76a4d 100644 --- a/packages/client/src/pages/admin/integrations.twitter.vue +++ b/packages/client/src/pages/admin/integrations.twitter.vue @@ -28,8 +28,8 @@ import { defineComponent } from 'vue'; import FormSwitch from '@/components/form/switch.vue'; import FormInput from '@/components/form/input.vue'; -import FormButton from '@/components/ui/button.vue'; -import FormInfo from '@/components/ui/info.vue'; +import FormButton from '@/components/MkButton.vue'; +import FormInfo from '@/components/MkInfo.vue'; import FormSuspense from '@/components/form/suspense.vue'; import * as os from '@/os'; import { fetchInstance } from '@/instance'; diff --git a/packages/client/src/pages/admin/metrics.vue b/packages/client/src/pages/admin/metrics.vue index 7e5f5bb094..e0e47e667f 100644 --- a/packages/client/src/pages/admin/metrics.vue +++ b/packages/client/src/pages/admin/metrics.vue @@ -67,11 +67,11 @@ import { Tooltip, SubTitle } from 'chart.js'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkSelect from '@/components/form/select.vue'; import MkInput from '@/components/form/input.vue'; -import MkContainer from '@/components/ui/container.vue'; -import MkFolder from '@/components/ui/folder.vue'; +import MkContainer from '@/components/MkContainer.vue'; +import MkFolder from '@/components/MkFolder.vue'; import MkwFederation from '../../widgets/federation.vue'; import { version, url } from '@/config'; import bytes from '@/filters/bytes'; diff --git a/packages/client/src/pages/admin/proxy-account.vue b/packages/client/src/pages/admin/proxy-account.vue index 71f35bf0f6..fe61909e80 100644 --- a/packages/client/src/pages/admin/proxy-account.vue +++ b/packages/client/src/pages/admin/proxy-account.vue @@ -16,8 +16,8 @@ <script lang="ts" setup> import { } from 'vue'; import MkKeyValue from '@/components/MkKeyValue.vue'; -import FormButton from '@/components/ui/button.vue'; -import MkInfo from '@/components/ui/info.vue'; +import FormButton from '@/components/MkButton.vue'; +import MkInfo from '@/components/MkInfo.vue'; import FormSuspense from '@/components/form/suspense.vue'; import * as os from '@/os'; import { fetchInstance } from '@/instance'; diff --git a/packages/client/src/pages/admin/queue.vue b/packages/client/src/pages/admin/queue.vue index 6ccb464d17..a6fc75aea8 100644 --- a/packages/client/src/pages/admin/queue.vue +++ b/packages/client/src/pages/admin/queue.vue @@ -12,7 +12,7 @@ import { markRaw, onMounted, onBeforeUnmount, nextTick } from 'vue'; import XQueue from './queue.chart.vue'; import XHeader from './_header_.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import * as config from '@/config'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/admin/relays.vue b/packages/client/src/pages/admin/relays.vue index 42347c0e7d..e6f7f4ead1 100644 --- a/packages/client/src/pages/admin/relays.vue +++ b/packages/client/src/pages/admin/relays.vue @@ -19,7 +19,7 @@ <script lang="ts" setup> import { } from 'vue'; import XHeader from './_header_.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/admin/security.vue b/packages/client/src/pages/admin/security.vue index 07ee412f3e..c36cedb312 100644 --- a/packages/client/src/pages/admin/security.vue +++ b/packages/client/src/pages/admin/security.vue @@ -107,11 +107,11 @@ import XHeader from './_header_.vue'; import FormFolder from '@/components/form/folder.vue'; import FormRadios from '@/components/form/radios.vue'; import FormSwitch from '@/components/form/switch.vue'; -import FormInfo from '@/components/ui/info.vue'; +import FormInfo from '@/components/MkInfo.vue'; import FormSuspense from '@/components/form/suspense.vue'; import FormRange from '@/components/form/range.vue'; import FormInput from '@/components/form/input.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { fetchInstance } from '@/instance'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/admin/settings.vue b/packages/client/src/pages/admin/settings.vue index 496eb46ea4..cf6b1f17e9 100644 --- a/packages/client/src/pages/admin/settings.vue +++ b/packages/client/src/pages/admin/settings.vue @@ -153,7 +153,7 @@ import XHeader from './_header_.vue'; import FormSwitch from '@/components/form/switch.vue'; import FormInput from '@/components/form/input.vue'; import FormTextarea from '@/components/form/textarea.vue'; -import FormInfo from '@/components/ui/info.vue'; +import FormInfo from '@/components/MkInfo.vue'; import FormSection from '@/components/form/section.vue'; import FormSplit from '@/components/form/split.vue'; import FormSuspense from '@/components/form/suspense.vue'; diff --git a/packages/client/src/pages/admin/users.vue b/packages/client/src/pages/admin/users.vue index 9cdb6d8be2..eeb335a430 100644 --- a/packages/client/src/pages/admin/users.vue +++ b/packages/client/src/pages/admin/users.vue @@ -57,7 +57,7 @@ import { computed } from 'vue'; import XHeader from './_header_.vue'; import MkInput from '@/components/form/input.vue'; import MkSelect from '@/components/form/select.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import * as os from '@/os'; import { lookupUser } from '@/scripts/lookup-user'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/announcements.vue b/packages/client/src/pages/announcements.vue index aeb85b6557..5f66596997 100644 --- a/packages/client/src/pages/announcements.vue +++ b/packages/client/src/pages/announcements.vue @@ -20,8 +20,8 @@ <script lang="ts" setup> import { } from 'vue'; -import MkPagination from '@/components/ui/pagination.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkPagination from '@/components/MkPagination.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/api-console.vue b/packages/client/src/pages/api-console.vue index 2f8eeadff1..0064e4c3f1 100644 --- a/packages/client/src/pages/api-console.vue +++ b/packages/client/src/pages/api-console.vue @@ -32,7 +32,7 @@ import { ref } from 'vue'; import JSON5 from 'json5'; import { Endpoints } from 'misskey-js'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import MkTextarea from '@/components/form/textarea.vue'; import MkSwitch from '@/components/form/switch.vue'; diff --git a/packages/client/src/pages/auth.form.vue b/packages/client/src/pages/auth.form.vue index 5feff0149a..024a7a2c5b 100644 --- a/packages/client/src/pages/auth.form.vue +++ b/packages/client/src/pages/auth.form.vue @@ -21,7 +21,7 @@ <script lang="ts"> import { defineComponent } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; export default defineComponent({ diff --git a/packages/client/src/pages/channel-editor.vue b/packages/client/src/pages/channel-editor.vue index 5b5d0454f9..3e94b5f041 100644 --- a/packages/client/src/pages/channel-editor.vue +++ b/packages/client/src/pages/channel-editor.vue @@ -29,7 +29,7 @@ <script lang="ts" setup> import { computed, inject, watch } from 'vue'; import MkTextarea from '@/components/form/textarea.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import { selectFile } from '@/scripts/select-file'; import * as os from '@/os'; diff --git a/packages/client/src/pages/channel.vue b/packages/client/src/pages/channel.vue index 04c302f4da..380c3efc8e 100644 --- a/packages/client/src/pages/channel.vue +++ b/packages/client/src/pages/channel.vue @@ -33,7 +33,7 @@ <script lang="ts" setup> import { computed, inject, watch } from 'vue'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import XPostForm from '@/components/MkPostForm.vue'; import XTimeline from '@/components/MkTimeline.vue'; import XChannelFollowButton from '@/components/MkChannelFollowButton.vue'; diff --git a/packages/client/src/pages/channels.vue b/packages/client/src/pages/channels.vue index fbc17b6892..56ea98d15e 100644 --- a/packages/client/src/pages/channels.vue +++ b/packages/client/src/pages/channels.vue @@ -25,8 +25,8 @@ <script lang="ts" setup> import { computed, defineComponent, inject } from 'vue'; import MkChannelPreview from '@/components/MkChannelPreview.vue'; -import MkPagination from '@/components/ui/pagination.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkPagination from '@/components/MkPagination.vue'; +import MkButton from '@/components/MkButton.vue'; import { useRouter } from '@/router'; import { definePageMetadata } from '@/scripts/page-metadata'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/explore.users.vue b/packages/client/src/pages/explore.users.vue index f25015620a..e16e40b8ed 100644 --- a/packages/client/src/pages/explore.users.vue +++ b/packages/client/src/pages/explore.users.vue @@ -60,7 +60,7 @@ <script lang="ts" setup> import { computed, watch } from 'vue'; import XUserList from '@/components/MkUserList.vue'; -import MkFolder from '@/components/ui/folder.vue'; +import MkFolder from '@/components/MkFolder.vue'; import MkTab from '@/components/MkTab.vue'; import number from '@/filters/number'; import * as os from '@/os'; diff --git a/packages/client/src/pages/explore.vue b/packages/client/src/pages/explore.vue index 1fac32c036..279960d139 100644 --- a/packages/client/src/pages/explore.vue +++ b/packages/client/src/pages/explore.vue @@ -33,7 +33,7 @@ import { computed, watch } from 'vue'; import XFeatured from './explore.featured.vue'; import XUsers from './explore.users.vue'; -import MkFolder from '@/components/ui/folder.vue'; +import MkFolder from '@/components/MkFolder.vue'; import MkInput from '@/components/form/input.vue'; import MkRadios from '@/components/form/radios.vue'; import number from '@/filters/number'; diff --git a/packages/client/src/pages/favorites.vue b/packages/client/src/pages/favorites.vue index 1501484cc3..32a1dbf592 100644 --- a/packages/client/src/pages/favorites.vue +++ b/packages/client/src/pages/favorites.vue @@ -22,7 +22,7 @@ <script lang="ts" setup> import { ref } from 'vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import XNote from '@/components/MkNote.vue'; import XList from '@/components/MkDateSeparatedList.vue'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/follow-requests.vue b/packages/client/src/pages/follow-requests.vue index f87bcbf24b..82d7164260 100644 --- a/packages/client/src/pages/follow-requests.vue +++ b/packages/client/src/pages/follow-requests.vue @@ -36,7 +36,7 @@ <script lang="ts" setup> import { ref, computed } from 'vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import { userPage, acct } from '@/filters/user'; import * as os from '@/os'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/gallery/edit.vue b/packages/client/src/pages/gallery/edit.vue index 2e0e5063e9..8f716d9eb3 100644 --- a/packages/client/src/pages/gallery/edit.vue +++ b/packages/client/src/pages/gallery/edit.vue @@ -32,7 +32,7 @@ <script lang="ts" setup> import { computed, inject, watch } from 'vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import FormInput from '@/components/form/input.vue'; import FormTextarea from '@/components/form/textarea.vue'; import FormSwitch from '@/components/form/switch.vue'; diff --git a/packages/client/src/pages/gallery/index.vue b/packages/client/src/pages/gallery/index.vue index 1dfedb4a67..598383217e 100644 --- a/packages/client/src/pages/gallery/index.vue +++ b/packages/client/src/pages/gallery/index.vue @@ -44,11 +44,11 @@ <script lang="ts" setup> import { computed, defineComponent, watch } from 'vue'; import XUserList from '@/components/MkUserList.vue'; -import MkFolder from '@/components/ui/folder.vue'; +import MkFolder from '@/components/MkFolder.vue'; import MkInput from '@/components/form/input.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkTab from '@/components/MkTab.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue'; import number from '@/filters/number'; import * as os from '@/os'; diff --git a/packages/client/src/pages/gallery/post.vue b/packages/client/src/pages/gallery/post.vue index 1e7a997167..3804bcdcf5 100644 --- a/packages/client/src/pages/gallery/post.vue +++ b/packages/client/src/pages/gallery/post.vue @@ -56,11 +56,11 @@ <script lang="ts" setup> import { computed, defineComponent, inject, watch } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue'; import MkFollowButton from '@/components/MkFollowButton.vue'; import { url } from '@/config'; diff --git a/packages/client/src/pages/instance-info.vue b/packages/client/src/pages/instance-info.vue index a4d462f823..6e8560ef42 100644 --- a/packages/client/src/pages/instance-info.vue +++ b/packages/client/src/pages/instance-info.vue @@ -121,7 +121,7 @@ import MkChart from '@/components/MkChart.vue'; import MkObjectView from '@/components/MkObjectView.vue'; import FormLink from '@/components/form/link.vue'; import MkLink from '@/components/MkLink.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import FormSection from '@/components/form/section.vue'; import MkKeyValue from '@/components/MkKeyValue.vue'; import MkSelect from '@/components/form/select.vue'; @@ -133,7 +133,7 @@ import { iAmModerator } from '@/account'; import { definePageMetadata } from '@/scripts/page-metadata'; import { i18n } from '@/i18n'; import MkUserCardMini from '@/components/MkUserCardMini.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; const props = defineProps<{ host: string; diff --git a/packages/client/src/pages/messaging/index.vue b/packages/client/src/pages/messaging/index.vue index 7df4c846fb..56d852fe3d 100644 --- a/packages/client/src/pages/messaging/index.vue +++ b/packages/client/src/pages/messaging/index.vue @@ -45,7 +45,7 @@ <script lang="ts" setup> import { defineAsyncComponent, defineComponent, inject, markRaw, onMounted, onUnmounted } from 'vue'; import * as Acct from 'misskey-js/built/acct'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { acct } from '@/filters/user'; import * as os from '@/os'; import { stream } from '@/stream'; diff --git a/packages/client/src/pages/messaging/messaging-room.vue b/packages/client/src/pages/messaging/messaging-room.vue index b91cba7ec7..a9da89ed95 100644 --- a/packages/client/src/pages/messaging/messaging-room.vue +++ b/packages/client/src/pages/messaging/messaging-room.vue @@ -56,7 +56,7 @@ import * as Acct from 'misskey-js/built/acct'; import XMessage from './messaging-room.message.vue'; import XForm from './messaging-room.form.vue'; import XList from '@/components/MkDateSeparatedList.vue'; -import MkPagination, { Paging } from '@/components/ui/pagination.vue'; +import MkPagination, { Paging } from '@/components/MkPagination.vue'; import { isBottomVisible, onScrollBottom, scrollToBottom } from '@/scripts/scroll'; import * as os from '@/os'; import { stream } from '@/stream'; diff --git a/packages/client/src/pages/miauth.vue b/packages/client/src/pages/miauth.vue index 5a890c7b39..5de072cbfa 100644 --- a/packages/client/src/pages/miauth.vue +++ b/packages/client/src/pages/miauth.vue @@ -41,7 +41,7 @@ <script lang="ts" setup> import { } from 'vue'; import MkSignin from '@/components/MkSignin.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { $i, login } from '@/account'; import { appendQuery, query } from '@/scripts/url'; diff --git a/packages/client/src/pages/my-antennas/editor.vue b/packages/client/src/pages/my-antennas/editor.vue index 32027846cc..054053fbfb 100644 --- a/packages/client/src/pages/my-antennas/editor.vue +++ b/packages/client/src/pages/my-antennas/editor.vue @@ -47,7 +47,7 @@ <script lang="ts" setup> import { watch } from 'vue'; import * as Acct from 'misskey-js/built/acct'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import MkTextarea from '@/components/form/textarea.vue'; import MkSelect from '@/components/form/select.vue'; diff --git a/packages/client/src/pages/my-antennas/index.vue b/packages/client/src/pages/my-antennas/index.vue index 70e444da52..dc73ba674e 100644 --- a/packages/client/src/pages/my-antennas/index.vue +++ b/packages/client/src/pages/my-antennas/index.vue @@ -17,8 +17,8 @@ <script lang="ts" setup> import { } from 'vue'; -import MkPagination from '@/components/ui/pagination.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkPagination from '@/components/MkPagination.vue'; +import MkButton from '@/components/MkButton.vue'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/my-clips/index.vue b/packages/client/src/pages/my-clips/index.vue index 5e5454b729..68330d6db4 100644 --- a/packages/client/src/pages/my-clips/index.vue +++ b/packages/client/src/pages/my-clips/index.vue @@ -18,8 +18,8 @@ <script lang="ts" setup> import { } from 'vue'; -import MkPagination from '@/components/ui/pagination.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkPagination from '@/components/MkPagination.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/my-lists/index.vue b/packages/client/src/pages/my-lists/index.vue index 7dc5b3e907..9af7c0d105 100644 --- a/packages/client/src/pages/my-lists/index.vue +++ b/packages/client/src/pages/my-lists/index.vue @@ -18,8 +18,8 @@ <script lang="ts" setup> import { } from 'vue'; -import MkPagination from '@/components/ui/pagination.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkPagination from '@/components/MkPagination.vue'; +import MkButton from '@/components/MkButton.vue'; import MkAvatars from '@/components/MkAvatars.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/my-lists/list.vue b/packages/client/src/pages/my-lists/list.vue index 8b23c667dc..d90453526e 100644 --- a/packages/client/src/pages/my-lists/list.vue +++ b/packages/client/src/pages/my-lists/list.vue @@ -39,7 +39,7 @@ <script lang="ts" setup> import { computed, watch } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { mainRouter } from '@/router'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/note.vue b/packages/client/src/pages/note.vue index ba05a7b887..6509cb306e 100644 --- a/packages/client/src/pages/note.vue +++ b/packages/client/src/pages/note.vue @@ -47,7 +47,7 @@ import XNote from '@/components/MkNote.vue'; import XNoteDetailed from '@/components/MkNoteDetailed.vue'; import XNotes from '@/components/MkNotes.vue'; import MkRemoteCaution from '@/components/MkRemoteCaution.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { definePageMetadata } from '@/scripts/page-metadata'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/page-editor/page-editor.vue b/packages/client/src/pages/page-editor/page-editor.vue index aaa61e6e36..591d13053a 100644 --- a/packages/client/src/pages/page-editor/page-editor.vue +++ b/packages/client/src/pages/page-editor/page-editor.vue @@ -93,7 +93,7 @@ import { v4 as uuid } from 'uuid'; import XVariable from './page-editor.script-block.vue'; import XBlocks from './page-editor.blocks.vue'; import MkTextarea from '@/components/form/textarea.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkSelect from '@/components/form/select.vue'; import MkSwitch from '@/components/form/switch.vue'; import MkInput from '@/components/form/input.vue'; diff --git a/packages/client/src/pages/page.vue b/packages/client/src/pages/page.vue index 48d62a9549..fb0e6a4914 100644 --- a/packages/client/src/pages/page.vue +++ b/packages/client/src/pages/page.vue @@ -65,12 +65,12 @@ <script lang="ts" setup> import { computed, watch } from 'vue'; import XPage from '@/components/page/page.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { url } from '@/config'; import MkFollowButton from '@/components/MkFollowButton.vue'; -import MkContainer from '@/components/ui/container.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkContainer from '@/components/MkContainer.vue'; +import MkPagination from '@/components/MkPagination.vue'; import MkPagePreview from '@/components/MkPagePreview.vue'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/pages.vue b/packages/client/src/pages/pages.vue index 6e71d9c836..02b05c57ba 100644 --- a/packages/client/src/pages/pages.vue +++ b/packages/client/src/pages/pages.vue @@ -27,8 +27,8 @@ <script lang="ts" setup> import { computed, inject } from 'vue'; import MkPagePreview from '@/components/MkPagePreview.vue'; -import MkPagination from '@/components/ui/pagination.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkPagination from '@/components/MkPagination.vue'; +import MkButton from '@/components/MkButton.vue'; import { useRouter } from '@/router'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/registry.keys.vue b/packages/client/src/pages/registry.keys.vue index 372b5faa4d..ac586b4e72 100644 --- a/packages/client/src/pages/registry.keys.vue +++ b/packages/client/src/pages/registry.keys.vue @@ -33,7 +33,7 @@ import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; import FormLink from '@/components/form/link.vue'; import FormSection from '@/components/form/section.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkKeyValue from '@/components/MkKeyValue.vue'; import FormSplit from '@/components/form/split.vue'; diff --git a/packages/client/src/pages/registry.value.vue b/packages/client/src/pages/registry.value.vue index 9fac7f990f..b6f3d73bb6 100644 --- a/packages/client/src/pages/registry.value.vue +++ b/packages/client/src/pages/registry.value.vue @@ -45,11 +45,11 @@ import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; import FormLink from '@/components/form/link.vue'; import FormSection from '@/components/form/section.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkKeyValue from '@/components/MkKeyValue.vue'; import FormTextarea from '@/components/form/textarea.vue'; import FormSplit from '@/components/form/split.vue'; -import FormInfo from '@/components/ui/info.vue'; +import FormInfo from '@/components/MkInfo.vue'; const props = defineProps<{ path: string; diff --git a/packages/client/src/pages/registry.vue b/packages/client/src/pages/registry.vue index f022a0d688..80a44d5589 100644 --- a/packages/client/src/pages/registry.vue +++ b/packages/client/src/pages/registry.vue @@ -22,7 +22,7 @@ import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; import FormLink from '@/components/form/link.vue'; import FormSection from '@/components/form/section.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; let scopes = $ref(null); diff --git a/packages/client/src/pages/reset-password.vue b/packages/client/src/pages/reset-password.vue index 4c4cdb8103..38f2cf289d 100644 --- a/packages/client/src/pages/reset-password.vue +++ b/packages/client/src/pages/reset-password.vue @@ -17,7 +17,7 @@ <script lang="ts" setup> import { defineAsyncComponent, onMounted } from 'vue'; import FormInput from '@/components/form/input.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { mainRouter } from '@/router'; diff --git a/packages/client/src/pages/scratchpad.vue b/packages/client/src/pages/scratchpad.vue index d437601475..12b5d78b27 100644 --- a/packages/client/src/pages/scratchpad.vue +++ b/packages/client/src/pages/scratchpad.vue @@ -28,8 +28,8 @@ import 'prismjs/themes/prism-okaidia.css'; import { PrismEditor } from 'vue-prism-editor'; import 'vue-prism-editor/dist/prismeditor.min.css'; import { AiScript, parse, utils } from '@syuilo/aiscript'; -import MkContainer from '@/components/ui/container.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkContainer from '@/components/MkContainer.vue'; +import MkButton from '@/components/MkButton.vue'; import { createAiScriptEnv } from '@/scripts/aiscript/api'; import * as os from '@/os'; import { $i } from '@/account'; diff --git a/packages/client/src/pages/settings/2fa.vue b/packages/client/src/pages/settings/2fa.vue index d72d3e2060..89d8178dc6 100644 --- a/packages/client/src/pages/settings/2fa.vue +++ b/packages/client/src/pages/settings/2fa.vue @@ -68,8 +68,8 @@ import { ref } from 'vue'; import { hostname } from '@/config'; import { byteify, hexify, stringify } from '@/scripts/2fa'; -import MkButton from '@/components/ui/button.vue'; -import MkInfo from '@/components/ui/info.vue'; +import MkButton from '@/components/MkButton.vue'; +import MkInfo from '@/components/MkInfo.vue'; import MkInput from '@/components/form/input.vue'; import MkSwitch from '@/components/form/switch.vue'; import * as os from '@/os'; diff --git a/packages/client/src/pages/settings/accounts.vue b/packages/client/src/pages/settings/accounts.vue index 33a0fcc329..e16931a9ca 100644 --- a/packages/client/src/pages/settings/accounts.vue +++ b/packages/client/src/pages/settings/accounts.vue @@ -23,7 +23,7 @@ <script lang="ts" setup> import { defineAsyncComponent, ref } from 'vue'; import FormSuspense from '@/components/form/suspense.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { getAccounts, addAccount as addAccounts, removeAccount as _removeAccount, login, $i } from '@/account'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/settings/api.vue b/packages/client/src/pages/settings/api.vue index b0a787fc48..7165089e39 100644 --- a/packages/client/src/pages/settings/api.vue +++ b/packages/client/src/pages/settings/api.vue @@ -9,7 +9,7 @@ <script lang="ts" setup> import { defineAsyncComponent, ref } from 'vue'; import FormLink from '@/components/form/link.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/settings/apps.vue b/packages/client/src/pages/settings/apps.vue index 10ecbc795d..8b345c8e9f 100644 --- a/packages/client/src/pages/settings/apps.vue +++ b/packages/client/src/pages/settings/apps.vue @@ -39,7 +39,7 @@ <script lang="ts" setup> import { ref } from 'vue'; -import FormPagination from '@/components/ui/pagination.vue'; +import FormPagination from '@/components/MkPagination.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/settings/custom-css.vue b/packages/client/src/pages/settings/custom-css.vue index d5000d3973..2992906e6d 100644 --- a/packages/client/src/pages/settings/custom-css.vue +++ b/packages/client/src/pages/settings/custom-css.vue @@ -11,7 +11,7 @@ <script lang="ts" setup> import { ref, watch } from 'vue'; import FormTextarea from '@/components/form/textarea.vue'; -import FormInfo from '@/components/ui/info.vue'; +import FormInfo from '@/components/MkInfo.vue'; import * as os from '@/os'; import { unisonReload } from '@/scripts/unison-reload'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/settings/delete-account.vue b/packages/client/src/pages/settings/delete-account.vue index 3c4ea716ce..851a857fed 100644 --- a/packages/client/src/pages/settings/delete-account.vue +++ b/packages/client/src/pages/settings/delete-account.vue @@ -8,8 +8,8 @@ </template> <script lang="ts" setup> -import FormInfo from '@/components/ui/info.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormInfo from '@/components/MkInfo.vue'; +import FormButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { signout } from '@/account'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/settings/import-export.vue b/packages/client/src/pages/settings/import-export.vue index 13c2b7fc85..d3d155894e 100644 --- a/packages/client/src/pages/settings/import-export.vue +++ b/packages/client/src/pages/settings/import-export.vue @@ -71,7 +71,7 @@ <script lang="ts" setup> import { ref } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import FormSection from '@/components/form/section.vue'; import FormFolder from '@/components/form/folder.vue'; import FormSwitch from '@/components/form/switch.vue'; diff --git a/packages/client/src/pages/settings/index.vue b/packages/client/src/pages/settings/index.vue index 862435eb3f..73407ff5fb 100644 --- a/packages/client/src/pages/settings/index.vue +++ b/packages/client/src/pages/settings/index.vue @@ -24,8 +24,8 @@ <script setup lang="ts"> import { computed, defineAsyncComponent, inject, nextTick, onActivated, onMounted, onUnmounted, provide, ref, watch } from 'vue'; import { i18n } from '@/i18n'; -import MkInfo from '@/components/ui/info.vue'; -import MkSuperMenu from '@/components/ui/super-menu.vue'; +import MkInfo from '@/components/MkInfo.vue'; +import MkSuperMenu from '@/components/MkSuperMenu.vue'; import { scroll } from '@/scripts/scroll'; import { signout , $i } from '@/account'; import { unisonReload } from '@/scripts/unison-reload'; diff --git a/packages/client/src/pages/settings/instance-mute.vue b/packages/client/src/pages/settings/instance-mute.vue index d0ca85adca..5a0d48b82e 100644 --- a/packages/client/src/pages/settings/instance-mute.vue +++ b/packages/client/src/pages/settings/instance-mute.vue @@ -12,8 +12,8 @@ <script lang="ts" setup> import { ref, watch } from 'vue'; import FormTextarea from '@/components/form/textarea.vue'; -import MkInfo from '@/components/ui/info.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkInfo from '@/components/MkInfo.vue'; +import MkButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { $i } from '@/account'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/settings/integration.vue b/packages/client/src/pages/settings/integration.vue index ccb02e08a2..c8219519f8 100644 --- a/packages/client/src/pages/settings/integration.vue +++ b/packages/client/src/pages/settings/integration.vue @@ -27,7 +27,7 @@ import { computed, onMounted, ref, watch } from 'vue'; import { apiUrl } from '@/config'; import FormSection from '@/components/form/section.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { $i } from '@/account'; import { instance } from '@/instance'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/settings/mute-block.vue b/packages/client/src/pages/settings/mute-block.vue index 28c215a04f..3832933cf9 100644 --- a/packages/client/src/pages/settings/mute-block.vue +++ b/packages/client/src/pages/settings/mute-block.vue @@ -29,9 +29,9 @@ <script lang="ts" setup> import { } from 'vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import MkTab from '@/components/MkTab.vue'; -import FormInfo from '@/components/ui/info.vue'; +import FormInfo from '@/components/MkInfo.vue'; import FormLink from '@/components/form/link.vue'; import { userPage } from '@/filters/user'; import * as os from '@/os'; diff --git a/packages/client/src/pages/settings/navbar.vue b/packages/client/src/pages/settings/navbar.vue index 534112c3e0..6c501e9f2f 100644 --- a/packages/client/src/pages/settings/navbar.vue +++ b/packages/client/src/pages/settings/navbar.vue @@ -21,7 +21,7 @@ import { computed, ref, watch } from 'vue'; import FormTextarea from '@/components/form/textarea.vue'; import FormRadios from '@/components/form/radios.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { navbarItemDef } from '@/navbar'; import { defaultStore } from '@/store'; diff --git a/packages/client/src/pages/settings/notifications.vue b/packages/client/src/pages/settings/notifications.vue index 47c51e600b..5703e0c6b6 100644 --- a/packages/client/src/pages/settings/notifications.vue +++ b/packages/client/src/pages/settings/notifications.vue @@ -12,7 +12,7 @@ <script lang="ts" setup> import { defineAsyncComponent } from 'vue'; import { notificationTypes } from 'misskey-js'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import FormLink from '@/components/form/link.vue'; import FormSection from '@/components/form/section.vue'; import * as os from '@/os'; diff --git a/packages/client/src/pages/settings/plugin.install.vue b/packages/client/src/pages/settings/plugin.install.vue index 4940f3b5f9..e259bbeb3a 100644 --- a/packages/client/src/pages/settings/plugin.install.vue +++ b/packages/client/src/pages/settings/plugin.install.vue @@ -18,8 +18,8 @@ import { AiScript, parse } from '@syuilo/aiscript'; import { serialize } from '@syuilo/aiscript/built/serializer'; import { v4 as uuid } from 'uuid'; import FormTextarea from '@/components/form/textarea.vue'; -import FormButton from '@/components/ui/button.vue'; -import FormInfo from '@/components/ui/info.vue'; +import FormButton from '@/components/MkButton.vue'; +import FormInfo from '@/components/MkInfo.vue'; import * as os from '@/os'; import { ColdDeviceStorage } from '@/store'; import { unisonReload } from '@/scripts/unison-reload'; diff --git a/packages/client/src/pages/settings/plugin.vue b/packages/client/src/pages/settings/plugin.vue index b557bd538f..8ce6fe4445 100644 --- a/packages/client/src/pages/settings/plugin.vue +++ b/packages/client/src/pages/settings/plugin.vue @@ -36,7 +36,7 @@ import { nextTick, ref } from 'vue'; import FormLink from '@/components/form/link.vue'; import FormSwitch from '@/components/form/switch.vue'; import FormSection from '@/components/form/section.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkKeyValue from '@/components/MkKeyValue.vue'; import * as os from '@/os'; import { ColdDeviceStorage } from '@/store'; diff --git a/packages/client/src/pages/settings/preferences-backups.vue b/packages/client/src/pages/settings/preferences-backups.vue index 991bb7902d..fac67185bc 100644 --- a/packages/client/src/pages/settings/preferences-backups.vue +++ b/packages/client/src/pages/settings/preferences-backups.vue @@ -33,8 +33,8 @@ import { computed, onMounted, onUnmounted, useCssModule } from 'vue'; import { v4 as uuid } from 'uuid'; import FormSection from '@/components/form/section.vue'; -import MkButton from '@/components/ui/button.vue'; -import MkInfo from '@/components/ui/info.vue'; +import MkButton from '@/components/MkButton.vue'; +import MkInfo from '@/components/MkInfo.vue'; import * as os from '@/os'; import { ColdDeviceStorage, defaultStore } from '@/store'; import { unisonReload } from '@/scripts/unison-reload'; diff --git a/packages/client/src/pages/settings/profile.vue b/packages/client/src/pages/settings/profile.vue index 5bb3273b3f..aaf60c8d55 100644 --- a/packages/client/src/pages/settings/profile.vue +++ b/packages/client/src/pages/settings/profile.vue @@ -61,7 +61,7 @@ <script lang="ts" setup> import { reactive, watch } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import FormInput from '@/components/form/input.vue'; import FormTextarea from '@/components/form/textarea.vue'; import FormSwitch from '@/components/form/switch.vue'; diff --git a/packages/client/src/pages/settings/reaction.vue b/packages/client/src/pages/settings/reaction.vue index eae95c1e90..c23c1c2375 100644 --- a/packages/client/src/pages/settings/reaction.vue +++ b/packages/client/src/pages/settings/reaction.vue @@ -59,7 +59,7 @@ import XDraggable from 'vuedraggable'; import FormInput from '@/components/form/input.vue'; import FormRadios from '@/components/form/radios.vue'; import FromSlot from '@/components/form/slot.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import FormSection from '@/components/form/section.vue'; import FormSwitch from '@/components/form/switch.vue'; import * as os from '@/os'; diff --git a/packages/client/src/pages/settings/security.vue b/packages/client/src/pages/settings/security.vue index d926acce5d..d109a4ba7c 100644 --- a/packages/client/src/pages/settings/security.vue +++ b/packages/client/src/pages/settings/security.vue @@ -41,8 +41,8 @@ import X2fa from './2fa.vue'; import FormSection from '@/components/form/section.vue'; import FormSlot from '@/components/form/slot.vue'; -import FormButton from '@/components/ui/button.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import FormButton from '@/components/MkButton.vue'; +import MkPagination from '@/components/MkPagination.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/settings/sounds.vue b/packages/client/src/pages/settings/sounds.vue index 2d2b5a0a07..2729609522 100644 --- a/packages/client/src/pages/settings/sounds.vue +++ b/packages/client/src/pages/settings/sounds.vue @@ -20,7 +20,7 @@ <script lang="ts" setup> import { computed, ref } from 'vue'; import FormRange from '@/components/form/range.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import FormLink from '@/components/form/link.vue'; import FormSection from '@/components/form/section.vue'; import * as os from '@/os'; diff --git a/packages/client/src/pages/settings/statusbar.statusbar.vue b/packages/client/src/pages/settings/statusbar.statusbar.vue index 2f0c6fc1ee..98a1825b95 100644 --- a/packages/client/src/pages/settings/statusbar.statusbar.vue +++ b/packages/client/src/pages/settings/statusbar.statusbar.vue @@ -86,7 +86,7 @@ import FormSelect from '@/components/form/select.vue'; import MkInput from '@/components/form/input.vue'; import MkSwitch from '@/components/form/switch.vue'; import FormRadios from '@/components/form/radios.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import FormRange from '@/components/form/range.vue'; import * as os from '@/os'; import { defaultStore } from '@/store'; diff --git a/packages/client/src/pages/settings/statusbar.vue b/packages/client/src/pages/settings/statusbar.vue index 3f23ed470c..9dbf182142 100644 --- a/packages/client/src/pages/settings/statusbar.vue +++ b/packages/client/src/pages/settings/statusbar.vue @@ -15,7 +15,7 @@ import { v4 as uuid } from 'uuid'; import XStatusbar from './statusbar.statusbar.vue'; import FormRadios from '@/components/form/radios.vue'; import FormFolder from '@/components/form/folder.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { defaultStore } from '@/store'; import { unisonReload } from '@/scripts/unison-reload'; diff --git a/packages/client/src/pages/settings/theme.install.vue b/packages/client/src/pages/settings/theme.install.vue index 2994d8fb1a..34f8384d87 100644 --- a/packages/client/src/pages/settings/theme.install.vue +++ b/packages/client/src/pages/settings/theme.install.vue @@ -15,7 +15,7 @@ import { } from 'vue'; import JSON5 from 'json5'; import FormTextarea from '@/components/form/textarea.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import { applyTheme, validateTheme } from '@/scripts/theme'; import * as os from '@/os'; import { addTheme, getThemes } from '@/theme-store'; diff --git a/packages/client/src/pages/settings/theme.manage.vue b/packages/client/src/pages/settings/theme.manage.vue index 9d28b4a316..792bb15e5d 100644 --- a/packages/client/src/pages/settings/theme.manage.vue +++ b/packages/client/src/pages/settings/theme.manage.vue @@ -31,7 +31,7 @@ import JSON5 from 'json5'; import FormTextarea from '@/components/form/textarea.vue'; import FormSelect from '@/components/form/select.vue'; import FormInput from '@/components/form/input.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import { Theme, getBuiltinThemesRef } from '@/scripts/theme'; import copyToClipboard from '@/scripts/copy-to-clipboard'; import * as os from '@/os'; diff --git a/packages/client/src/pages/settings/theme.vue b/packages/client/src/pages/settings/theme.vue index cc869699a6..6571a881a9 100644 --- a/packages/client/src/pages/settings/theme.vue +++ b/packages/client/src/pages/settings/theme.vue @@ -72,7 +72,7 @@ import FormSwitch from '@/components/form/switch.vue'; import FormSelect from '@/components/form/select.vue'; import FormSection from '@/components/form/section.vue'; import FormLink from '@/components/form/link.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import { getBuiltinThemesRef } from '@/scripts/theme'; import { selectFile } from '@/scripts/select-file'; import { isDeviceDarkmode } from '@/scripts/is-device-darkmode'; diff --git a/packages/client/src/pages/settings/webhook.edit.vue b/packages/client/src/pages/settings/webhook.edit.vue index e36e1d7540..35f3cb1dab 100644 --- a/packages/client/src/pages/settings/webhook.edit.vue +++ b/packages/client/src/pages/settings/webhook.edit.vue @@ -38,7 +38,7 @@ import { } from 'vue'; import FormInput from '@/components/form/input.vue'; import FormSection from '@/components/form/section.vue'; import FormSwitch from '@/components/form/switch.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/settings/webhook.new.vue b/packages/client/src/pages/settings/webhook.new.vue index fa96c5fa4b..fcf1329ff6 100644 --- a/packages/client/src/pages/settings/webhook.new.vue +++ b/packages/client/src/pages/settings/webhook.new.vue @@ -36,7 +36,7 @@ import { } from 'vue'; import FormInput from '@/components/form/input.vue'; import FormSection from '@/components/form/section.vue'; import FormSwitch from '@/components/form/switch.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/pages/settings/webhook.vue b/packages/client/src/pages/settings/webhook.vue index 868d273ce4..1a7e73940c 100644 --- a/packages/client/src/pages/settings/webhook.vue +++ b/packages/client/src/pages/settings/webhook.vue @@ -29,7 +29,7 @@ <script lang="ts" setup> import { } from 'vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import FormSection from '@/components/form/section.vue'; import FormLink from '@/components/form/link.vue'; import { userPage } from '@/filters/user'; diff --git a/packages/client/src/pages/settings/word-mute.vue b/packages/client/src/pages/settings/word-mute.vue index daa2a4804b..e297379568 100644 --- a/packages/client/src/pages/settings/word-mute.vue +++ b/packages/client/src/pages/settings/word-mute.vue @@ -32,8 +32,8 @@ import { ref, watch } from 'vue'; import FormTextarea from '@/components/form/textarea.vue'; import MkKeyValue from '@/components/MkKeyValue.vue'; -import MkButton from '@/components/ui/button.vue'; -import MkInfo from '@/components/ui/info.vue'; +import MkButton from '@/components/MkButton.vue'; +import MkInfo from '@/components/MkInfo.vue'; import MkTab from '@/components/MkTab.vue'; import * as os from '@/os'; import number from '@/filters/number'; diff --git a/packages/client/src/pages/share.vue b/packages/client/src/pages/share.vue index d41a701a70..69d22ed632 100644 --- a/packages/client/src/pages/share.vue +++ b/packages/client/src/pages/share.vue @@ -28,7 +28,7 @@ import { } from 'vue'; import { noteVisibilities } from 'misskey-js'; import * as Acct from 'misskey-js/built/acct'; import * as Misskey from 'misskey-js'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import XPostForm from '@/components/MkPostForm.vue'; import * as os from '@/os'; import { mainRouter } from '@/router'; diff --git a/packages/client/src/pages/theme-editor.vue b/packages/client/src/pages/theme-editor.vue index 548e60614b..7dfeee16ed 100644 --- a/packages/client/src/pages/theme-editor.vue +++ b/packages/client/src/pages/theme-editor.vue @@ -74,7 +74,7 @@ import tinycolor from 'tinycolor2'; import { v4 as uuid } from 'uuid'; import JSON5 from 'json5'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import FormTextarea from '@/components/form/textarea.vue'; import FormFolder from '@/components/form/folder.vue'; diff --git a/packages/client/src/pages/timeline.tutorial.vue b/packages/client/src/pages/timeline.tutorial.vue index f69bf58100..7f08ccc2a1 100644 --- a/packages/client/src/pages/timeline.tutorial.vue +++ b/packages/client/src/pages/timeline.tutorial.vue @@ -67,7 +67,7 @@ <script lang="ts" setup> import { computed } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { defaultStore } from '@/store'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/user-info.vue b/packages/client/src/pages/user-info.vue index 316a3975c0..d376f11c58 100644 --- a/packages/client/src/pages/user-info.vue +++ b/packages/client/src/pages/user-info.vue @@ -160,7 +160,7 @@ import FormTextarea from '@/components/form/textarea.vue'; import FormSwitch from '@/components/form/switch.vue'; import FormLink from '@/components/form/link.vue'; import FormSection from '@/components/form/section.vue'; -import FormButton from '@/components/ui/button.vue'; +import FormButton from '@/components/MkButton.vue'; import FormInput from '@/components/form/input.vue'; import FormSplit from '@/components/form/split.vue'; import FormFolder from '@/components/form/folder.vue'; @@ -168,7 +168,7 @@ import MkKeyValue from '@/components/MkKeyValue.vue'; import MkSelect from '@/components/form/select.vue'; import FormSuspense from '@/components/form/suspense.vue'; import MkFileListForAdmin from '@/components/MkFileListForAdmin.vue'; -import MkInfo from '@/components/ui/info.vue'; +import MkInfo from '@/components/MkInfo.vue'; import * as os from '@/os'; import number from '@/filters/number'; import bytes from '@/filters/bytes'; diff --git a/packages/client/src/pages/user/clips.vue b/packages/client/src/pages/user/clips.vue index f3fafc6934..50a5d4b818 100644 --- a/packages/client/src/pages/user/clips.vue +++ b/packages/client/src/pages/user/clips.vue @@ -12,7 +12,7 @@ <script lang="ts" setup> import { computed } from 'vue'; import * as misskey from 'misskey-js'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; const props = defineProps<{ user: misskey.entities.User; diff --git a/packages/client/src/pages/user/follow-list.vue b/packages/client/src/pages/user/follow-list.vue index 6ee395f28b..d42acd838f 100644 --- a/packages/client/src/pages/user/follow-list.vue +++ b/packages/client/src/pages/user/follow-list.vue @@ -12,7 +12,7 @@ import { computed } from 'vue'; import * as misskey from 'misskey-js'; import MkUserInfo from '@/components/MkUserInfo.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; const props = defineProps<{ user: misskey.entities.User; diff --git a/packages/client/src/pages/user/gallery.vue b/packages/client/src/pages/user/gallery.vue index 786268497e..3b6768e64a 100644 --- a/packages/client/src/pages/user/gallery.vue +++ b/packages/client/src/pages/user/gallery.vue @@ -12,7 +12,7 @@ import { computed } from 'vue'; import * as misskey from 'misskey-js'; import MkGalleryPostPreview from '@/components/MkGalleryPostPreview.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; const props = withDefaults(defineProps<{ user: misskey.entities.User; diff --git a/packages/client/src/pages/user/home.vue b/packages/client/src/pages/user/home.vue index 7ab363efee..352db4616e 100644 --- a/packages/client/src/pages/user/home.vue +++ b/packages/client/src/pages/user/home.vue @@ -114,11 +114,11 @@ import * as misskey from 'misskey-js'; import XUserTimeline from './index.timeline.vue'; import XNote from '@/components/MkNote.vue'; import MkFollowButton from '@/components/MkFollowButton.vue'; -import MkContainer from '@/components/ui/container.vue'; -import MkFolder from '@/components/ui/folder.vue'; +import MkContainer from '@/components/MkContainer.vue'; +import MkFolder from '@/components/MkFolder.vue'; import MkRemoteCaution from '@/components/MkRemoteCaution.vue'; import MkTab from '@/components/MkTab.vue'; -import MkInfo from '@/components/ui/info.vue'; +import MkInfo from '@/components/MkInfo.vue'; import { getScrollPosition } from '@/scripts/scroll'; import { getUserMenu } from '@/scripts/get-user-menu'; import number from '@/filters/number'; diff --git a/packages/client/src/pages/user/index.activity.vue b/packages/client/src/pages/user/index.activity.vue index 30e5a56f39..43c2ed8b04 100644 --- a/packages/client/src/pages/user/index.activity.vue +++ b/packages/client/src/pages/user/index.activity.vue @@ -16,7 +16,7 @@ <script lang="ts" setup> import { } from 'vue'; import * as misskey from 'misskey-js'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import MkChart from '@/components/MkChart.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/pages/user/index.photos.vue b/packages/client/src/pages/user/index.photos.vue index df733849fd..5c9a73dcb7 100644 --- a/packages/client/src/pages/user/index.photos.vue +++ b/packages/client/src/pages/user/index.photos.vue @@ -24,7 +24,7 @@ import * as misskey from 'misskey-js'; import { getStaticImageUrl } from '@/scripts/get-static-image-url'; import { notePage } from '@/filters/note'; import * as os from '@/os'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import ImgWithBlurhash from '@/components/MkImgWithBlurhash.vue'; import { defaultStore } from '@/store'; diff --git a/packages/client/src/pages/user/pages.vue b/packages/client/src/pages/user/pages.vue index 69bf926ebe..bd16c46681 100644 --- a/packages/client/src/pages/user/pages.vue +++ b/packages/client/src/pages/user/pages.vue @@ -10,7 +10,7 @@ import { computed } from 'vue'; import * as misskey from 'misskey-js'; import MkPagePreview from '@/components/MkPagePreview.vue'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; const props = defineProps<{ user: misskey.entities.User; diff --git a/packages/client/src/pages/user/reactions.vue b/packages/client/src/pages/user/reactions.vue index f1e8f61b08..7e84e100a4 100644 --- a/packages/client/src/pages/user/reactions.vue +++ b/packages/client/src/pages/user/reactions.vue @@ -16,7 +16,7 @@ <script lang="ts" setup> import { computed } from 'vue'; import * as misskey from 'misskey-js'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import MkNote from '@/components/MkNote.vue'; import MkReactionIcon from '@/components/MkReactionIcon.vue'; diff --git a/packages/client/src/pages/welcome.entrance.a.vue b/packages/client/src/pages/welcome.entrance.a.vue index 6452280f5b..827162a0c0 100644 --- a/packages/client/src/pages/welcome.entrance.a.vue +++ b/packages/client/src/pages/welcome.entrance.a.vue @@ -52,7 +52,7 @@ import XTimeline from './welcome.timeline.vue'; import MarqueeText from '@/components/MkMarquee.vue'; import XSigninDialog from '@/components/MkSigninDialog.vue'; import XSignupDialog from '@/components/MkSignupDialog.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import XNote from '@/components/MkNote.vue'; import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue'; import { host, instanceName } from '@/config'; diff --git a/packages/client/src/pages/welcome.entrance.b.vue b/packages/client/src/pages/welcome.entrance.b.vue index 46cf8c2289..4bf117590a 100644 --- a/packages/client/src/pages/welcome.entrance.b.vue +++ b/packages/client/src/pages/welcome.entrance.b.vue @@ -40,7 +40,7 @@ import { defineComponent } from 'vue'; import { toUnicode } from 'punycode/'; import XSigninDialog from '@/components/MkSigninDialog.vue'; import XSignupDialog from '@/components/MkSignupDialog.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import XNote from '@/components/MkNote.vue'; import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue'; import XTimeline from './welcome.timeline.vue'; diff --git a/packages/client/src/pages/welcome.entrance.c.vue b/packages/client/src/pages/welcome.entrance.c.vue index 6422d29234..a590834a4c 100644 --- a/packages/client/src/pages/welcome.entrance.c.vue +++ b/packages/client/src/pages/welcome.entrance.c.vue @@ -60,7 +60,7 @@ import { defineComponent } from 'vue'; import { toUnicode } from 'punycode/'; import XSigninDialog from '@/components/MkSigninDialog.vue'; import XSignupDialog from '@/components/MkSignupDialog.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import XNote from '@/components/MkNote.vue'; import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue'; import XTimeline from './welcome.timeline.vue'; diff --git a/packages/client/src/pages/welcome.setup.vue b/packages/client/src/pages/welcome.setup.vue index eb6e29eb7f..d25651e2a3 100644 --- a/packages/client/src/pages/welcome.setup.vue +++ b/packages/client/src/pages/welcome.setup.vue @@ -23,7 +23,7 @@ <script lang="ts" setup> import { } from 'vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import MkInput from '@/components/form/input.vue'; import { host } from '@/config'; import * as os from '@/os'; diff --git a/packages/client/src/ui/classic.header.vue b/packages/client/src/ui/classic.header.vue index 34248486ce..306d32c597 100644 --- a/packages/client/src/ui/classic.header.vue +++ b/packages/client/src/ui/classic.header.vue @@ -45,7 +45,7 @@ import { search } from '@/scripts/search'; import * as os from '@/os'; import { navbarItemDef } from '@/navbar'; import { openAccountMenu } from '@/account'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; export default defineComponent({ components: { diff --git a/packages/client/src/ui/classic.sidebar.vue b/packages/client/src/ui/classic.sidebar.vue index 3d15f5fcb0..7479c1c9c6 100644 --- a/packages/client/src/ui/classic.sidebar.vue +++ b/packages/client/src/ui/classic.sidebar.vue @@ -47,7 +47,7 @@ import { search } from '@/scripts/search'; import * as os from '@/os'; import { navbarItemDef } from '@/navbar'; import { openAccountMenu } from '@/account'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { StickySidebar } from '@/scripts/sticky-sidebar'; //import MisskeyLogo from '@assets/client/misskey.svg'; diff --git a/packages/client/src/ui/deck.vue b/packages/client/src/ui/deck.vue index f8263b1b9e..3c0c2a44b6 100644 --- a/packages/client/src/ui/deck.vue +++ b/packages/client/src/ui/deck.vue @@ -79,7 +79,7 @@ import { deckStore, addColumn as addColumnToStore, loadDeck, getProfiles, delete import DeckColumnCore from '@/ui/deck/column-core.vue'; import XSidebar from '@/ui/_common_/navbar.vue'; import XDrawerMenu from '@/ui/_common_/navbar-for-mobile.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { getScrollContainer } from '@/scripts/scroll'; import * as os from '@/os'; import { navbarItemDef } from '@/navbar'; diff --git a/packages/client/src/ui/visitor/a.vue b/packages/client/src/ui/visitor/a.vue index 2473af549a..f8db7a9d09 100644 --- a/packages/client/src/ui/visitor/a.vue +++ b/packages/client/src/ui/visitor/a.vue @@ -42,8 +42,8 @@ import XHeader from './header.vue'; import { host, instanceName } from '@/config'; import { search } from '@/scripts/search'; import * as os from '@/os'; -import MkPagination from '@/components/ui/pagination.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkPagination from '@/components/MkPagination.vue'; +import MkButton from '@/components/MkButton.vue'; import { ColdDeviceStorage } from '@/store'; import { mainRouter } from '@/router'; diff --git a/packages/client/src/ui/visitor/b.vue b/packages/client/src/ui/visitor/b.vue index 07f105374d..3c308cfe5b 100644 --- a/packages/client/src/ui/visitor/b.vue +++ b/packages/client/src/ui/visitor/b.vue @@ -52,10 +52,10 @@ import XKanban from './kanban.vue'; import { host, instanceName } from '@/config'; import { search } from '@/scripts/search'; import * as os from '@/os'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import XSigninDialog from '@/components/MkSigninDialog.vue'; import XSignupDialog from '@/components/MkSignupDialog.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; import { ColdDeviceStorage, defaultStore } from '@/store'; import { mainRouter } from '@/router'; import { PageMetadata, provideMetadataReceiver, setPageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/client/src/ui/visitor/kanban.vue b/packages/client/src/ui/visitor/kanban.vue index 30c2fbc6c7..51e47f277d 100644 --- a/packages/client/src/ui/visitor/kanban.vue +++ b/packages/client/src/ui/visitor/kanban.vue @@ -41,10 +41,10 @@ import { defineComponent, defineAsyncComponent } from 'vue'; import { host, instanceName } from '@/config'; import * as os from '@/os'; -import MkPagination from '@/components/ui/pagination.vue'; +import MkPagination from '@/components/MkPagination.vue'; import XSigninDialog from '@/components/MkSigninDialog.vue'; import XSignupDialog from '@/components/MkSignupDialog.vue'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; export default defineComponent({ components: { @@ -93,16 +93,16 @@ export default defineComponent({ methods: { signin() { os.popup(XSigninDialog, { - autoSet: true + autoSet: true, }, {}, 'closed'); }, signup() { os.popup(XSignupDialog, { - autoSet: true + autoSet: true, }, {}, 'closed'); - } - } + }, + }, }); </script> diff --git a/packages/client/src/widgets/activity.vue b/packages/client/src/widgets/activity.vue index 97e354e1bb..acca21bff6 100644 --- a/packages/client/src/widgets/activity.vue +++ b/packages/client/src/widgets/activity.vue @@ -20,7 +20,7 @@ import XCalendar from './activity.calendar.vue'; import XChart from './activity.chart.vue'; import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import { $i } from '@/account'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/widgets/aiscript.vue b/packages/client/src/widgets/aiscript.vue index 6ae1a9877b..cb6d29cd99 100644 --- a/packages/client/src/widgets/aiscript.vue +++ b/packages/client/src/widgets/aiscript.vue @@ -18,7 +18,7 @@ import { AiScript, parse, utils } from '@syuilo/aiscript'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import { createAiScriptEnv } from '@/scripts/aiscript/api'; import { $i } from '@/account'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/widgets/button.vue b/packages/client/src/widgets/button.vue index ee4e9c6423..f0148d7f4e 100644 --- a/packages/client/src/widgets/button.vue +++ b/packages/client/src/widgets/button.vue @@ -8,13 +8,13 @@ <script lang="ts" setup> import { onMounted, onUnmounted, ref, watch } from 'vue'; -import { GetFormResultType } from '@/scripts/form'; +import { AiScript, parse, utils } from '@syuilo/aiscript'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; +import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; -import { AiScript, parse, utils } from '@syuilo/aiscript'; import { createAiScriptEnv } from '@/scripts/aiscript/api'; import { $i } from '@/account'; -import MkButton from '@/components/ui/button.vue'; +import MkButton from '@/components/MkButton.vue'; const name = 'button'; @@ -67,7 +67,7 @@ const run = async () => { }, log: (type, params) => { // nop - } + }, }); let ast; diff --git a/packages/client/src/widgets/clock.vue b/packages/client/src/widgets/clock.vue index 51d48b30a6..dc99b6631e 100644 --- a/packages/client/src/widgets/clock.vue +++ b/packages/client/src/widgets/clock.vue @@ -21,7 +21,7 @@ import { } from 'vue'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; import { GetFormResultType } from '@/scripts/form'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import MkAnalogClock from '@/components/MkAnalogClock.vue'; import MkDigitalClock from '@/components/MkDigitalClock.vue'; import { timezones } from '@/scripts/timezones'; diff --git a/packages/client/src/widgets/federation.vue b/packages/client/src/widgets/federation.vue index ec46a0ccb5..e07cab5bfa 100644 --- a/packages/client/src/widgets/federation.vue +++ b/packages/client/src/widgets/federation.vue @@ -22,7 +22,7 @@ import { onMounted, onUnmounted, ref } from 'vue'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; import { GetFormResultType } from '@/scripts/form'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import MkMiniChart from '@/components/MkMiniChart.vue'; import * as os from '@/os'; import { useInterval } from '@/scripts/use-interval'; diff --git a/packages/client/src/widgets/instance-cloud.vue b/packages/client/src/widgets/instance-cloud.vue index 03fda4c74a..f8e463ee33 100644 --- a/packages/client/src/widgets/instance-cloud.vue +++ b/packages/client/src/widgets/instance-cloud.vue @@ -16,7 +16,7 @@ import { } from 'vue'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; import { GetFormResultType } from '@/scripts/form'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import MkTagCloud from '@/components/MkTagCloud.vue'; import * as os from '@/os'; import { useInterval } from '@/scripts/use-interval'; diff --git a/packages/client/src/widgets/memo.vue b/packages/client/src/widgets/memo.vue index 14cc2a4e4a..92c4168fff 100644 --- a/packages/client/src/widgets/memo.vue +++ b/packages/client/src/widgets/memo.vue @@ -14,7 +14,7 @@ import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import { defaultStore } from '@/store'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/widgets/notifications.vue b/packages/client/src/widgets/notifications.vue index a46b7e7397..2729c310a0 100644 --- a/packages/client/src/widgets/notifications.vue +++ b/packages/client/src/widgets/notifications.vue @@ -13,7 +13,7 @@ import { defineAsyncComponent } from 'vue'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; import { GetFormResultType } from '@/scripts/form'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import XNotifications from '@/components/MkNotifications.vue'; import * as os from '@/os'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/widgets/photos.vue b/packages/client/src/widgets/photos.vue index 41bec5dc56..e891bd6a7d 100644 --- a/packages/client/src/widgets/photos.vue +++ b/packages/client/src/widgets/photos.vue @@ -22,7 +22,7 @@ import { GetFormResultType } from '@/scripts/form'; import { stream } from '@/stream'; import { getStaticImageUrl } from '@/scripts/get-static-image-url'; import * as os from '@/os'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import { defaultStore } from '@/store'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/widgets/rss-ticker.vue b/packages/client/src/widgets/rss-ticker.vue index 6e5924b6be..58c16983c8 100644 --- a/packages/client/src/widgets/rss-ticker.vue +++ b/packages/client/src/widgets/rss-ticker.vue @@ -24,7 +24,7 @@ import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExp import MarqueeText from '@/components/MkMarquee.vue'; import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import { useInterval } from '@/scripts/use-interval'; import { shuffle } from '@/scripts/shuffle'; diff --git a/packages/client/src/widgets/rss.vue b/packages/client/src/widgets/rss.vue index 72f6249820..3258b6c028 100644 --- a/packages/client/src/widgets/rss.vue +++ b/packages/client/src/widgets/rss.vue @@ -17,7 +17,7 @@ import { onMounted, onUnmounted, ref, watch } from 'vue'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import { useInterval } from '@/scripts/use-interval'; const name = 'rss'; diff --git a/packages/client/src/widgets/server-metric/index.vue b/packages/client/src/widgets/server-metric/index.vue index 3350620ad8..cf4accfa2c 100644 --- a/packages/client/src/widgets/server-metric/index.vue +++ b/packages/client/src/widgets/server-metric/index.vue @@ -21,7 +21,7 @@ import XNet from './net.vue'; import XCpu from './cpu.vue'; import XMemory from './mem.vue'; import XDisk from './disk.vue'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import { GetFormResultType } from '@/scripts/form'; import * as os from '@/os'; import { stream } from '@/stream'; diff --git a/packages/client/src/widgets/timeline.vue b/packages/client/src/widgets/timeline.vue index 5042632cfc..718162667d 100644 --- a/packages/client/src/widgets/timeline.vue +++ b/packages/client/src/widgets/timeline.vue @@ -24,7 +24,7 @@ import { onMounted, onUnmounted, reactive, ref, watch } from 'vue'; import { GetFormResultType } from '@/scripts/form'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; import * as os from '@/os'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import XTimeline from '@/components/MkTimeline.vue'; import { $i } from '@/account'; import { i18n } from '@/i18n'; diff --git a/packages/client/src/widgets/trends.vue b/packages/client/src/widgets/trends.vue index 53ae4019dd..a783c04215 100644 --- a/packages/client/src/widgets/trends.vue +++ b/packages/client/src/widgets/trends.vue @@ -21,7 +21,7 @@ import { onMounted, onUnmounted, ref } from 'vue'; import { useWidgetPropsManager, Widget, WidgetComponentEmits, WidgetComponentExpose, WidgetComponentProps } from './widget'; import { GetFormResultType } from '@/scripts/form'; -import MkContainer from '@/components/ui/container.vue'; +import MkContainer from '@/components/MkContainer.vue'; import MkMiniChart from '@/components/MkMiniChart.vue'; import * as os from '@/os'; import { useInterval } from '@/scripts/use-interval'; |