diff options
Diffstat (limited to 'packages/client/src/components')
63 files changed, 67 insertions, 67 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'; |