Merge branch 'feature/chat' of https://bitbucket.org/equilibriumito/gabinete-digital into feature/chat

src/app/pages/chat/chat.page.html

@@ -101,11 +101,13 @@
           #messagecontainer>
         </app-empty-chat>
         <app-messages class=" height-100 flex-column"
-        [style.display]="showMessages ? 'flex' : 'none'"
+          *ngIf="showMessages"
+          [style.display]="showMessages ? 'flex' : 'none'"
           [roomId]="roomId"  #messagecontainer>
         </app-messages>
         <app-contacts
           (openMessage)="openMessagesPage($event)"
+          *ngIf="showContacts"
           [style.display]="showContacts ? 'flex' : 'none'"
            class=" height-100 flex-column">
         </app-contacts>
@@ -117,16 +119,19 @@
         <app-edit-group [roomId]="roomId"
           (closeAllDesktopComponents)="closeAllDesktopComponents()"
           (openGroupMessage)="openGroupMessagesPage($event)"
+          *ngIf="showEditGroup"
           [style.display]="showEditGroup ? 'flex' : 'none'"
            class="height-100 flex-column">
         </app-edit-group>
         <app-group-contacts
           (openGroupMessage)="openGroupMessagesPage($event)"
+          *ngIf="showGroupContacts"
           [style.display]="showGroupContacts ? 'flex' : 'none'"
           [roomId]="groupRoomId" class=" height-100 flex-column"
           >
         </app-group-contacts>
         <app-group-messages
+          *ngIf="showGroupMessages"
         [style.display]="showEmptyComponent ? 'flex' : 'none'"
           (closeAllDesktopComponents)="closeAllDesktopComponents()"
           (showEmptyContainer)="showEmptyContainer()"

src/app/shared/chat/group-messages/group-messages.page.html

@@ -59,6 +59,7 @@
 </ion-content>
 
 <ion-footer>
+  <ion-label>{{message}}</ion-label>
   <div class="container width-100 d-flex">
     <div>
       <button class="btn-no-color" (click)="openSendGroupMessageOptions()">
@@ -67,7 +68,7 @@
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
-        <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
+        <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
         <button hidden class="btn-no-color">
           <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
         </button>

src/app/shared/chat/group-messages/group-messages.page.scss

@@ -185,12 +185,10 @@
 
 
    ion-textarea{
-     width: fit-content;
-     display: block;
+     min-height: 50px;
      margin: 0 !important;
      align-self: center;
-     //border: 1px solid red;
-     //overflow: auto;
+     overflow: auto;
    }
  }
 

src/app/shared/chat/group-messages/group-messages.page.ts

@@ -18,12 +18,12 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked {
   showLoader: boolean;
   isGroupCreated:boolean;
   loggedUser: any;
-  message:any="";
+  message:any;
   leaveStatus:any;
   messages:any;
 
 
-  room:any;
+  room:any = new Array();
   roomName:any;
   members:any;
 
@@ -95,7 +95,9 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewChecked {
     this.showLoader = true;
     this.chatService.getRoomInfo(this.roomId).subscribe(room=>{
       this.room = room['room'];
-      this.roomName = this.room.name.split('-').join(' ');
+      if(this.room.name){
+        this.roomName = this.room.name.split('-').join(' ');
+      }
       this.getGroupContacts(this.room);
       this.loadGroupMessages(this.room);
       this.showLoader = false;

src/app/shared/chat/messages/messages.page.html

@@ -56,7 +56,7 @@
     </div>
     <div class="width-80">
       <ion-item class="ion-no-padding type-message" lines="none">
-        <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" auto-grow class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
+        <ion-textarea clearOnEdit="true" placeholder="Escrever uma mensagem" class="message-input" rows="1" [(ngModel)]="message"></ion-textarea>
         <button hidden class="btn-no-color" (click)="notImplemented()">
           <ion-icon slot="end" src="assets/icon/icons-chat-mic.svg"></ion-icon>
         </button>

src/app/shared/chat/messages/messages.page.scss

@@ -13,7 +13,7 @@
         color:#000;
         transform: translate3d(0, 1px, 0);
         padding: 30px 20px 0 20px !important;
-        
+
         .header-top{
           width: 100%;
           overflow: auto;
@@ -26,7 +26,7 @@
             margin: 2px 0 0 5px;
             display: flex;
             align-items: center;
-            
+
           }
           .right{
             padding: 0!important;
@@ -39,7 +39,7 @@
         .header-bottom{
           width: 95%;
           overflow: auto;
-         
+
 
           .header-bottom-icon{
             width: 30px;
@@ -60,7 +60,7 @@
             margin: 1px;
           }
         }
-    
+
         .title{
           font-size: 25px;
           overflow: auto;
@@ -76,7 +76,7 @@
         .div-icon ion-icon{
           float: right;
           padding-left: 20px;
-        } 
+        }
     }
  }
  ion-content{
@@ -96,6 +96,7 @@
      line-height: 1.2rem;
      //margin: 20px 39px 25px;
      border-radius: 8px;
+     border: 1px solid red;
    }
 
    .messages{
@@ -118,7 +119,7 @@
       width: 100%;
       overflow: auto;
     }
-    
+
 
     .incoming-true, .incoming-false{
        padding: 15px 20px;
@@ -157,9 +158,9 @@
   .container{
     justify-content: center;
     justify-content: space-evenly;
-    
+
   }
-  
+
   .chat-icon-options{
     display:block !important;
     font-size: 25px;
@@ -186,7 +187,7 @@
       align-self: center;
     }
   }
-  
+
  }
 
  .text-color-blue{
@@ -231,5 +232,4 @@ display: block;
  float: left;
  padding-left: 10px;
 }
- 
- 
+

src/app/shared/chat/messages/messages.page.ts

@@ -90,10 +90,6 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
     }
   }
 
-  loadMoreMessages(ev:any){
-
-  }
-
   sendMessage(){
 
     let body = {
@@ -112,7 +108,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
   loadMessages(){
     //this.showLoader = true;
     this.chatService.getRoomMessages(this.roomId).subscribe(res => {
-      /* console.log(res); */
+      console.log(res);
       this.messages = res['messages'].reverse();
       console.log(this.messages);
       this.serverLongPull(res)
@@ -126,7 +122,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
   getChatMembers(){
     console.log(this.roomId);
 
-    this.showLoader = true;
+    //this.showLoader = true;
     this.chatService.getMembers(this.roomId).subscribe(res=> {
       this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
       console.log(res);