teutat3s/elk
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity

fix: defer loading text and server links until hydration (#926)

Browse source
This commit is contained in:
Daniel Roe 2023-01-11 14:50:47 +00:00 committed by GitHub
parent c92fd7939e
commit f04d7ac067
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
14 changed files with 25 additions and 23 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
components/common/CommonRouteTabs.vue
View file

@ -43,7 +43,7 @@ useCommands(() => command
exact-active-class="children:(text-secondary !border-primary !op100 !text-base)"
@click="!preventScrollTop && $scrollToTop()"
>
<span ws-nowrap mxa sm:px2 sm:py3 xl:pb4 xl:pt5 py2 text-center border-b-3 text-secondary-light hover:text-secondary border-transparent>{{ option.display }}</span>
<span ws-nowrap mxa sm:px2 sm:py3 xl:pb4 xl:pt5 py2 text-center border-b-3 text-secondary-light hover:text-secondary border-transparent>{{ option.display || '&nbsp;' }}</span>
</NuxtLink>
<div v-else flex flex-auto sm:px6 px2 xl:pb4 xl:pt5>
<span ws-nowrap mxa sm:px2 sm:py3 py2 text-center text-secondary-light op50>{{ option.display }}</span>

6
components/nav/NavSide.vue
View file

@ -29,9 +29,9 @@ const { notifications } = useNotifications()
<NavSideItem :text="$t('action.compose')" to="/compose" icon="i-ri:quill-pen-line" user-only :command="command" />
<div shrink hidden sm:block mt-4 />
<NavSideItem :text="$t('nav.explore')" :to="`/${currentServer}/explore`" icon="i-ri:hashtag" :command="command" />
<NavSideItem :text="$t('nav.local')" :to="`/${currentServer}/public/local`" icon="i-ri:group-2-line " :command="command" />
<NavSideItem :text="$t('nav.federated')" :to="`/${currentServer}/public`" icon="i-ri:earth-line" :command="command" />
<NavSideItem :text="$t('nav.explore')" :to="isMastoInitialised ? `/${currentServer}/explore` : '/explore'" icon="i-ri:hashtag" :command="command" />
<NavSideItem :text="$t('nav.local')" :to="isMastoInitialised ? `/${currentServer}/public/local` : '/public/local'" icon="i-ri:group-2-line " :command="command" />
<NavSideItem :text="$t('nav.federated')" :to="isMastoInitialised ? `/${currentServer}/public` : '/public'" icon="i-ri:earth-line" :command="command" />
<div shrink hidden sm:block mt-4 />
<NavSideItem :text="$t('nav.settings')" to="/settings" icon="i-ri:settings-3-line" :command="command" />

2
components/nav/NavSideItem.vue
View file

@ -66,7 +66,7 @@ const noUserVisual = computed(() => isMastoInitialised.value && props.userOnly &
<div :class="icon" text-xl />
</slot>
<slot>
<span block sm:hidden xl:block>{{ text }}</span>
<span block sm:hidden xl:block>{{ isHydrated ? text : '&nbsp;' }}</span>
</slot>
</div>
</CommonTooltip>

2
components/search/SearchWidget.vue
View file

@ -66,7 +66,7 @@ const activate = () => {
bg-transparent
outline="focus:none"
pe-4
:placeholder="t('nav.search')"
:placeholder="isHydrated ? t('nav.search') : ''"
pb="1px"
placeholder-text-secondary
@keydown.down.prevent="shift(1)"

3
nuxt.config.ts
View file

@ -112,8 +112,9 @@ export default defineNuxtConfig({
},
nitro: {
prerender: {
crawlLinks: false,
crawlLinks: true,
routes: ['/'],
ignore: ['/settings'],
},
},
app: {

16
pages/[[server]]/explore.vue
View file

@ -3,21 +3,21 @@ const { t } = useI18n()
const tabs = $computed(() => [
{
to: `/${currentServer.value}/explore`,
display: t('tab.posts'),
to: isHydrated.value ? `/${currentServer.value}/explore` : '/explore',
display: isHydrated.value ? t('tab.posts') : '',
},
{
to: `/${currentServer.value}/explore/tags`,
display: t('tab.hashtags'),
to: isHydrated.value ? `/${currentServer.value}/explore/tags` : '/explore/tags',
display: isHydrated.value ? t('tab.hashtags') : '',
},
{
to: `/${currentServer.value}/explore/links`,
display: t('tab.news'),
to: isHydrated.value ? `/${currentServer.value}/explore/links` : '/explore/links',
display: isHydrated.value ? t('tab.news') : '',
},
// This section can only be accessed after logging in
{
to: `/${currentServer.value}/explore/users`,
display: t('tab.for_you'),
to: isHydrated.value ? `/${currentServer.value}/explore/users` : '/explore/users',
display: isHydrated.value ? t('tab.for_you') : '',
disabled: !isMastoInitialised.value || !currentUser.value,
},
] as const)

2
pages/[[server]]/explore/index.vue
View file

@ -8,7 +8,7 @@ const paginator = useMasto().v1.trends.listStatuses()
const hideNewsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_POSTS_TIPS, false)
useHeadFixed({
title: () => `${t('tab.posts')} | ${t('nav.explore')}`,
title: () => isHydrated.value ? `${t('tab.posts')} | ${t('nav.explore')}` : '',
})
</script>

2
pages/[[server]]/explore/links.vue
View file

@ -8,7 +8,7 @@ const paginator = useMasto().v1.trends.listLinks()
const hideNewsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_NEWS_TIPS, false)
useHeadFixed({
title: () => `${t('tab.news')} | ${t('nav.explore')}`,
title: () => isHydrated.value ? `${t('tab.news')} | ${t('nav.explore')}` : '',
})
</script>

2
pages/[[server]]/explore/tags.vue
View file

@ -11,7 +11,7 @@ const paginator = masto.v1.trends.listTags({
const hideTagsTips = useLocalStorage(STORAGE_KEY_HIDE_EXPLORE_TAGS_TIPS, false)
useHeadFixed({
title: () => `${t('tab.hashtags')} | ${t('nav.explore')}`,
title: () => isHydrated.value ? `${t('tab.hashtags')} | ${t('nav.explore')}` : '',
})
</script>

2
pages/[[server]]/explore/users.vue
View file

@ -5,7 +5,7 @@ const { t } = useI18n()
const paginator = useMasto().v2.suggestions.list({ limit: 20 })
useHeadFixed({
title: () => `${t('tab.for_you')} | ${t('nav.explore')}`,
title: () => isHydrated.value ? `${t('tab.for_you')} | ${t('nav.explore')}` : '',
})
</script>

4
pages/notifications.vue
View file

@ -10,12 +10,12 @@ const tabs = $computed(() => [
{
name: 'all',
to: '/notifications',
display: t('tab.notifications_all'),
display: isHydrated.value ? t('tab.notifications_all') : '',
},
{
name: 'mention',
to: '/notifications/mention',
display: t('tab.notifications_mention'),
display: isHydrated.value ? t('tab.notifications_mention') : '',
},
] as const)
</script>

2
pages/notifications/index.vue
View file

@ -1,7 +1,7 @@
<script setup lang="ts">
const { t } = useI18n()
useHeadFixed({
title: () => `${t('tab.notifications_all')} | ${t('nav.notifications')}`,
title: () => isHydrated.value ? `${t('tab.notifications_all')} | ${t('nav.notifications')}` : '',
})
</script>

2
pages/notifications/mention.vue
View file

@ -1,7 +1,7 @@
<script setup lang="ts">
const { t } = useI18n()
useHeadFixed({
title: () => `${t('tab.notifications_mention')} | ${t('nav.notifications')}`,
title: () => isHydrated.value ? `${t('tab.notifications_mention')} | ${t('nav.notifications')}` : '',
})
</script>

1
public/_redirects
View file

@ -1 +1,2 @@
/docs/* https://docs.elk.zone/:splat 200
/settings/* /index.html 200