Merge branch 'master' into QUiZ-165

Quizzfly · Nov 28, 2024 · 6231e6e · 6231e6e
2 parents be17b10 + f52aa06
commit 6231e6e
Show file tree

Hide file tree

Showing 4 changed files with 26 additions and 0 deletions.
diff --git a/src/components/group/Activity.vue b/src/components/group/Activity.vue
@@ -112,6 +112,7 @@ const handleReactPost = (postId: string) => {
                 <AvatarFallback v-if="item.member.name">{{
                   item?.member?.name.charAt(0).toUpperCase()
                 }}</AvatarFallback>
+                <AvatarFallback>{{ item.member.name.charAt(0).toUpperCase() }}</AvatarFallback>
               </Avatar>
               <div class="flex flex-col gap-0">
                 <div class="flex items-center gap-2">
@@ -204,6 +205,8 @@ const handleReactPost = (postId: string) => {
                             <AvatarImage :src="item.member?.avatar" />
                             <AvatarFallback v-if="item.member.name">{{
                               item?.member?.name.charAt(0).toUpperCase()
+                            <AvatarFallback>{{
+                              item.member.name.charAt(0).toUpperCase()
                             }}</AvatarFallback>
                           </Avatar>
                           <p class="text-sm text-gray-500">{{ item.member.name }}</p>
@@ -252,6 +255,8 @@ const handleReactPost = (postId: string) => {
                   v-else
                   class="text-slate-500 i-solar-like-broken h-5 w-5"
                 ></span>
+              <div class="flex items-center gap-1 cursor-pointer">
+                <span class="text-slate-500 i-solar-like-broken h-5 w-5"></span>
                 <p class="font-x text-slate-600">{{ item.react_count }} Likes</p>
               </div>
               <div class="flex items-center gap-1 cursor-pointer">
@@ -268,6 +273,7 @@ const handleReactPost = (postId: string) => {
             :id-post="item.id"
           />
           <ListComment :id-post="item.id" />
+          <FormSend :member="item.member" />
         </div>
       </Card>
     </div>

diff --git a/src/components/group/comment/FormSend.vue b/src/components/group/comment/FormSend.vue
@@ -81,6 +81,20 @@ const onSubmit = async () => {
       </Avatar>
       <Input
         v-model="content"
+
+const props = defineProps<{
+  member: any
+}>()
+</script>
+<template>
+  <div class="flex items-center justify-between p-6 gap-12 w-full">
+    <div class="flex items-center gap-2 w-full">
+      <Avatar>
+        <AvatarImage :src="props.member.avatar" />
+        <AvatarFallback>{{ props.member.name.charAt(0).toUpperCase() }}</AvatarFallback>
+      </Avatar>
+      <Input
+
         placeholder="Write your comment..."
         class="outline-none items-center h-11 border rounded-full px-6 py-3 text-sm font-normal text-gray-600"
       />
@@ -96,6 +110,8 @@ const onSubmit = async () => {
       </div>
     </div>
   </form>
+  </div>
+
 </template>
 
 <style lang="scss" scoped></style>
diff --git a/src/components/group/modal/MCreatePost.vue b/src/components/group/modal/MCreatePost.vue
@@ -107,6 +107,8 @@ const onSubmit = async () => {
   }
 
   await postStore.createPost(idGroup, data)
+  emits('created')
+  isLoading.value = false
   closeModal()
   emits('created')
   isLoading.value = false
@@ -213,6 +215,7 @@ const handleRemoveQuizzfly = () => {
                             <Avatar class="h-7 w-7">
                               <AvatarImage :src="quizzflyShared.avatar" />
                               <AvatarFallback v-if="quizzflyShared.username">{{
+                              <AvatarFallback>{{
                                 quizzflyShared.username.charAt(0).toUpperCase()
                               }}</AvatarFallback>
                             </Avatar>

diff --git a/src/services/group.ts b/src/services/group.ts
@@ -101,6 +101,7 @@ export const commentPostApi = async (
   idPost: string,
   data: any,
 ): Promise<BaseResponse<IComment>> => {
+export const commentPostApi = async (idPost: string, data: any): Promise<BaseResponse<IPost>> => {
   return $api(`/posts/${idPost}/comments`, {
     method: 'POST',
     body: data,