wip
This commit is contained in:
		
							parent
							
								
									39f718c510
								
							
						
					
					
						commit
						69edb20465
					
				|  | @ -40,7 +40,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 			<MkStreamingNotesTimeline :key="channelId" src="channel" :channel="channelId"/> | ||||
| 		</div> | ||||
| 		<div v-else-if="tab === 'featured'"> | ||||
| 			<MkNotes :pagination="featuredPagination"/> | ||||
| 			<MkNotesTimeline :pagination="featuredPagination"/> | ||||
| 		</div> | ||||
| 		<div v-else-if="tab === 'search'"> | ||||
| 			<div v-if="notesSearchAvailable" class="_gaps"> | ||||
|  | @ -50,7 +50,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 					</MkInput> | ||||
| 					<MkButton primary rounded style="margin-top: 8px;" @click="search()">{{ i18n.ts.search }}</MkButton> | ||||
| 				</div> | ||||
| 				<MkNotes v-if="searchPagination" :key="searchKey" :pagination="searchPagination"/> | ||||
| 				<MkNotesTimeline v-if="searchPagination" :key="searchKey" :pagination="searchPagination"/> | ||||
| 			</div> | ||||
| 			<div v-else> | ||||
| 				<MkInfo warn>{{ i18n.ts.notesSearchNotAvailable }}</MkInfo> | ||||
|  | @ -84,7 +84,7 @@ import { $i, iAmModerator } from '@/i.js'; | |||
| import { i18n } from '@/i18n.js'; | ||||
| import { definePage } from '@/page.js'; | ||||
| import { deviceKind } from '@/utility/device-kind.js'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| import { favoritedChannelsCache } from '@/cache.js'; | ||||
| import MkButton from '@/components/MkButton.vue'; | ||||
| import MkInput from '@/components/MkInput.vue'; | ||||
|  |  | |||
|  | @ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 				</div> | ||||
| 			</div> | ||||
| 
 | ||||
| 			<MkNotes :pagination="pagination" :detail="true"/> | ||||
| 			<MkNotesTimeline :pagination="pagination" :detail="true"/> | ||||
| 		</div> | ||||
| 	</div> | ||||
| </PageWithHeader> | ||||
|  | @ -34,7 +34,7 @@ import { computed, watch, provide, ref } from 'vue'; | |||
| import * as Misskey from 'misskey-js'; | ||||
| import { url } from '@@/js/config.js'; | ||||
| import type { MenuItem } from '@/types/menu.js'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| import { $i } from '@/i.js'; | ||||
| import { i18n } from '@/i18n.js'; | ||||
| import * as os from '@/os.js'; | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| <template> | ||||
| <div class="_gaps"> | ||||
| 	<MkInfo>{{ i18n.ts._fileViewer.thisPageCanBeSeenFromTheAuthor }}</MkInfo> | ||||
| 	<MkNotes ref="tlComponent" :pagination="pagination"/> | ||||
| 	<MkNotesTimeline ref="tlComponent" :pagination="pagination"/> | ||||
| </div> | ||||
| </template> | ||||
| 
 | ||||
|  | @ -15,7 +15,7 @@ import { ref, computed } from 'vue'; | |||
| import { i18n } from '@/i18n.js'; | ||||
| import type { Paging } from '@/components/MkPagination.vue'; | ||||
| import MkInfo from '@/components/MkInfo.vue'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| 
 | ||||
| const props = defineProps<{ | ||||
| 	fileId: string; | ||||
|  |  | |||
|  | @ -9,14 +9,14 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 		<option value="notes">{{ i18n.ts.notes }}</option> | ||||
| 		<option value="polls">{{ i18n.ts.poll }}</option> | ||||
| 	</MkTab> | ||||
| 	<MkNotes v-if="tab === 'notes'" :pagination="paginationForNotes"/> | ||||
| 	<MkNotes v-else-if="tab === 'polls'" :pagination="paginationForPolls"/> | ||||
| 	<MkNotesTimeline v-if="tab === 'notes'" :pagination="paginationForNotes"/> | ||||
| 	<MkNotesTimeline v-else-if="tab === 'polls'" :pagination="paginationForPolls"/> | ||||
| </div> | ||||
| </template> | ||||
| 
 | ||||
| <script lang="ts" setup> | ||||
| import { ref } from 'vue'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| import MkTab from '@/components/MkTab.vue'; | ||||
| import { i18n } from '@/i18n.js'; | ||||
| 
 | ||||
|  |  | |||
|  | @ -10,7 +10,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 			<Transition :name="prefer.s.animation ? 'fade' : ''" mode="out-in"> | ||||
| 				<div v-if="note"> | ||||
| 					<div v-if="showNext" class="_margin"> | ||||
| 						<MkNotes class="" :pagination="showNext === 'channel' ? nextChannelPagination : nextUserPagination" :noGap="true" :disableAutoLoad="true"/> | ||||
| 						<MkNotesTimeline class="" :pagination="showNext === 'channel' ? nextChannelPagination : nextUserPagination" :noGap="true" :disableAutoLoad="true"/> | ||||
| 					</div> | ||||
| 
 | ||||
| 					<div class="_margin"> | ||||
|  | @ -35,7 +35,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 					</div> | ||||
| 
 | ||||
| 					<div v-if="showPrev" class="_margin"> | ||||
| 						<MkNotes class="" :pagination="showPrev === 'channel' ? prevChannelPagination : prevUserPagination" :noGap="true"/> | ||||
| 						<MkNotesTimeline class="" :pagination="showPrev === 'channel' ? prevChannelPagination : prevUserPagination" :noGap="true"/> | ||||
| 					</div> | ||||
| 				</div> | ||||
| 				<MkError v-else-if="error" @retry="fetchNote()"/> | ||||
|  | @ -52,7 +52,7 @@ import * as Misskey from 'misskey-js'; | |||
| import { host } from '@@/js/config.js'; | ||||
| import type { Paging } from '@/components/MkPagination.vue'; | ||||
| import MkNoteDetailed from '@/components/MkNoteDetailed.vue'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| import MkRemoteCaution from '@/components/MkRemoteCaution.vue'; | ||||
| import MkButton from '@/components/MkButton.vue'; | ||||
| import { misskeyApi } from '@/utility/misskey-api.js'; | ||||
|  |  | |||
|  | @ -10,10 +10,10 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 			<XNotifications :class="$style.notifications" :excludeTypes="excludeTypes"/> | ||||
| 		</div> | ||||
| 		<div v-else-if="tab === 'mentions'"> | ||||
| 			<MkNotes :pagination="mentionsPagination"/> | ||||
| 			<MkNotesTimeline :pagination="mentionsPagination"/> | ||||
| 		</div> | ||||
| 		<div v-else-if="tab === 'directNotes'"> | ||||
| 			<MkNotes :pagination="directNotesPagination"/> | ||||
| 			<MkNotesTimeline :pagination="directNotesPagination"/> | ||||
| 		</div> | ||||
| 	</div> | ||||
| </PageWithHeader> | ||||
|  | @ -23,7 +23,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| import { computed, ref } from 'vue'; | ||||
| import { notificationTypes } from '@@/js/const.js'; | ||||
| import XNotifications from '@/components/MkNotifications.vue'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| import * as os from '@/os.js'; | ||||
| import { i18n } from '@/i18n.js'; | ||||
| import { definePage } from '@/page.js'; | ||||
|  |  | |||
|  | @ -105,7 +105,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 
 | ||||
| 	<MkFoldableSection v-if="notePagination"> | ||||
| 		<template #header>{{ i18n.ts.searchResult }}</template> | ||||
| 		<MkNotes :key="`searchNotes:${key}`" :pagination="notePagination"/> | ||||
| 		<MkNotesTimeline :key="`searchNotes:${key}`" :pagination="notePagination"/> | ||||
| 	</MkFoldableSection> | ||||
| </div> | ||||
| </template> | ||||
|  | @ -125,7 +125,7 @@ import { useRouter } from '@/router.js'; | |||
| import MkButton from '@/components/MkButton.vue'; | ||||
| import MkFoldableSection from '@/components/MkFoldableSection.vue'; | ||||
| import MkInput from '@/components/MkInput.vue'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| import MkRadios from '@/components/MkRadios.vue'; | ||||
| import MkUserCardMini from '@/components/MkUserCardMini.vue'; | ||||
| 
 | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| <template> | ||||
| <PageWithHeader :actions="headerActions" :tabs="headerTabs"> | ||||
| 	<div class="_spacer" style="--MI_SPACER-w: 800px;"> | ||||
| 		<MkNotes ref="notes" class="" :pagination="pagination"/> | ||||
| 		<MkNotesTimeline ref="notes" class="" :pagination="pagination"/> | ||||
| 	</div> | ||||
| 	<template v-if="$i" #footer> | ||||
| 		<div :class="$style.footer"> | ||||
|  | @ -20,7 +20,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 
 | ||||
| <script lang="ts" setup> | ||||
| import { computed, ref } from 'vue'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| import MkButton from '@/components/MkButton.vue'; | ||||
| import { definePage } from '@/page.js'; | ||||
| import { i18n } from '@/i18n.js'; | ||||
|  |  | |||
|  | @ -207,7 +207,7 @@ const XTimeline = defineAsyncComponent(() => import('./index.timeline.vue')); | |||
| 
 | ||||
| const props = withDefaults(defineProps<{ | ||||
| 	user: Misskey.entities.UserDetailed; | ||||
| 	/** Test only; MkNotes currently causes problems in vitest */ | ||||
| 	/** Test only; MkNotesTimeline currently causes problems in vitest */ | ||||
| 	disableNotes: boolean; | ||||
| }>(), { | ||||
| 	disableNotes: false, | ||||
|  |  | |||
|  | @ -13,14 +13,14 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| 			<option value="files">{{ i18n.ts.withFiles }}</option> | ||||
| 		</MkTab> | ||||
| 	</template> | ||||
| 	<MkNotes :noGap="true" :pagination="pagination" :class="$style.tl"/> | ||||
| 	<MkNotesTimeline :noGap="true" :pagination="pagination" :class="$style.tl"/> | ||||
| </MkStickyContainer> | ||||
| </template> | ||||
| 
 | ||||
| <script lang="ts" setup> | ||||
| import { ref, computed } from 'vue'; | ||||
| import * as Misskey from 'misskey-js'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| import MkTab from '@/components/MkTab.vue'; | ||||
| import { i18n } from '@/i18n.js'; | ||||
| 
 | ||||
|  |  | |||
|  | @ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| <XColumn :column="column" :isStacked="isStacked" :refresher="() => reloadTimeline()"> | ||||
| 	<template #header><i class="ti ti-mail" style="margin-right: 8px;"></i>{{ column.name || i18n.ts._deck._columns.direct }}</template> | ||||
| 
 | ||||
| 	<MkNotes ref="tlComponent" :pagination="pagination"/> | ||||
| 	<MkNotesTimeline ref="tlComponent" :pagination="pagination"/> | ||||
| </XColumn> | ||||
| </template> | ||||
| 
 | ||||
|  | @ -15,7 +15,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| import { ref } from 'vue'; | ||||
| import XColumn from './column.vue'; | ||||
| import type { Column } from '@/deck.js'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| import { i18n } from '@/i18n.js'; | ||||
| 
 | ||||
| defineProps<{ | ||||
|  |  | |||
|  | @ -7,7 +7,7 @@ SPDX-License-Identifier: AGPL-3.0-only | |||
| <XColumn :column="column" :isStacked="isStacked" :refresher="() => reloadTimeline()"> | ||||
| 	<template #header><i class="ti ti-at" style="margin-right: 8px;"></i>{{ column.name || i18n.ts._deck._columns.mentions }}</template> | ||||
| 
 | ||||
| 	<MkNotes ref="tlComponent" :pagination="pagination"/> | ||||
| 	<MkNotesTimeline ref="tlComponent" :pagination="pagination"/> | ||||
| </XColumn> | ||||
| </template> | ||||
| 
 | ||||
|  | @ -16,7 +16,7 @@ import { ref } from 'vue'; | |||
| import XColumn from './column.vue'; | ||||
| import type { Column } from '@/deck.js'; | ||||
| import { i18n } from '@/i18n.js'; | ||||
| import MkNotes from '@/components/MkNotes.vue'; | ||||
| import MkNotesTimeline from '@/components/MkNotesTimeline.vue'; | ||||
| 
 | ||||
| defineProps<{ | ||||
| 	column: Column; | ||||
|  |  | |||
		Loading…
	
		Reference in New Issue