Skip to content

Commit

Permalink
fix: reverts /home special treatment
Browse files Browse the repository at this point in the history
reverts commit 43515b2.
  • Loading branch information
patak-dev committed Dec 23, 2022
1 parent 4f09794 commit 2e5270f
Show file tree
Hide file tree
Showing 2 changed files with 8 additions and 10 deletions.
6 changes: 3 additions & 3 deletions app.vue
Original file line number Diff line number Diff line change
Expand Up @@ -6,14 +6,14 @@ 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, path } = useRoute()
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 and the /home (for sign in alias) to remove conditional loading -->
<NuxtPage v-if="(!params.account && path === '/home') || isMastoInitialised" />
<!-- TODO: rework the /[account] routes to remove conditional loading -->
<NuxtPage v-if="!params.account || isMastoInitialised" />
</NuxtLayout>
<PWAPrompt />
</template>
12 changes: 5 additions & 7 deletions pages/home.vue
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
<script setup lang="ts">
import { useI18n } from 'vue-i18n'
definePageMeta({
middleware: 'auth',
alias: ['/signin/callback'],
})
if (useRoute().path === '/signin/callback') {
// This only cleans up the URL; page content should stay the same
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'),
Expand All @@ -25,9 +25,7 @@ useHeadFixed({
<span>{{ $t('nav_side.home') }}</span>
</NuxtLink>
</template>
<slot>
<PublishWidget draft-key="home" border="b base" />
<TimelinePaginator v-bind="{ paginator, stream }" context="home" />
</slot>

<TimelineHome v-if="isMastoInitialised" />
</MainContent>
</template>

0 comments on commit 2e5270f

Please sign in to comment.