mirrors/elk
1
0
Fork 0
mirror of https://github.com/elk-zone/elk.git synced 2024-11-28 21:38:52 +03:00
Code Issues Projects Releases Packages Wiki Activity

fix: reverts /home special treatment

Browse source 
reverts commit 43515b243b.
This commit is contained in:
patak 2022-12-23 05:59:29 +01:00
parent 4f09794021
commit 2e5270f453
2 changed files with 8 additions and 10 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
app.vue
View file

@ -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, path } = useRoute() 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">
<!-- TODO: rework the /[account] routes and the /home (for sign in alias) to remove conditional loading --> <!-- TODO: rework the /[account] routes to remove conditional loading -->
<NuxtPage v-if="(!params.account && path === '/home') || isMastoInitialised" /> <NuxtPage v-if="!params.account || isMastoInitialised" />
</NuxtLayout> </NuxtLayout>
<PWAPrompt /> <PWAPrompt />
</template> </template>

12
pages/home.vue
View file

@ -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,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>