From e376a0d5713e801c0714a7c2bb24c585c26c92e2 Mon Sep 17 00:00:00 2001
From: Jonathan Bourdon <lowrad0@hotmail.com>
Date: Mon, 22 Jul 2024 00:30:22 -0400
Subject: [PATCH] Fix the appearance of comments

---
 src/models/myUserModel.js          |  1 +
 src/models/storedDataUrlsModel.js  |  6 +++---
 src/views/contents/ContentCard.vue |  3 ---
 src/views/main/Header.vue          |  8 +-------
 src/views/messages/Message.vue     | 18 +++++++++++++++---
 src/views/messages/MessageList.vue | 14 ++++++--------
 src/views/messages/PostMessage.vue | 20 ++++++++++++++------
 7 files changed, 40 insertions(+), 30 deletions(-)

diff --git a/src/models/myUserModel.js b/src/models/myUserModel.js
index 684cb95..c8266ff 100644
--- a/src/models/myUserModel.js
+++ b/src/models/myUserModel.js
@@ -7,6 +7,7 @@ export default class MyUserModel
 {
     id = "";
     creatorAlias = "";
+    alias = null;
     firstName = "";
     lastName = "";
     userName = "";
diff --git a/src/models/storedDataUrlsModel.js b/src/models/storedDataUrlsModel.js
index 55b1489..bfed85a 100644
--- a/src/models/storedDataUrlsModel.js
+++ b/src/models/storedDataUrlsModel.js
@@ -1,8 +1,8 @@
 export default class StoredDataUrlsModel
 {
-    bannerPictureUrl = "";
-    profilePictureUrl = "";
-    websiteIconUrl = "";
+    bannerPictureUrl = null;
+    profilePictureUrl = null;
+    websiteIconUrl = null;
 
     static createFromApiResult(apiResult){
         return Object.assign(new StoredDataUrlsModel(), apiResult)
diff --git a/src/views/contents/ContentCard.vue b/src/views/contents/ContentCard.vue
index 10eca5e..7bef437 100644
--- a/src/views/contents/ContentCard.vue
+++ b/src/views/contents/ContentCard.vue
@@ -79,10 +79,7 @@ const props = defineProps({
 const messages = reactive([]);
 
 function addMessage(newMessage) {
-  console.table(newMessage, 'test')
-  console.table(messages)
   messages.unshift(newMessage)
-  console.table(messages)
 }
 
 </script>
\ No newline at end of file
diff --git a/src/views/main/Header.vue b/src/views/main/Header.vue
index 2e1360b..2ad600d 100644
--- a/src/views/main/Header.vue
+++ b/src/views/main/Header.vue
@@ -58,9 +58,8 @@
                  {{ currentUser.userName }}
                  </span>
               <img
-                  :src="currentUser.storedDataUrls.profilePictureUrl"
+                  :src="currentUser.storedDataUrls.profilePictureUrl ?? '/images/usersmedia/anonyme/profilepictures/profileAnonymeSquare.png'"
                   alt="Profile Image"
-                  @error="handleProfilePictureError"
                   class="ml-2 rounded-full" style="width: 32px; height: 32px;">
             </v-btn>
           </template>
@@ -120,11 +119,6 @@ const searchQuery = ref("");
 const showSearch = ref(false);
 let currentUser = reactive(MyUserModel.getDefaultUser());
 const userStore = useUserStore();
-const backupProfilePictureUrl = "/images/usersmedia/anonyme/profilepictures/profileAnonymeSquare.png"
-
-const handleProfilePictureError = (event) => {
-  event.target.src = backupProfilePictureUrl;
-}
 
 const toggleSidebar = () => {
   eventBus.value.toggleSidebar();
diff --git a/src/views/messages/Message.vue b/src/views/messages/Message.vue
index 3f46b10..e5edd93 100644
--- a/src/views/messages/Message.vue
+++ b/src/views/messages/Message.vue
@@ -2,7 +2,7 @@
   <div class="flex flex-column">
     <div class="flex flex-row p-1 items-center">
       <div class="px-2 content-center">
-        <img :src="message.portrait"
+        <img :src="message.profileImageUrl ?? '/images/usersmedia/anonyme/profilepictures/profileAnonymeSquare.png'"
              alt="Profile Image"
              class="rounded-full"
              width="32px"
@@ -11,9 +11,21 @@
 
       <div class="p-2 flex-1">
         <div class="flex justify-between items-center">
+
           <div>
-            <span class="font-semibold font-sans mr-2">{{ message.createdBy }}</span>
-            <span class="text-sm font-sans text-gray-700">{{ time_ago(message.createdAt) }}</span>
+             
+            <span class="font-semibold font-sans mr-2">
+              {{ message.createdByName }}
+            </span>
+
+            <v-tooltip :text="new Date(message.createdAt).toLocaleString()">
+              <template v-slot:activator="{ props }">
+                <span v-bind="props" class="text-sm-caption text-gray-700">
+                  {{ time_ago(message.createdAt) }}
+                </span>
+              </template>
+            </v-tooltip>
+
           </div>
           <v-menu>
             <template v-slot:activator="{ props }">
diff --git a/src/views/messages/MessageList.vue b/src/views/messages/MessageList.vue
index 9ee32c4..57ab88e 100644
--- a/src/views/messages/MessageList.vue
+++ b/src/views/messages/MessageList.vue
@@ -6,11 +6,9 @@
                      class="bg-gray-300 rounded-md justify-items-center">
 
     <template v-for="(message, index) in messages" :key="index">
-      <Message
-          :message="message"
-          class="m-2 p-2 rounded-md bg-gray-100"
-      >
-      </Message>
+      <message :message="message"
+               class="m-2 p-2 rounded-md bg-gray-100"
+      ></message>
     </template>
 
     <template v-slot:load-more="{ props }">
@@ -79,11 +77,11 @@ async function load({done, page_size}) {
 
     if (response.status >= 200 && response.status < 300) {
 
-      const messageCount = response.data.length
+      const messageCount = response.data.messages.length
 
       if (messageCount > 0) {
-        messages.value.push(...response.data)
-        const [last_content] = response.data.slice(-1)
+        messages.value.push(...response.data.messages)
+        const [last_content] = response.data.messages.slice(-1)
         last_id = last_content.id
       }
 
diff --git a/src/views/messages/PostMessage.vue b/src/views/messages/PostMessage.vue
index f1375f0..35f1940 100644
--- a/src/views/messages/PostMessage.vue
+++ b/src/views/messages/PostMessage.vue
@@ -5,7 +5,8 @@
     <div class="flex flex-row">
 
       <div class="mx-2 content-center">
-        <img src="/images/usersmedia/anonyme/profilepictures/profileAnonymeSquare.png"
+                
+        <img :src="profileUrl"
              alt="Profile Image"
              class="rounded-full"
              width="32px"
@@ -46,11 +47,12 @@ const props = defineProps({
   }
 });
 
-const emit = defineEmits(['message-posted']);
+const emit = defineEmits(['message-posted'])
 
-const client = useClient();
-const value = ref("");
-const user = useUserStore();
+const client = useClient()
+const value = ref("")
+const user = useUserStore()
+const profileUrl = ref(user.getCurrentUser().storedDataUrls.profilePictureUrl ?? '/images/usersmedia/anonyme/profilepictures/profileAnonymeSquare.png')
 
 const publish = async () => {
 
@@ -62,15 +64,21 @@ const publish = async () => {
           "subjectId": props.subjectId,
           "message": value.value
         })
+    
+    const currentUser = user.getCurrentUser()
     emit('message-posted',
         {
           "id": messageId,
           "subjectId": props.subjectId,
-          "createdBy": user.getCurrentUser().id,
+          "createdBy": currentUser.id,
+          "createdByName": currentUser.alias ?? `${currentUser.firstName} ${currentUser.lastName}`,
+          "createdByPortraitUrl": currentUser.storedDataUrls.profilePictureUrl,
           "createdAt": new Date(Date.now()).toISOString(),
           "value": value.value,
           parentId: null,
         })
+    
+    value.value = ''
   } catch (error) {
     console.error(`post api/message : ${error}`)
   }