From 55a15e4c14f16c2b203ad48f9d97c49940f14616 Mon Sep 17 00:00:00 2001
From: "tiago.kayaya" <tiago.kayaya@equilibrium.co.ao>
Date: Tue, 20 Apr 2021 17:18:57 +0100
Subject: [PATCH] leave group finished

---
 .../group-messages/group-messages.page.html    |  3 +++
 .../group-messages/group-messages.page.scss    | 18 ++++++++++++++++++
 .../chat/group-messages/group-messages.page.ts |  6 +++++-
 src/app/services/chat.service.ts               |  6 ++++++
 .../group-messages/group-messages.page.html    |  3 +++
 .../group-messages/group-messages.page.scss    | 18 ++++++++++++++++++
 .../chat/group-messages/group-messages.page.ts |  4 ++--
 .../popover/chat-popover/chat-popover.page.ts  |  4 ++--
 8 files changed, 57 insertions(+), 5 deletions(-)

diff --git a/src/app/pages/chat/group-messages/group-messages.page.html b/src/app/pages/chat/group-messages/group-messages.page.html
index e9dce4ed3..263877ca7 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.html
+++ b/src/app/pages/chat/group-messages/group-messages.page.html
@@ -51,6 +51,9 @@
       <ion-label>Alterou o assunto para "{{msg.msg.split('-').join(' ')}}"</ion-label><br />
     </div>
   </div>
+  <div *ngIf="leaveStatus" class="info-text-leave">
+    <ion-label>{{leaveStatus}}</ion-label>
+  </div>
 
 </ion-content>
 <!-- 
diff --git a/src/app/pages/chat/group-messages/group-messages.page.scss b/src/app/pages/chat/group-messages/group-messages.page.scss
index f1acc3533..f94b3c8e6 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.scss
+++ b/src/app/pages/chat/group-messages/group-messages.page.scss
@@ -103,6 +103,24 @@
     /* margin: 15px 0px 15px 0px; */
     border-radius: 8px;
    }
+   .info-text-leave{
+     display: flex;
+     align-items: center;
+     justify-content: center;
+     width: fit-content;
+    padding: 10px;
+    background: #e0e9ee;
+    border-radius: 8px;
+    margin: 10px auto;
+    color: #797979 !important;
+    font-size: 13px !important;
+    /* margin: 15px 0px 15px 0px; */
+
+    .info-text-leave ion-label{
+      font-size: 13px !important;
+      line-height: 1.2rem;
+    }
+   }
    .messages{
     font-size: 13px;
     font-family: Roboto;
diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts
index d5e3e9cda..3ff8ad91c 100644
--- a/src/app/pages/chat/group-messages/group-messages.page.ts
+++ b/src/app/pages/chat/group-messages/group-messages.page.ts
@@ -19,6 +19,7 @@ export class GroupMessagesPage implements OnInit {
   isGroupCreated:boolean;
   loggedUser: any;
   message:any;
+  leaveStatus:any;
   messages:any;
   
 
@@ -145,9 +146,12 @@ export class GroupMessagesPage implements OnInit {
     });
     await modal.present();
     modal.onDidDismiss().then(res=>{
+      if(res.data == 'leave'){
+        this.leaveStatus = this.loggedUser.me.name + ' saiu do grupo';
+      }
       console.log('OK2');
       
-      console.log(res);
+      console.log(res.data);
       /* if(res.data ==){
         this.roomName = res.data.name.split('-').join(' ');
         console.log(this.roomName);
diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts
index b221f27a9..91983ff7f 100644
--- a/src/app/services/chat.service.ts
+++ b/src/app/services/chat.service.ts
@@ -211,6 +211,12 @@ export class ChatService {
     closeChannel(body:any){
       return this.http.post(environment.apiChatUrl+'channels.close', body, this.options);
     }
+    leaveGroup(body:any){
+      return this.http.post(environment.apiChatUrl+'groups.leave', body, this.options);
+    }
+    leaveChannel(body:any){
+      return this.http.post(environment.apiChatUrl+'channels.leave', body, this.options);
+    }
     removeChannelMember(body:any){
       let opts = { 
         headers: this.headers,
diff --git a/src/app/shared/chat/group-messages/group-messages.page.html b/src/app/shared/chat/group-messages/group-messages.page.html
index 5e06ea714..43682e735 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.html
+++ b/src/app/shared/chat/group-messages/group-messages.page.html
@@ -52,6 +52,9 @@
       </div>
     </div>
   </div>
+  <div *ngIf="leaveStatus" class="info-text-leave">
+    <ion-label>{{leaveStatus}}</ion-label>
+  </div>
 
 </ion-content>
 
diff --git a/src/app/shared/chat/group-messages/group-messages.page.scss b/src/app/shared/chat/group-messages/group-messages.page.scss
index 517a2659c..1d3a14713 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.scss
+++ b/src/app/shared/chat/group-messages/group-messages.page.scss
@@ -97,6 +97,24 @@
     /* margin: 15px 0px 15px 0px; */
     border-radius: 8px;
    }
+   .info-text-leave{
+    display: flex;
+    align-items: center;
+    justify-content: center;
+    width: fit-content;
+   padding: 10px;
+   background: #e0e9ee;
+   border-radius: 8px;
+   margin: 10px auto;
+   color: #797979 !important;
+   font-size: 13px !important;
+   /* margin: 15px 0px 15px 0px; */
+
+   .info-text-leave ion-label{
+     font-size: 13px !important;
+     line-height: 1.2rem;
+   }
+  }
    .messages{
     font-size: 13px;
     font-family: Roboto;
diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts
index b1f3c1e75..2bbbf2b45 100644
--- a/src/app/shared/chat/group-messages/group-messages.page.ts
+++ b/src/app/shared/chat/group-messages/group-messages.page.ts
@@ -19,6 +19,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
   isGroupCreated:boolean;
   loggedUser: any;
   message:any;
+  leaveStatus:any;
   messages:any;
   
 
@@ -199,8 +200,7 @@ export class GroupMessagesPage implements OnInit, OnChanges {
     modal.onDidDismiss().then(res=>{
       console.log(res);
       if(res.data == 'leave'){
-        console.log('LEAVE');
-        
+        this.leaveStatus = this.loggedUser.me.name + ' saiu do grupo';
       }
       else if(res.data == 'delete'){
         this.closeAllDesktopComponents.emit();
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts
index ccbd9d7ab..b3a18e6f2 100644
--- a/src/app/shared/popover/chat-popover/chat-popover.page.ts
+++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts
@@ -46,12 +46,12 @@ export class ChatPopoverPage implements OnInit {
       this.room = room['room'];
 
       if(this.room.t === 'p'){ 
-        this.chatService.closeGroup(body).subscribe(res=>{
+        this.chatService.leaveGroup(body).subscribe(res=>{
           console.log(res);
         });
       }
       else{ 
-        this.chatService.closeChannel(body).subscribe(res=>{
+        this.chatService.leaveChannel(body).subscribe(res=>{
           console.log(res);
         });
       }