diff options
| author | syuilo <Syuilotan@yahoo.co.jp> | 2023-03-31 14:14:30 +0900 |
|---|---|---|
| committer | syuilo <Syuilotan@yahoo.co.jp> | 2023-03-31 14:14:30 +0900 |
| commit | f0a70a70c3aa14e989706cf686c438b4b180475b (patch) | |
| tree | 636b52036a3e57c9dfc9a17adf77596e97cdc082 | |
| parent | feat: チャンネルをお気に入りに登録できるように (diff) | |
| download | misskey-f0a70a70c3aa14e989706cf686c438b4b180475b.tar.gz misskey-f0a70a70c3aa14e989706cf686c438b4b180475b.tar.bz2 misskey-f0a70a70c3aa14e989706cf686c438b4b180475b.zip | |
refactor
| -rw-r--r-- | packages/frontend/src/components/MkNotes.vue | 4 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkNotifications.vue | 4 | ||||
| -rw-r--r-- | packages/frontend/src/components/MkPostForm.vue | 4 | ||||
| -rw-r--r-- | packages/frontend/src/components/page/page.note.vue | 12 | ||||
| -rw-r--r-- | packages/frontend/src/pages/favorites.vue | 4 | ||||
| -rw-r--r-- | packages/frontend/src/pages/note.vue | 4 | ||||
| -rw-r--r-- | packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue | 8 | ||||
| -rw-r--r-- | packages/frontend/src/pages/user/home.vue | 4 | ||||
| -rw-r--r-- | packages/frontend/src/pages/welcome.entrance.b.vue | 8 | ||||
| -rw-r--r-- | packages/frontend/src/pages/welcome.entrance.c.vue | 4 |
10 files changed, 28 insertions, 28 deletions
diff --git a/packages/frontend/src/components/MkNotes.vue b/packages/frontend/src/components/MkNotes.vue index f9952e4245..a4e949c898 100644 --- a/packages/frontend/src/components/MkNotes.vue +++ b/packages/frontend/src/components/MkNotes.vue @@ -19,7 +19,7 @@ :ad="true" :class="$style.notes" > - <XNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note"/> + <MkNote :key="note._featuredId_ || note._prId_ || note.id" :class="$style.note" :note="note"/> </MkDateSeparatedList> </div> </template> @@ -28,7 +28,7 @@ <script lang="ts" setup> import { shallowRef } from 'vue'; -import XNote from '@/components/MkNote.vue'; +import MkNote from '@/components/MkNote.vue'; import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue'; import MkPagination, { Paging } from '@/components/MkPagination.vue'; import { i18n } from '@/i18n'; diff --git a/packages/frontend/src/components/MkNotifications.vue b/packages/frontend/src/components/MkNotifications.vue index 93b1c37055..874f1f90ea 100644 --- a/packages/frontend/src/components/MkNotifications.vue +++ b/packages/frontend/src/components/MkNotifications.vue @@ -9,7 +9,7 @@ <template #default="{ items: notifications }"> <MkDateSeparatedList v-slot="{ item: notification }" :class="$style.list" :items="notifications" :no-gap="true"> - <XNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="notification.id" :note="notification.note"/> + <MkNote v-if="['reply', 'quote', 'mention'].includes(notification.type)" :key="notification.id" :note="notification.note"/> <XNotification v-else :key="notification.id" :notification="notification" :with-time="true" :full="true" class="_panel notification"/> </MkDateSeparatedList> </template> @@ -21,7 +21,7 @@ import { onUnmounted, onMounted, computed, shallowRef } from 'vue'; import MkPagination, { Paging } from '@/components/MkPagination.vue'; import XNotification from '@/components/MkNotification.vue'; import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue'; -import XNote from '@/components/MkNote.vue'; +import MkNote from '@/components/MkNote.vue'; import { stream } from '@/stream'; import { $i } from '@/account'; import { i18n } from '@/i18n'; diff --git a/packages/frontend/src/components/MkPostForm.vue b/packages/frontend/src/components/MkPostForm.vue index b1800f3af7..a3f2c39d81 100644 --- a/packages/frontend/src/components/MkPostForm.vue +++ b/packages/frontend/src/components/MkPostForm.vue @@ -52,7 +52,7 @@ <input v-show="withHashtags" ref="hashtagsInputEl" v-model="hashtags" :class="$style.hashtags" :placeholder="i18n.ts.hashtags" list="hashtags"> <XPostFormAttaches v-model="files" :class="$style.attaches" @detach="detachFile" @change-sensitive="updateFileSensitive" @change-name="updateFileName"/> <MkPollEditor v-if="poll" v-model="poll" @destroyed="poll = null"/> - <XNotePreview v-if="showPreview" :class="$style.preview" :text="text"/> + <MkNotePreview v-if="showPreview" :class="$style.preview" :text="text"/> <div v-if="showingOptions" style="padding: 0 16px;"> <MkSelect v-model="reactionAcceptance" small> <template #label>{{ i18n.ts.reactionAcceptance }}</template> @@ -87,7 +87,7 @@ import { toASCII } from 'punycode/'; import * as Acct from 'misskey-js/built/acct'; import MkSelect from './MkSelect.vue'; import MkNoteSimple from '@/components/MkNoteSimple.vue'; -import XNotePreview from '@/components/MkNotePreview.vue'; +import MkNotePreview from '@/components/MkNotePreview.vue'; import XPostFormAttaches from '@/components/MkPostFormAttaches.vue'; import MkPollEditor from '@/components/MkPollEditor.vue'; import { host, url } from '@/config'; diff --git a/packages/frontend/src/components/page/page.note.vue b/packages/frontend/src/components/page/page.note.vue index 7d5c484a1b..8c65dabf08 100644 --- a/packages/frontend/src/components/page/page.note.vue +++ b/packages/frontend/src/components/page/page.note.vue @@ -1,21 +1,21 @@ <template> <div class="voxdxuby"> - <XNote v-if="note && !block.detailed" :key="note.id + ':normal'" v-model:note="note"/> - <XNoteDetailed v-if="note && block.detailed" :key="note.id + ':detail'" v-model:note="note"/> + <MkNote v-if="note && !block.detailed" :key="note.id + ':normal'" v-model:note="note"/> + <MkNoteDetailed v-if="note && block.detailed" :key="note.id + ':detail'" v-model:note="note"/> </div> </template> <script lang="ts"> import { defineComponent, onMounted, PropType, Ref, ref } from 'vue'; -import XNote from '@/components/MkNote.vue'; -import XNoteDetailed from '@/components/MkNoteDetailed.vue'; +import MkNote from '@/components/MkNote.vue'; +import MkNoteDetailed from '@/components/MkNoteDetailed.vue'; import * as os from '@/os'; import { NoteBlock } from '@/scripts/hpml/block'; export default defineComponent({ components: { - XNote, - XNoteDetailed, + MkNote, + MkNoteDetailed, }, props: { block: { diff --git a/packages/frontend/src/pages/favorites.vue b/packages/frontend/src/pages/favorites.vue index 07dd768499..0dc9b9dc8f 100644 --- a/packages/frontend/src/pages/favorites.vue +++ b/packages/frontend/src/pages/favorites.vue @@ -12,7 +12,7 @@ <template #default="{ items }"> <MkDateSeparatedList v-slot="{ item }" :items="items" :direction="'down'" :no-gap="false" :ad="false"> - <XNote :key="item.id" :note="item.note" :class="$style.note"/> + <MkNote :key="item.id" :note="item.note" :class="$style.note"/> </MkDateSeparatedList> </template> </MkPagination> @@ -22,7 +22,7 @@ <script lang="ts" setup> import MkPagination from '@/components/MkPagination.vue'; -import XNote from '@/components/MkNote.vue'; +import MkNote from '@/components/MkNote.vue'; import MkDateSeparatedList from '@/components/MkDateSeparatedList.vue'; import { i18n } from '@/i18n'; import { definePageMetadata } from '@/scripts/page-metadata'; diff --git a/packages/frontend/src/pages/note.vue b/packages/frontend/src/pages/note.vue index 45efe655fb..3e5e1ffe9d 100644 --- a/packages/frontend/src/pages/note.vue +++ b/packages/frontend/src/pages/note.vue @@ -13,7 +13,7 @@ <MkButton v-if="!showNext && hasNext" class="load next" @click="showNext = true"><i class="ti ti-chevron-up"></i></MkButton> <div class="note _margin _gaps_s"> <MkRemoteCaution v-if="note.user.host != null" :href="note.url ?? note.uri"/> - <XNoteDetailed :key="note.id" v-model:note="note" class="note"/> + <MkNoteDetailed :key="note.id" v-model:note="note" class="note"/> </div> <div v-if="clips && clips.length > 0" class="clips _margin"> <div class="title">{{ i18n.ts.clip }}</div> @@ -41,7 +41,7 @@ <script lang="ts" setup> import { computed, watch } from 'vue'; import * as misskey from 'misskey-js'; -import XNoteDetailed from '@/components/MkNoteDetailed.vue'; +import MkNoteDetailed from '@/components/MkNoteDetailed.vue'; import MkNotes from '@/components/MkNotes.vue'; import MkRemoteCaution from '@/components/MkRemoteCaution.vue'; import MkButton from '@/components/MkButton.vue'; diff --git a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue index d8a7eb85aa..cc39d2c412 100644 --- a/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue +++ b/packages/frontend/src/pages/page-editor/els/page-editor.el.note.vue @@ -10,8 +10,8 @@ </MkInput> <MkSwitch v-model="props.modelValue.detailed"><span>{{ $ts._pages.blocks._note.detailed }}</span></MkSwitch> - <XNote v-if="note && !props.modelValue.detailed" :key="note.id + ':normal'" v-model:note="note" style="margin-bottom: 16px;"/> - <XNoteDetailed v-if="note && props.modelValue.detailed" :key="note.id + ':detail'" v-model:note="note" style="margin-bottom: 16px;"/> + <MkNote v-if="note && !props.modelValue.detailed" :key="note.id + ':normal'" v-model:note="note" style="margin-bottom: 16px;"/> + <MkNoteDetailed v-if="note && props.modelValue.detailed" :key="note.id + ':detail'" v-model:note="note" style="margin-bottom: 16px;"/> </section> </XContainer> </template> @@ -22,8 +22,8 @@ import { watch } from 'vue'; import XContainer from '../page-editor.container.vue'; import MkInput from '@/components/MkInput.vue'; import MkSwitch from '@/components/MkSwitch.vue'; -import XNote from '@/components/MkNote.vue'; -import XNoteDetailed from '@/components/MkNoteDetailed.vue'; +import MkNote from '@/components/MkNote.vue'; +import MkNoteDetailed from '@/components/MkNoteDetailed.vue'; import * as os from '@/os'; const props = defineProps<{ diff --git a/packages/frontend/src/pages/user/home.vue b/packages/frontend/src/pages/user/home.vue index 7efaaebf5d..c45c0600a7 100644 --- a/packages/frontend/src/pages/user/home.vue +++ b/packages/frontend/src/pages/user/home.vue @@ -93,7 +93,7 @@ <div class="contents _gaps"> <div v-if="user.pinnedNotes.length > 0" class="_gaps"> - <XNote v-for="note in user.pinnedNotes" :key="note.id" class="note _panel" :note="note" :pinned="true"/> + <MkNote v-for="note in user.pinnedNotes" :key="note.id" class="note _panel" :note="note" :pinned="true"/> </div> <MkInfo v-else-if="$i && $i.id === user.id">{{ i18n.ts.userPagePinTip }}</MkInfo> <template v-if="narrow"> @@ -115,7 +115,7 @@ import { defineAsyncComponent, computed, onMounted, onUnmounted } from 'vue'; import calcAge from 's-age'; import * as misskey from 'misskey-js'; -import XNote from '@/components/MkNote.vue'; +import MkNote from '@/components/MkNote.vue'; import MkFollowButton from '@/components/MkFollowButton.vue'; import MkRemoteCaution from '@/components/MkRemoteCaution.vue'; import MkOmit from '@/components/MkOmit.vue'; diff --git a/packages/frontend/src/pages/welcome.entrance.b.vue b/packages/frontend/src/pages/welcome.entrance.b.vue index 8230adaf1f..7c7dfcc850 100644 --- a/packages/frontend/src/pages/welcome.entrance.b.vue +++ b/packages/frontend/src/pages/welcome.entrance.b.vue @@ -38,12 +38,12 @@ <script lang="ts"> import { defineComponent } from 'vue'; import { toUnicode } from 'punycode/'; +import XTimeline from './welcome.timeline.vue'; import XSigninDialog from '@/components/MkSigninDialog.vue'; import XSignupDialog from '@/components/MkSignupDialog.vue'; import MkButton from '@/components/MkButton.vue'; -import XNote from '@/components/MkNote.vue'; +import MkNote from '@/components/MkNote.vue'; import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue'; -import XTimeline from './welcome.timeline.vue'; import { host, instanceName } from '@/config'; import * as os from '@/os'; import number from '@/filters/number'; @@ -51,7 +51,7 @@ import number from '@/filters/number'; export default defineComponent({ components: { MkButton, - XNote, + MkNote, XTimeline, MkFeaturedPhotos, }, @@ -118,7 +118,7 @@ export default defineComponent({ text: this.$ts.help, icon: 'ti ti-question-circle', action: () => { - window.open(`https://misskey-hub.net/help.md`, '_blank'); + window.open('https://misskey-hub.net/help.md', '_blank'); }, }], ev.currentTarget ?? ev.target); }, diff --git a/packages/frontend/src/pages/welcome.entrance.c.vue b/packages/frontend/src/pages/welcome.entrance.c.vue index d2d07bb1f0..f566d1a56a 100644 --- a/packages/frontend/src/pages/welcome.entrance.c.vue +++ b/packages/frontend/src/pages/welcome.entrance.c.vue @@ -61,7 +61,7 @@ import { toUnicode } from 'punycode/'; import XSigninDialog from '@/components/MkSigninDialog.vue'; import XSignupDialog from '@/components/MkSignupDialog.vue'; import MkButton from '@/components/MkButton.vue'; -import XNote from '@/components/MkNote.vue'; +import MkNote from '@/components/MkNote.vue'; import MkFeaturedPhotos from '@/components/MkFeaturedPhotos.vue'; import XTimeline from './welcome.timeline.vue'; import { host, instanceName } from '@/config'; @@ -71,7 +71,7 @@ import number from '@/filters/number'; export default defineComponent({ components: { MkButton, - XNote, + MkNote, MkFeaturedPhotos, XTimeline, }, |