fix: revert loading optimization for /home to fix sign in
parent
84ea17e0cf
commit
43515b243b
6
app.vue
6
app.vue
|
@ -6,14 +6,14 @@ 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()
|
const { params, path } = 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">
|
||||||
<!-- TODO: rework the /[account] routes to remove conditional loading -->
|
<!-- TODO: rework the /[account] routes and the /home (for sign in alias) to remove conditional loading -->
|
||||||
<NuxtPage v-if="!params.account || isMastoInitialised" />
|
<NuxtPage v-if="(!params.account && path === '/home') || isMastoInitialised" />
|
||||||
</NuxtLayout>
|
</NuxtLayout>
|
||||||
<PWAPrompt />
|
<PWAPrompt />
|
||||||
</template>
|
</template>
|
||||||
|
|
|
@ -1,16 +1,16 @@
|
||||||
<script setup lang="ts">
|
<script setup lang="ts">
|
||||||
import { useI18n } from 'vue-i18n'
|
import { useI18n } from 'vue-i18n'
|
||||||
|
|
||||||
definePageMeta({
|
definePageMeta({
|
||||||
middleware: 'auth',
|
middleware: 'auth',
|
||||||
alias: ['/signin/callback'],
|
alias: ['/signin/callback'],
|
||||||
})
|
})
|
||||||
|
|
||||||
if (useRoute().path === '/signin/callback') {
|
if (useRoute().path === '/signin/callback') {
|
||||||
// This only cleans up the URL; page content should stay the same
|
// This only cleans up the URL; page content should stay the same
|
||||||
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'),
|
||||||
|
@ -25,7 +25,9 @@ useHeadFixed({
|
||||||
<span>{{ $t('nav_side.home') }}</span>
|
<span>{{ $t('nav_side.home') }}</span>
|
||||||
</NuxtLink>
|
</NuxtLink>
|
||||||
</template>
|
</template>
|
||||||
|
<slot>
|
||||||
<TimelineHome v-if="isMastoInitialised" />
|
<PublishWidget draft-key="home" border="b base" />
|
||||||
|
<TimelinePaginator v-bind="{ paginator, stream }" context="home" />
|
||||||
|
</slot>
|
||||||
</MainContent>
|
</MainContent>
|
||||||
</template>
|
</template>
|
||||||
|
|
Loading…
Reference in New Issue