fix: revert timelines loading optimization
parent
2e5270f453
commit
ef4a240800
5
app.vue
5
app.vue
|
@ -5,15 +5,12 @@ provideGlobalCommands()
|
|||
|
||||
// We want to trigger rerendering the page when account changes
|
||||
const key = computed(() => `${currentUser.value?.server ?? currentServer.value}:${currentUser.value?.account.id || ''}`)
|
||||
|
||||
const { params } = useRoute()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<NuxtLoadingIndicator color="repeating-linear-gradient(to right,var(--c-primary) 0%,var(--c-primary-active) 100%)" />
|
||||
<NuxtLayout :key="key">
|
||||
<!-- TODO: rework the /[account] routes to remove conditional loading -->
|
||||
<NuxtPage v-if="!params.account || isMastoInitialised" />
|
||||
<NuxtPage v-if="isMastoInitialised" />
|
||||
</NuxtLayout>
|
||||
<PWAPrompt />
|
||||
</template>
|
||||
|
|
|
@ -5,7 +5,6 @@ const { options, command, replace, preventScrollTop = false } = $defineProps<{
|
|||
options: {
|
||||
to: RouteLocationRaw
|
||||
display: string
|
||||
disabled?: boolean
|
||||
name?: string
|
||||
icon?: string
|
||||
}[]
|
||||
|
@ -29,25 +28,18 @@ useCommands(() => command
|
|||
|
||||
<template>
|
||||
<div flex w-full items-center lg:text-lg of-x-auto scrollbar-hide>
|
||||
<template
|
||||
<NuxtLink
|
||||
v-for="(option, index) in options"
|
||||
:key="option?.name || index"
|
||||
:to="option.to"
|
||||
:replace="replace"
|
||||
relative flex flex-auto cursor-pointer sm:px6 px2 rounded transition-all
|
||||
tabindex="1"
|
||||
hover:bg-active transition-100
|
||||
exact-active-class="children:(font-bold !border-primary !op100)"
|
||||
@click="!preventScrollTop && $scrollToTop()"
|
||||
>
|
||||
<NuxtLink
|
||||
v-if="!option.disabled"
|
||||
:to="option.to"
|
||||
:replace="replace"
|
||||
relative flex flex-auto cursor-pointer sm:px6 px2 rounded transition-all
|
||||
tabindex="1"
|
||||
hover:bg-active transition-100
|
||||
exact-active-class="children:(text-secondary !border-primary !op100)"
|
||||
@click="!preventScrollTop && $scrollToTop()"
|
||||
>
|
||||
<span ws-nowrap mxa sm:px2 sm:py3 py2 text-center border-b-3 text-secondary-light hover:text-secondary border-transparent>{{ option.display }}</span>
|
||||
</NuxtLink>
|
||||
<div v-else flex flex-auto sm:px6 px2>
|
||||
<span ws-nowrap mxa sm:px2 sm:py3 py2 text-center text-secondary-light op50>{{ option.display }}</span>
|
||||
</div>
|
||||
</template>
|
||||
<span ws-nowrap mxa sm:px2 sm:py3 py2 text-center border-b-3 op50 hover:op70 border-transparent>{{ option.display }}</span>
|
||||
</NuxtLink>
|
||||
</div>
|
||||
</template>
|
||||
|
|
|
@ -1,7 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
const paginator = useMasto().blocks.iterate()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<AccountPaginator :paginator="paginator" />
|
||||
</template>
|
|
@ -1,7 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
const paginator = useMasto().bookmarks.iterate()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<TimelinePaginator :paginator="paginator" />
|
||||
</template>
|
|
@ -1,7 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
const paginator = useMasto().conversations.iterate()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<ConversationPaginator :paginator="paginator" />
|
||||
</template>
|
|
@ -1,21 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
const masto = useMasto()
|
||||
const paginator = masto.domainBlocks.iterate()
|
||||
|
||||
const unblock = async (domain: string) => {
|
||||
await masto.domainBlocks.unblock(domain)
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<CommonPaginator :paginator="paginator">
|
||||
<template #default="{ item }">
|
||||
<CommonDropdownItem class="!cursor-auto">
|
||||
{{ item }}
|
||||
<template #actions>
|
||||
<div i-ri:lock-unlock-line text-primary cursor-pointer @click="unblock(item)" />
|
||||
</template>
|
||||
</CommonDropdownItem>
|
||||
</template>
|
||||
</CommonPaginator>
|
||||
</template>
|
|
@ -1,7 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
const paginator = useMasto().favourites.iterate()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<TimelinePaginator :paginator="paginator" />
|
||||
</template>
|
|
@ -1,12 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
const paginator = useMasto().timelines.iterateHome()
|
||||
const stream = await useMasto().stream.streamUser()
|
||||
onBeforeUnmount(() => stream.disconnect())
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<div>
|
||||
<PublishWidget draft-key="home" border="b base" />
|
||||
<TimelinePaginator v-bind="{ paginator, stream }" context="home" />
|
||||
</div>
|
||||
</template>
|
|
@ -1,13 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
// Default limit is 20 notifications, and servers are normally caped to 30
|
||||
const paginator = useMasto().notifications.iterate({ limit: 30, types: ['mention'] })
|
||||
|
||||
const { clearNotifications } = useNotifications()
|
||||
onActivated(clearNotifications)
|
||||
|
||||
const stream = await useMasto().stream.streamUser()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<NotificationPaginator v-bind="{ paginator, stream }" />
|
||||
</template>
|
|
@ -1,7 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
const paginator = useMasto().mutes.iterate()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<AccountPaginator :paginator="paginator" />
|
||||
</template>
|
|
@ -1,13 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
// Default limit is 20 notifications, and servers are normally caped to 30
|
||||
const paginator = useMasto().notifications.iterate({ limit: 30 })
|
||||
|
||||
const { clearNotifications } = useNotifications()
|
||||
onActivated(clearNotifications)
|
||||
|
||||
const stream = await useMasto().stream.streamUser()
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<NotificationPaginator v-bind="{ paginator, stream }" />
|
||||
</template>
|
|
@ -1,7 +0,0 @@
|
|||
<script setup lang="ts">
|
||||
const paginator = useMasto().accounts.iterateStatuses(currentUser.value!.account.id, { pinned: true })
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<TimelinePaginator :paginator="paginator" />
|
||||
</template>
|
|
@ -17,11 +17,15 @@ const tabs = $computed(() => [
|
|||
display: t('tab.news'),
|
||||
},
|
||||
// This section can only be accessed after logging in
|
||||
{
|
||||
to: `/${currentServer.value}/explore/users`,
|
||||
display: t('tab.for_you'),
|
||||
disabled: !isMastoInitialised.value || !currentUser.value,
|
||||
},
|
||||
...invoke(() => currentUser.value
|
||||
? [
|
||||
{
|
||||
to: `/${currentServer.value}/explore/users`,
|
||||
display: t('tab.for_you'),
|
||||
},
|
||||
]
|
||||
: [],
|
||||
),
|
||||
] as const)
|
||||
</script>
|
||||
|
||||
|
@ -37,6 +41,6 @@ const tabs = $computed(() => [
|
|||
<template #header>
|
||||
<CommonRouteTabs replace :options="tabs" />
|
||||
</template>
|
||||
<NuxtPage v-if="isMastoInitialised" />
|
||||
<NuxtPage />
|
||||
</MainContent>
|
||||
</template>
|
||||
|
|
|
@ -3,6 +3,8 @@ definePageMeta({
|
|||
middleware: 'auth',
|
||||
})
|
||||
|
||||
const paginator = useMasto().blocks.iterate()
|
||||
|
||||
useHeadFixed({
|
||||
title: 'Blocked users',
|
||||
})
|
||||
|
@ -13,7 +15,6 @@ useHeadFixed({
|
|||
<template #title>
|
||||
<span text-lg font-bold>{{ $t('account.blocked_users') }}</span>
|
||||
</template>
|
||||
|
||||
<TimelineBlocks v-if="isMastoInitialised" />
|
||||
<AccountPaginator :paginator="paginator" />
|
||||
</MainContent>
|
||||
</template>
|
||||
|
|
|
@ -3,6 +3,8 @@ definePageMeta({
|
|||
middleware: 'auth',
|
||||
})
|
||||
|
||||
const paginator = useMasto().bookmarks.iterate()
|
||||
|
||||
const { t } = useI18n()
|
||||
|
||||
useHeadFixed({
|
||||
|
@ -19,6 +21,8 @@ useHeadFixed({
|
|||
</NuxtLink>
|
||||
</template>
|
||||
|
||||
<TimelineBookmarks v-if="isMastoInitialised" />
|
||||
<slot>
|
||||
<TimelinePaginator :paginator="paginator" />
|
||||
</slot>
|
||||
</MainContent>
|
||||
</template>
|
||||
|
|
|
@ -3,6 +3,8 @@ definePageMeta({
|
|||
middleware: 'auth',
|
||||
})
|
||||
|
||||
const paginator = useMasto().conversations.iterate()
|
||||
|
||||
const { t } = useI18n()
|
||||
|
||||
useHeadFixed({
|
||||
|
@ -19,6 +21,8 @@ useHeadFixed({
|
|||
</NuxtLink>
|
||||
</template>
|
||||
|
||||
<TimelineConversations v-if="isMastoInitialised" />
|
||||
<slot>
|
||||
<ConversationPaginator :paginator="paginator" />
|
||||
</slot>
|
||||
</MainContent>
|
||||
</template>
|
||||
|
|
|
@ -1,13 +1,17 @@
|
|||
<script setup lang="ts">
|
||||
import TimelineDomainBlocks from '~~/components/timeline/TimelineDomainBlocks.vue'
|
||||
|
||||
definePageMeta({
|
||||
middleware: 'auth',
|
||||
})
|
||||
|
||||
const paginator = useMasto().domainBlocks.iterate()
|
||||
|
||||
useHeadFixed({
|
||||
title: 'Blocked domains',
|
||||
})
|
||||
|
||||
const unblock = async (domain: string) => {
|
||||
await useMasto().domainBlocks.unblock(domain)
|
||||
}
|
||||
</script>
|
||||
|
||||
<template>
|
||||
|
@ -16,6 +20,15 @@ useHeadFixed({
|
|||
<span text-lg font-bold>{{ $t('account.blocked_domains') }}</span>
|
||||
</template>
|
||||
|
||||
<TimelineDomainBlocks v-if="isMastoInitialised" />
|
||||
<CommonPaginator :paginator="paginator">
|
||||
<template #default="{ item }">
|
||||
<CommonDropdownItem class="!cursor-auto">
|
||||
{{ item }}
|
||||
<template #actions>
|
||||
<div i-ri:lock-unlock-line text-primary cursor-pointer @click="unblock(item)" />
|
||||
</template>
|
||||
</CommonDropdownItem>
|
||||
</template>
|
||||
</CommonPaginator>
|
||||
</MainContent>
|
||||
</template>
|
||||
|
|
|
@ -3,6 +3,7 @@ definePageMeta({
|
|||
middleware: 'auth',
|
||||
})
|
||||
|
||||
const paginator = useMasto().favourites.iterate()
|
||||
const { t } = useI18n()
|
||||
|
||||
useHeadFixed({
|
||||
|
@ -18,7 +19,8 @@ useHeadFixed({
|
|||
<span>{{ t('nav_side.favourites') }}</span>
|
||||
</NuxtLink>
|
||||
</template>
|
||||
|
||||
<TimelineFavourites v-if="isMastoInitialised" />
|
||||
<slot>
|
||||
<TimelinePaginator :paginator="paginator" />
|
||||
</slot>
|
||||
</MainContent>
|
||||
</template>
|
||||
|
|
|
@ -11,6 +11,10 @@ if (useRoute().path === '/signin/callback') {
|
|||
useRouter().push('/home')
|
||||
}
|
||||
|
||||
const paginator = useMasto().timelines.iterateHome()
|
||||
const stream = await useMasto().stream.streamUser()
|
||||
onBeforeUnmount(() => stream.disconnect())
|
||||
|
||||
const { t } = useI18n()
|
||||
useHeadFixed({
|
||||
title: () => t('nav_side.home'),
|
||||
|
@ -25,7 +29,9 @@ useHeadFixed({
|
|||
<span>{{ $t('nav_side.home') }}</span>
|
||||
</NuxtLink>
|
||||
</template>
|
||||
|
||||
<TimelineHome v-if="isMastoInitialised" />
|
||||
<slot>
|
||||
<PublishWidget draft-key="home" border="b base" />
|
||||
<TimelinePaginator v-bind="{ paginator, stream }" context="home" />
|
||||
</slot>
|
||||
</MainContent>
|
||||
</template>
|
||||
|
|
|
@ -2,6 +2,9 @@
|
|||
definePageMeta({
|
||||
middleware: 'auth',
|
||||
})
|
||||
|
||||
const paginator = useMasto().mutes.iterate()
|
||||
|
||||
useHeadFixed({
|
||||
title: 'Muted users',
|
||||
})
|
||||
|
@ -12,7 +15,6 @@ useHeadFixed({
|
|||
<template #title>
|
||||
<span text-lg font-bold>{{ $t('account.muted_users') }}</span>
|
||||
</template>
|
||||
|
||||
<TimelineMutes v-if="isMastoInitialised" />
|
||||
<AccountPaginator :paginator="paginator" />
|
||||
</MainContent>
|
||||
</template>
|
||||
|
|
|
@ -53,7 +53,6 @@ onActivated(() => {
|
|||
<template v-if="pwaEnabled">
|
||||
<NotificationPreferences :show="showSettings" />
|
||||
</template>
|
||||
|
||||
<NuxtPage />
|
||||
</slot>
|
||||
</MainContent>
|
||||
|
|
|
@ -1,10 +1,19 @@
|
|||
<script setup lang="ts">
|
||||
const { t } = useI18n()
|
||||
|
||||
// Default limit is 20 notifications, and servers are normally caped to 30
|
||||
const paginator = useMasto().notifications.iterate({ limit: 30 })
|
||||
|
||||
const { clearNotifications } = useNotifications()
|
||||
onActivated(clearNotifications)
|
||||
|
||||
const stream = await useMasto().stream.streamUser()
|
||||
|
||||
useHeadFixed({
|
||||
title: () => `${t('tab.notifications_all')} | ${t('nav_side.notifications')}`,
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<TimelineNotifications v-if="isMastoInitialised" />
|
||||
<NotificationPaginator v-bind="{ paginator, stream }" />
|
||||
</template>
|
||||
|
|
|
@ -1,10 +1,19 @@
|
|||
<script setup lang="ts">
|
||||
const { t } = useI18n()
|
||||
|
||||
// Default limit is 20 notifications, and servers are normally caped to 30
|
||||
const paginator = useMasto().notifications.iterate({ limit: 30, types: ['mention'] })
|
||||
|
||||
const { clearNotifications } = useNotifications()
|
||||
onActivated(clearNotifications)
|
||||
|
||||
const stream = await useMasto().stream.streamUser()
|
||||
|
||||
useHeadFixed({
|
||||
title: () => `${t('tab.notifications_mention')} | ${t('nav_side.notifications')}`,
|
||||
})
|
||||
</script>
|
||||
|
||||
<template>
|
||||
<TimelineNotifications v-if="isMastoInitialised" />
|
||||
<NotificationPaginator v-bind="{ paginator, stream }" />
|
||||
</template>
|
||||
|
|
|
@ -18,6 +18,6 @@ useHeadFixed({
|
|||
<span>{{ t('account.pinned') }}</span>
|
||||
</template>
|
||||
|
||||
<TimelinePinned v-if="isMastoInitialised" />
|
||||
<TimelinePaginator :paginator="paginator" />
|
||||
</MainContent>
|
||||
</template>
|
||||
|
|
Loading…
Reference in New Issue