From ea48094bc7c5bb10f1f081f9626f05d406288161 Mon Sep 17 00:00:00 2001
From: isUnknown <adrien.payet@outlook.com>
Date: Wed, 23 Oct 2024 15:45:04 +0200
Subject: [PATCH] pdf > comments > new comments : show email address if no name

---
 ...-bureaux-artistiquement-consideree.pdf.txt | 29 +------------------
 public/site/blueprints/users/admin.yml        |  6 +++-
 public/site/blueprints/users/client.yml       |  2 ++
 .../site/blueprints/users/project-manager.yml |  8 +++--
 public/site/config/routes/add-comment.php     |  4 +--
 src/components/comments/Comments.vue          | 22 +++++++++-----
 .../project/client-brief/PdfViewer.vue        |  9 ++++--
 src/views/Project.vue                         | 15 +++++++++-
 8 files changed, 52 insertions(+), 43 deletions(-)

diff --git a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/38969543_extrait-de-louis-sullivan-form-follow-function.-de-la-tour-de-bureaux-artistiquement-consideree.pdf.txt b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/38969543_extrait-de-louis-sullivan-form-follow-function.-de-la-tour-de-bureaux-artistiquement-consideree.pdf.txt
index cc8a950..cb27a3c 100644
--- a/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/38969543_extrait-de-louis-sullivan-form-follow-function.-de-la-tour-de-bureaux-artistiquement-consideree.pdf.txt
+++ b/public/content/projects/1_miss-dior-blooming-bouquet/1_client-brief/38969543_extrait-de-louis-sullivan-form-follow-function.-de-la-tour-de-bureaux-artistiquement-consideree.pdf.txt
@@ -6,31 +6,4 @@ Uuid: s0lNtRA0Z7ybTCWG
 
 ----
 
-Template: document
-
-----
-
-Comments:
-
-1:
-  m2lmqu2u:
-    text: test
-    username: Adrien Payet
-    date: 2024-10-23T10:46:08+02:00
-  m2lo4obv:
-    text: nouveau commentaire
-    username: Adrien Payet
-    date: 2024-10-23T11:24:53+02:00
-  m2lo6ckw:
-    text: Encore un autre commentaire
-    username: Adrien Payet
-    date: 2024-10-23T11:26:11+02:00
-2:
-  m2loaj2f:
-    text: Autre commentaire
-    username: Adrien Payet
-    date: 2024-10-23T11:29:26+02:00
-  m2loam7s:
-    text: Autre commentaire
-    username: Adrien Payet
-    date: 2024-10-23T11:29:30+02:00
\ No newline at end of file
+Template: document
\ No newline at end of file
diff --git a/public/site/blueprints/users/admin.yml b/public/site/blueprints/users/admin.yml
index 4843c22..984dd65 100644
--- a/public/site/blueprints/users/admin.yml
+++ b/public/site/blueprints/users/admin.yml
@@ -1 +1,5 @@
-title: Admin
\ No newline at end of file
+title: Admin
+
+fields:
+  notifications:
+    type: hidden
diff --git a/public/site/blueprints/users/client.yml b/public/site/blueprints/users/client.yml
index 6fce1a6..49210db 100644
--- a/public/site/blueprints/users/client.yml
+++ b/public/site/blueprints/users/client.yml
@@ -8,3 +8,5 @@ fields:
     type: pages
     max: 1
     query: page('clients').children
+  notifications:
+    type: hidden
diff --git a/public/site/blueprints/users/project-manager.yml b/public/site/blueprints/users/project-manager.yml
index de6f987..16a2a13 100644
--- a/public/site/blueprints/users/project-manager.yml
+++ b/public/site/blueprints/users/project-manager.yml
@@ -1,3 +1,7 @@
-title: 
+title:
   fr: Chef·fe de projet
-  en: Project Manager
\ No newline at end of file
+  en: Project Manager
+
+fields:
+  notifications:
+    type: hidden
diff --git a/public/site/config/routes/add-comment.php b/public/site/config/routes/add-comment.php
index 0a69530..a210107 100644
--- a/public/site/config/routes/add-comment.php
+++ b/public/site/config/routes/add-comment.php
@@ -18,7 +18,7 @@ return [
 
       $comments[$data->targetPage][$data->id] = [
         'text' => $data->text,
-        'username' => (string) $user->name(),
+        'username' => $user->name()->isNotEmpty() ? (string) $user->name() : (string) $user->email(),
         'date' => (string) $data->date,
       ];
       
@@ -27,6 +27,6 @@ return [
         'comments' => $comments
       ]);
 
-      return $comments;
+      return getFileData($newFile);
   }
 ];
\ No newline at end of file
diff --git a/src/components/comments/Comments.vue b/src/components/comments/Comments.vue
index 647fdad..dd6cc65 100644
--- a/src/components/comments/Comments.vue
+++ b/src/components/comments/Comments.vue
@@ -2,10 +2,7 @@
   <aside id="comments-container" aria-labelledby="comments-label">
     <h2 id="comments-label" class="sr-only">Commentaires</h2>
     <div class="comments | flow">
-      <div
-        v-for="(page, pageIndex) in localComments"
-        class="comments__page-group"
-      >
+      <div v-for="(page, pageIndex) in comments" class="comments__page-group">
         <article
           v-for="(comment, commentIndex) in Object.values(page)"
           :key="pageIndex + commentIndex"
@@ -53,7 +50,9 @@
         v-model="newCommentText"
       ></textarea>
       <footer class="flex">
-        <button class="btn btn--white-20">Annuler</button>
+        <button class="btn btn--white-20" @click="closeAddField()">
+          Annuler
+        </button>
         <input type="submit" class="btn btn--tranparent" />
       </footer>
     </form>
@@ -80,7 +79,7 @@ const { page } = usePageStore();
 
 const newCommentText = ref("");
 const isAddOpen = ref(false);
-const localComments = ref(comments);
+const emits = defineEmits(["update:file"]);
 
 // Functions
 function addComment(event) {
@@ -103,7 +102,11 @@ function addComment(event) {
 
   fetch("/add-comment.json", headers)
     .then((res) => res.json())
-    .then((json) => (localComments.value = json))
+    .then((newFile) => {
+      newCommentText.value = "";
+      isAddOpen.value = false;
+      emits("update:file", newFile);
+    })
     .catch((error) => {
       console.error("Erreur lors de la sauvegarde :", error);
     });
@@ -123,4 +126,9 @@ function formatDate(date) {
 
   return dayjs(date).format("D MMM YY");
 }
+
+function closeAddField() {
+  isAddOpen.value = false;
+  newCommentText.value = "";
+}
 </script>
diff --git a/src/components/project/client-brief/PdfViewer.vue b/src/components/project/client-brief/PdfViewer.vue
index 33e66bc..bf0b289 100644
--- a/src/components/project/client-brief/PdfViewer.vue
+++ b/src/components/project/client-brief/PdfViewer.vue
@@ -34,6 +34,7 @@
         :current-page-index="currentPageIndex"
         :file="file"
         :comments="file.comments"
+        @update:file="changeFile"
       />
     </div>
   </Dialog>
@@ -49,7 +50,7 @@ const { file } = defineProps({
   file: Object,
 });
 
-const emit = defineEmits("close");
+const emits = defineEmits(["close", "update:file"]);
 
 const licenseKey = import.meta.env.VITE_VPV_LICENSE;
 useLicense({ licenseKey });
@@ -57,7 +58,7 @@ useLicense({ licenseKey });
 // Variables
 const isOpen = ref(true);
 watch(isOpen, (newValue) => {
-  emit("close");
+  emits("close");
 });
 const isCommentsOpen = ref(false);
 const currentPageIndex = ref(1);
@@ -102,6 +103,10 @@ const onPdfLoaded = () => {
 
   observePages();
 };
+
+function changeFile(newFile) {
+  emits("update:file", newFile);
+}
 </script>
 
 <style>
diff --git a/src/views/Project.vue b/src/views/Project.vue
index 3824ac8..71aedde 100644
--- a/src/views/Project.vue
+++ b/src/views/Project.vue
@@ -3,7 +3,12 @@
     <Header :title="page.content.title" />
     <!-- Kanban: Status Brief Enrichi -->
 
-    <PdfViewer v-if="file" :file="file" @close="file = null" />
+    <PdfViewer
+      v-if="file"
+      :file="file"
+      @close="file = null"
+      @update:file="updateFile"
+    />
 
     <div class="kanban">
       <ProjectStep
@@ -181,6 +186,14 @@ function setStepStatus(stepName) {
 function changeFile(newFile) {
   file.value = newFile;
 }
+
+function updateFile(newFile) {
+  page.value.files = [];
+  page.value.files.push(newFile);
+
+  file.value = page.value.files[0];
+  console.log(file.value);
+}
 </script>
 
 <style scope>