From 0cf26819cec2dd56a4820fc912db9783765a321d Mon Sep 17 00:00:00 2001
From: isUnknown <adrien.payet@outlook.com>
Date: Tue, 17 Dec 2024 14:16:00 +0100
Subject: [PATCH] #34 - fix console error

---
 src/components/Menu.vue     | 23 +++++++++++++----------
 src/views/Notifications.vue |  3 ++-
 2 files changed, 15 insertions(+), 11 deletions(-)

diff --git a/src/components/Menu.vue b/src/components/Menu.vue
index c27d76e..3b40c06 100644
--- a/src/components/Menu.vue
+++ b/src/components/Menu.vue
@@ -39,7 +39,9 @@
           :key="mainItem.path"
           :class="{ active: isCurrent(mainItem), disabled: mainItem.disabled }"
           :data-count="
-            mainItem.title === 'Notifications' ? notificationCount() : undefined
+            mainItem.title === 'Notifications'
+              ? unreadNotificationsCount
+              : undefined
           "
         >
           <router-link
@@ -100,7 +102,7 @@
 
 <script setup>
 import { storeToRefs } from "pinia";
-import { ref } from "vue";
+import { computed, ref } from "vue";
 import { useProjectsStore } from "../stores/projects";
 import { useRoute } from "vue-router";
 import { useUserStore } from "../stores/user";
@@ -112,6 +114,15 @@ const { user } = storeToRefs(useUserStore());
 const { currentProjects, archivedProjects } = storeToRefs(useProjectsStore());
 const { page } = storeToRefs(usePageStore());
 
+const unreadNotificationsCount = computed(() => {
+  if (!user.value) return undefined;
+  const count = user.value.notifications.map(
+    (notification) => notification.isRead
+  ).length;
+  if (count === 0) return undefined;
+  return count;
+});
+
 const mainItems = [
   {
     title: "Home",
@@ -158,14 +169,6 @@ function collapse() {
     isExpanded.value = false;
   }
 }
-
-function notificationCount() {
-  const count = user.value.notifications.map(
-    (notification) => notification.isRead
-  ).length;
-  if (count === 0) return undefined;
-  return count;
-}
 </script>
 
 <style>
diff --git a/src/views/Notifications.vue b/src/views/Notifications.vue
index 4e9c15c..e6cc4b1 100644
--- a/src/views/Notifications.vue
+++ b/src/views/Notifications.vue
@@ -175,7 +175,8 @@ function readAll() {
 function read(notification) {
   if (!notification.isRead) {
     api.readNotification(notification.id).then((res) => {
-      router.push(toPath(notification.location.href));
+      console.log(res);
+      // router.push(toPath(notification.location.href));
     });
   }
   router.push(toPath(notification.location.href));