fix: force user to login only on account dependent page (#1045)

* fix: redirect unlogged user from home to explore * fix: prompt user to login on logged only pages * fix: clear notifications cache on logout --------- Co-authored-by: Less <[email protected]>
snapshot-labs · Dec 11, 2024 · be5fb73 · be5fb73
1 parent 3b0eeab
commit be5fb73
Show file tree

Hide file tree

Showing 4 changed files with 35 additions and 9 deletions.
diff --git a/apps/ui/src/stores/notifications.ts b/apps/ui/src/stores/notifications.ts
@@ -135,6 +135,7 @@ export const useNotificationsStore = defineStore('notifications', () => {
       } else if (!followedSpacesIds.length && refreshNotificationInterval) {
         clearInterval(refreshNotificationInterval);
         refreshNotificationInterval = 0;
+        notifications.value = [];
       }
     },
     { immediate: true }

diff --git a/apps/ui/src/views/My/Home.vue b/apps/ui/src/views/My/Home.vue
@@ -10,7 +10,7 @@ const PROPOSALS_LIMIT = 20;
 useTitle('Home');
 
 const metaStore = useMetaStore();
-const { modalAccountWithoutDismissOpen } = useModal();
+const router = useRouter();
 const followedSpacesStore = useFollowedSpacesStore();
 const { web3 } = useWeb3();
 const { loadVotes } = useAccount();
@@ -113,15 +113,11 @@ watch(
   [() => web3.value.account, () => web3.value.authLoading],
   ([account, authLoading]) => {
     if (!account && !authLoading) {
-      modalAccountWithoutDismissOpen.value = true;
+      router.replace({ name: 'my-explore' });
     }
   },
   { immediate: true }
 );
-
-onUnmounted(() => {
-  modalAccountWithoutDismissOpen.value = false;
-});
 </script>
 
 <template>

diff --git a/apps/ui/src/views/My/Notifications.vue b/apps/ui/src/views/My/Notifications.vue
@@ -2,6 +2,8 @@
 import { _rt } from '@/helpers/utils';
 
 const notificationsStore = useNotificationsStore();
+const { modalAccountWithoutDismissOpen } = useModal();
+const { web3 } = useWeb3();
 const { setTitle } = useTitle();
 
 watchEffect(async () => {
@@ -11,13 +13,25 @@ watchEffect(async () => {
 });
 
 watch(
-  () => notificationsStore.unreadNotificationsCount,
-  () => {
+  [
+    () => web3.value.account,
+    () => web3.value.authLoading,
+    () => notificationsStore.unreadNotificationsCount
+  ],
+  ([account, authLoading]) => {
+    if (!account && !authLoading) {
+      modalAccountWithoutDismissOpen.value = true;
+    }
+
     notificationsStore.refreshLastUnreadTs();
   },
   { immediate: true }
 );
 
+onUnmounted(() => {
+  modalAccountWithoutDismissOpen.value = false;
+});
+
 onUnmounted(() => notificationsStore.markAllAsRead());
 </script>
 

diff --git a/apps/ui/src/views/Settings.vue b/apps/ui/src/views/Settings.vue
@@ -1,5 +1,20 @@
 <script setup lang="ts">
-const { web3Account } = useWeb3();
+const { web3, web3Account } = useWeb3();
+const { modalAccountWithoutDismissOpen } = useModal();
+
+watch(
+  [() => web3.value.account, () => web3.value.authLoading],
+  ([account, authLoading]) => {
+    if (!account && !authLoading) {
+      modalAccountWithoutDismissOpen.value = true;
+    }
+  },
+  { immediate: true }
+);
+
+onUnmounted(() => {
+  modalAccountWithoutDismissOpen.value = false;
+});
 </script>
 
 <template>