feat: move timelines to components (#514)

zio/stable
patak 2022-12-22 18:48:41 +01:00 committed by GitHub
parent 6b7a8baa8e
commit fef082af13
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
23 changed files with 123 additions and 68 deletions

View File

@ -5,12 +5,15 @@ provideGlobalCommands()
// We want to trigger rerendering the page when account changes // We want to trigger rerendering the page when account changes
const key = computed(() => `${currentUser.value?.server ?? currentServer.value}:${currentUser.value?.account.id || ''}`) const key = computed(() => `${currentUser.value?.server ?? currentServer.value}:${currentUser.value?.account.id || ''}`)
const { params } = useRoute()
</script> </script>
<template> <template>
<NuxtLoadingIndicator color="repeating-linear-gradient(to right,var(--c-primary) 0%,var(--c-primary-active) 100%)" /> <NuxtLoadingIndicator color="repeating-linear-gradient(to right,var(--c-primary) 0%,var(--c-primary-active) 100%)" />
<NuxtLayout :key="key"> <NuxtLayout :key="key">
<NuxtPage v-if="isMastoInitialised" /> <!-- TODO: rework the /[account] routes to remove conditional loading -->
<NuxtPage v-if="!params.server || isMastoInitialised" />
</NuxtLayout> </NuxtLayout>
<PWAPrompt /> <PWAPrompt />
</template> </template>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().blocks.iterate()
</script>
<template>
<AccountPaginator :paginator="paginator" />
</template>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().bookmarks.iterate()
</script>
<template>
<TimelinePaginator :paginator="paginator" />
</template>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().conversations.iterate()
</script>
<template>
<ConversationPaginator :paginator="paginator" />
</template>

View File

@ -0,0 +1,21 @@
<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>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().favourites.iterate()
</script>
<template>
<TimelinePaginator :paginator="paginator" />
</template>

View File

@ -0,0 +1,12 @@
<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>

View File

@ -0,0 +1,13 @@
<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>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().mutes.iterate()
</script>
<template>
<AccountPaginator :paginator="paginator" />
</template>

View File

@ -0,0 +1,13 @@
<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>

View File

@ -0,0 +1,7 @@
<script setup lang="ts">
const paginator = useMasto().accounts.iterateStatuses(currentUser.value!.account.id, { pinned: true })
</script>
<template>
<TimelinePaginator :paginator="paginator" />
</template>

View File

@ -41,6 +41,6 @@ const tabs = $computed(() => [
<template #header> <template #header>
<CommonRouteTabs replace :options="tabs" /> <CommonRouteTabs replace :options="tabs" />
</template> </template>
<NuxtPage /> <NuxtPage v-if="isMastoInitialised" />
</MainContent> </MainContent>
</template> </template>

View File

@ -3,8 +3,6 @@ definePageMeta({
middleware: 'auth', middleware: 'auth',
}) })
const paginator = useMasto().blocks.iterate()
useHeadFixed({ useHeadFixed({
title: 'Blocked users', title: 'Blocked users',
}) })
@ -15,6 +13,7 @@ useHeadFixed({
<template #title> <template #title>
<span text-lg font-bold>{{ $t('account.blocked_users') }}</span> <span text-lg font-bold>{{ $t('account.blocked_users') }}</span>
</template> </template>
<AccountPaginator :paginator="paginator" />
<TimelineBlocks v-if="isMastoInitialised" />
</MainContent> </MainContent>
</template> </template>

View File

@ -3,8 +3,6 @@ definePageMeta({
middleware: 'auth', middleware: 'auth',
}) })
const paginator = useMasto().bookmarks.iterate()
const { t } = useI18n() const { t } = useI18n()
useHeadFixed({ useHeadFixed({
@ -21,8 +19,6 @@ useHeadFixed({
</NuxtLink> </NuxtLink>
</template> </template>
<slot> <TimelineBookmarks v-if="isMastoInitialised" />
<TimelinePaginator :paginator="paginator" />
</slot>
</MainContent> </MainContent>
</template> </template>

View File

@ -3,8 +3,6 @@ definePageMeta({
middleware: 'auth', middleware: 'auth',
}) })
const paginator = useMasto().conversations.iterate()
const { t } = useI18n() const { t } = useI18n()
useHeadFixed({ useHeadFixed({
@ -21,8 +19,6 @@ useHeadFixed({
</NuxtLink> </NuxtLink>
</template> </template>
<slot> <TimelineConversations v-if="isMastoInitialised" />
<ConversationPaginator :paginator="paginator" />
</slot>
</MainContent> </MainContent>
</template> </template>

View File

@ -1,17 +1,13 @@
<script setup lang="ts"> <script setup lang="ts">
import TimelineDomainBlocks from '~~/components/timeline/TimelineDomainBlocks.vue'
definePageMeta({ definePageMeta({
middleware: 'auth', middleware: 'auth',
}) })
const paginator = useMasto().domainBlocks.iterate()
useHeadFixed({ useHeadFixed({
title: 'Blocked domains', title: 'Blocked domains',
}) })
const unblock = async (domain: string) => {
await useMasto().domainBlocks.unblock(domain)
}
</script> </script>
<template> <template>
@ -20,15 +16,6 @@ const unblock = async (domain: string) => {
<span text-lg font-bold>{{ $t('account.blocked_domains') }}</span> <span text-lg font-bold>{{ $t('account.blocked_domains') }}</span>
</template> </template>
<CommonPaginator :paginator="paginator"> <TimelineDomainBlocks v-if="isMastoInitialised" />
<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> </MainContent>
</template> </template>

View File

@ -3,7 +3,6 @@ definePageMeta({
middleware: 'auth', middleware: 'auth',
}) })
const paginator = useMasto().favourites.iterate()
const { t } = useI18n() const { t } = useI18n()
useHeadFixed({ useHeadFixed({
@ -19,8 +18,7 @@ useHeadFixed({
<span>{{ t('nav_side.favourites') }}</span> <span>{{ t('nav_side.favourites') }}</span>
</NuxtLink> </NuxtLink>
</template> </template>
<slot>
<TimelinePaginator :paginator="paginator" /> <TimelineFavourites v-if="isMastoInitialised" />
</slot>
</MainContent> </MainContent>
</template> </template>

View File

@ -11,10 +11,6 @@ if (useRoute().path === '/signin/callback') {
useRouter().push('/home') useRouter().push('/home')
} }
const paginator = useMasto().timelines.iterateHome()
const stream = await useMasto().stream.streamUser()
onBeforeUnmount(() => stream.disconnect())
const { t } = useI18n() const { t } = useI18n()
useHeadFixed({ useHeadFixed({
title: () => t('nav_side.home'), title: () => t('nav_side.home'),
@ -29,9 +25,7 @@ useHeadFixed({
<span>{{ $t('nav_side.home') }}</span> <span>{{ $t('nav_side.home') }}</span>
</NuxtLink> </NuxtLink>
</template> </template>
<slot>
<PublishWidget draft-key="home" border="b base" /> <TimelineHome v-if="isMastoInitialised" />
<TimelinePaginator v-bind="{ paginator, stream }" context="home" />
</slot>
</MainContent> </MainContent>
</template> </template>

View File

@ -2,9 +2,6 @@
definePageMeta({ definePageMeta({
middleware: 'auth', middleware: 'auth',
}) })
const paginator = useMasto().mutes.iterate()
useHeadFixed({ useHeadFixed({
title: 'Muted users', title: 'Muted users',
}) })
@ -15,6 +12,7 @@ useHeadFixed({
<template #title> <template #title>
<span text-lg font-bold>{{ $t('account.muted_users') }}</span> <span text-lg font-bold>{{ $t('account.muted_users') }}</span>
</template> </template>
<AccountPaginator :paginator="paginator" />
<TimelineMutes v-if="isMastoInitialised" />
</MainContent> </MainContent>
</template> </template>

View File

@ -53,6 +53,7 @@ onActivated(() => {
<template v-if="pwaEnabled"> <template v-if="pwaEnabled">
<NotificationPreferences :show="showSettings" /> <NotificationPreferences :show="showSettings" />
</template> </template>
<NuxtPage /> <NuxtPage />
</slot> </slot>
</MainContent> </MainContent>

View File

@ -1,19 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
const { t } = useI18n() 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({ useHeadFixed({
title: () => `${t('tab.notifications_all')} | ${t('nav_side.notifications')}`, title: () => `${t('tab.notifications_all')} | ${t('nav_side.notifications')}`,
}) })
</script> </script>
<template> <template>
<NotificationPaginator v-bind="{ paginator, stream }" /> <TimelineNotifications v-if="isMastoInitialised" />
</template> </template>

View File

@ -1,19 +1,10 @@
<script setup lang="ts"> <script setup lang="ts">
const { t } = useI18n() 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({ useHeadFixed({
title: () => `${t('tab.notifications_mention')} | ${t('nav_side.notifications')}`, title: () => `${t('tab.notifications_mention')} | ${t('nav_side.notifications')}`,
}) })
</script> </script>
<template> <template>
<NotificationPaginator v-bind="{ paginator, stream }" /> <TimelineNotifications v-if="isMastoInitialised" />
</template> </template>

View File

@ -18,6 +18,6 @@ useHeadFixed({
<span>{{ t('account.pinned') }}</span> <span>{{ t('account.pinned') }}</span>
</template> </template>
<TimelinePaginator :paginator="paginator" /> <TimelinePinned v-if="isMastoInitialised" />
</MainContent> </MainContent>
</template> </template>