Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix: change page reload and account switch logic #2975

Merged
merged 14 commits into from
Sep 25, 2024
Merged

fix: change page reload and account switch logic #2975

Changes from 1 commit
Commits
Show all changes
14 commits
Select commit Hold shift + click to select a range
db57722
fix: change page reload and account switch logic
userquin Sep 23, 2024
b041293
chore: cleanup users.ts module
userquin Sep 23, 2024
8793678
chore: initialize users
userquin Sep 23, 2024
f2b4149
chore: update `useAsyncIDBKeyval` composable
userquin Sep 23, 2024
192e1e6
chore: remove `onBeforeUnmount` from plugin
userquin Sep 24, 2024
5da9cb6
fix: don't call masto on server side
userquin Sep 24, 2024
6a389cc
chore: update logic
userquin Sep 24, 2024
20b9793
chore: revert masto plugin changes
userquin Sep 24, 2024
72a323e
fix: masto plugin
userquin Sep 24, 2024
1d56f55
fix: lists and hashtags pages
userquin Sep 24, 2024
2dc34e7
fix: move masto plugin logic to setup users
userquin Sep 25, 2024
eb486ef
chore: use `finally` to enable watcher
userquin Sep 25, 2024
45b2c10
fix: `NaviSide` hydration warnings
userquin Sep 25, 2024
f4430b7
chore: update `NaviSide` explore and notifications links
userquin Sep 25, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
25 changes: 23 additions & 2 deletions components/nav/NavSide.vue
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,6 +8,27 @@ const { notifications } = useNotifications()
const useStarFavoriteIcon = usePreferences('useStarFavoriteIcon')
const lastAccessedNotificationRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_NOTIFICATION_ROUTE, '')
const lastAccessedExploreRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_EXPLORE_ROUTE, '')

const notificationsLink = computed(() => {
const hydrated = isHydrated.value
const user = currentUser.value
const lastRoute = lastAccessedNotificationRoute.value
if (!hydrated || !user || !lastRoute) {
return '/notifications'
}

return `/notifications/${lastAccessedNotificationRoute}`
Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

shouldn't eslint fail here (computed without .value)?

Copy link
Member Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

RemovableRef is a type from VueUse using type instead interface (type RemovableRef<T> = Omit<Ref, 'value'> & {...}), maybe some check not being resolved: https://github.com/vuejs/eslint-plugin-vue/blob/2dc606ca589ff5cdcd197c3c64ace7e575a6347d/lib/utils/index.js#L1130

})
const exploreLink = computed(() => {
const hydrated = isHydrated.value
const server = currentServer.value
const lastRoute = lastAccessedExploreRoute.value
if (!hydrated || !server || !lastRoute) {
return '/explore'
}

return server ? `/${server}/explore/${lastRoute}` : `/explore/${lastRoute}`
})
</script>

<template>
Expand All @@ -16,7 +37,7 @@ const lastAccessedExploreRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_EXPLO

<div class="spacer" shrink xl:hidden />
<NavSideItem :text="$t('nav.home')" to="/home" icon="i-ri:home-5-line" user-only :command="command" />
<NavSideItem :text="$t('nav.notifications')" :to="`/notifications/${lastAccessedNotificationRoute}`" icon="i-ri:notification-4-line" user-only :command="command">
<NavSideItem :text="$t('nav.notifications')" :to="notificationsLink" icon="i-ri:notification-4-line" user-only :command="command">
<template #icon>
<div flex relative>
<div class="i-ri:notification-4-line" text-xl />
Expand All @@ -34,7 +55,7 @@ const lastAccessedExploreRoute = useLocalStorage(STORAGE_KEY_LAST_ACCESSED_EXPLO
<NavSideItem :text="$t('action.compose')" to="/compose" icon="i-ri:quill-pen-line" user-only :command="command" />

<div class="spacer" shrink hidden sm:block />
<NavSideItem :text="$t('nav.explore')" :to="isHydrated ? `/${currentServer}/explore/${lastAccessedExploreRoute}` : `/explore/${lastAccessedExploreRoute}`" icon="i-ri:compass-3-line" :command="command" />
<NavSideItem :text="$t('nav.explore')" :to="exploreLink" icon="i-ri:compass-3-line" :command="command" />
<NavSideItem :text="$t('nav.local')" :to="isHydrated ? `/${currentServer}/public/local` : '/public/local'" icon="i-ri:group-2-line " :command="command" />
<NavSideItem :text="$t('nav.federated')" :to="isHydrated ? `/${currentServer}/public` : '/public'" icon="i-ri:earth-line" :command="command" />
<NavSideItem :text="$t('nav.lists')" :to="isHydrated ? `/${currentServer}/lists` : '/lists'" icon="i-ri:list-check" user-only :command="command" />
Expand Down