From f99e33f80eb2aed6cceda52ac8e234a0b7a03f6a Mon Sep 17 00:00:00 2001
From: isUnknown <adrien.payet@outlook.com>
Date: Mon, 16 Dec 2024 18:14:14 +0100
Subject: [PATCH] read notification on click working

---
 public/site/config/routes/validate-brief.php  |  1 +
 public/site/plugins/notifications/index.php   |  1 +
 .../plugins/notifications/routes/read.php     | 13 ++++
 src/stores/api.js                             |  2 +-
 src/views/Notifications.vue                   | 69 +++++++++++--------
 5 files changed, 55 insertions(+), 31 deletions(-)
 create mode 100644 public/site/plugins/notifications/routes/read.php

diff --git a/public/site/config/routes/validate-brief.php b/public/site/config/routes/validate-brief.php
index 410b022..fb21587 100644
--- a/public/site/config/routes/validate-brief.php
+++ b/public/site/config/routes/validate-brief.php
@@ -35,6 +35,7 @@ return [
           'uuid' => (string) kirby()->user()->uuid(),
           'role' => (string) kirby()->user()->role(),
         ],
+        'id' => Str::uuid(),
         'type' => 'content'
       ];
 
diff --git a/public/site/plugins/notifications/index.php b/public/site/plugins/notifications/index.php
index f0fa642..6a0219e 100644
--- a/public/site/plugins/notifications/index.php
+++ b/public/site/plugins/notifications/index.php
@@ -7,6 +7,7 @@ load([
 Kirby::plugin('adrienpayet/pdc-notifications', [
   'routes' => [
     require(__DIR__ . '/routes/readAll.php'),
+    require(__DIR__ . '/routes/read.php')
   ],
   'userMethods' => [
     'sendNotification' => require(__DIR__ . '/user-methods/send.php'),
diff --git a/public/site/plugins/notifications/routes/read.php b/public/site/plugins/notifications/routes/read.php
new file mode 100644
index 0000000..6d4e44e
--- /dev/null
+++ b/public/site/plugins/notifications/routes/read.php
@@ -0,0 +1,13 @@
+<?php
+
+return [
+  'pattern' => '(:all)read-notification.json',
+  'method' => 'POST',
+  'action'  => function () {
+      $json = file_get_contents('php://input');
+      $data = json_decode($json);
+      
+      $newNotifications = kirby()->user()->readNotification($data->notificationId);
+      return $newNotifications;
+  }
+];
\ No newline at end of file
diff --git a/src/stores/api.js b/src/stores/api.js
index 0f2b3c2..17f483f 100644
--- a/src/stores/api.js
+++ b/src/stores/api.js
@@ -197,7 +197,7 @@ export const useApiStore = defineStore("api", () => {
       }),
     };
     try {
-      const response = await fetch("/read-comment.json", headers);
+      const response = await fetch("/read-notification.json", headers);
       if (!response.ok) {
         throw new Error(`HTTP error! status: ${response.status}`);
       }
diff --git a/src/views/Notifications.vue b/src/views/Notifications.vue
index 68873ef..4e9c15c 100644
--- a/src/views/Notifications.vue
+++ b/src/views/Notifications.vue
@@ -42,38 +42,34 @@
           class="notification | bg-white rounded-lg | p-16 | flow"
           :data-status="notification.isRead ? 'read' : 'unread'"
           :data-type="notification.type"
+          @click="read(notification)"
         >
-          <router-link
-            v-if="currentTab === 'all' || !notification.isRead"
-            :to="toPath(notification.location.href)"
-          >
-            <header>
-              <p class="flex">
-                <strong
-                  class="notification__type | font-medium text-primary"
-                  :data-icon="notification.type"
-                  >Nouveau
-                  {{
-                    notification.type === "comment" ? "commentaire" : "contenu"
-                  }}</strong
-                >
-                <span class="notification__client | text-grey-700">{{
-                  notification.location.project.title
-                }}</span>
-                <time
-                  datetime=""
-                  class="notification__date | text-grey-700 | ml-auto"
-                  >{{ formatDate(notification) }}</time
-                >
-              </p>
-            </header>
-            <p
-              v-if="notification.type"
-              class="notification__body | text-md font-medium | line-clamp"
-            >
-              {{ notification.text }}
+          <header>
+            <p class="flex">
+              <strong
+                class="notification__type | font-medium text-primary"
+                :data-icon="notification.type"
+                >Nouveau
+                {{
+                  notification.type === "comment" ? "commentaire" : "contenu"
+                }}</strong
+              >
+              <span class="notification__client | text-grey-700">{{
+                notification.location.project.title
+              }}</span>
+              <time
+                datetime=""
+                class="notification__date | text-grey-700 | ml-auto"
+                >{{ formatDate(notification) }}</time
+              >
             </p>
-          </router-link>
+          </header>
+          <p
+            v-if="notification.type"
+            class="notification__body | text-md font-medium | line-clamp"
+          >
+            {{ notification.text }}
+          </p>
         </article>
       </template>
       <!-- <article
@@ -112,6 +108,7 @@ import { useUserStore } from "../stores/user";
 import { ref, computed } from "vue";
 import { storeToRefs } from "pinia";
 import { useApiStore } from "../stores/api";
+import { useRouter } from "vue-router";
 
 dayjs.locale("fr");
 
@@ -138,6 +135,8 @@ const tabs = computed(() => {
   ];
 });
 
+const router = useRouter();
+
 const sortedNotifications = computed(() => {
   return [...notifications.value].sort((a, b) => {
     return dayjs(b.date).diff(dayjs(a.date));
@@ -173,6 +172,15 @@ function readAll() {
   }
 }
 
+function read(notification) {
+  if (!notification.isRead) {
+    api.readNotification(notification.id).then((res) => {
+      router.push(toPath(notification.location.href));
+    });
+  }
+  router.push(toPath(notification.location.href));
+}
+
 function toPath(string) {
   return string.replace(window.location.origin, "");
 }
@@ -198,6 +206,7 @@ main > header [role="tablist"] {
   --flow-space: var(--space-12);
   font-size: var(--text-sm);
   position: relative;
+  cursor: pointer;
 }
 .notification[data-status="unread"]::after {
   content: "";