save

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

@@ -40,11 +40,9 @@ export class GroupContactsPage implements OnInit {
     private chatService: ChatService,
     private authService: AuthService,
     //private navParams: NavParams,
-  ) 
+  )
   {
-    this.authService.userData$.subscribe((res:any)=>{
-      this.loggedUser=res;
-    });     
+    this.loggedUser = authService.ValidatedUserChat['data'];
     this.textSearch="";
     this.dm=null;
     this.room=null;
@@ -56,9 +54,9 @@ export class GroupContactsPage implements OnInit {
 
   ngOnInit() {
     //this.getRoomInfo();
-    //this.loadUsers();
+    this.loadUsers();
     console.log(this.roomId);
-    this.getChatInfo(); 
+    this.getChatInfo();
     //console.log(this.isGroupCreated);
   }
 
@@ -72,7 +70,7 @@ export class GroupContactsPage implements OnInit {
   }
   deleteMember(data:any){
     console.log(data);
-    
+
     let body = {
       "roomId": this.roomId,
       "userId": data._id,
@@ -100,7 +98,7 @@ export class GroupContactsPage implements OnInit {
     this.chatService.getRoomInfo(this.roomId).subscribe(res=>{
       console.log(res);
       let room = res['room'];
-      
+
       if(room.t == "p"){
         this.chatService.getGroupMembers(this.roomId).subscribe(res=>{
           this.members = res['members'];
@@ -148,7 +146,7 @@ export class GroupContactsPage implements OnInit {
   }
 
   loadUsers1(members:any){
-    this.options = { 
+    this.options = {
       headers: this.headers,
     };
     this.chatService.getAllUsers().subscribe((res:any)=>{
@@ -161,7 +159,7 @@ export class GroupContactsPage implements OnInit {
       else{
         this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
       }
-      
+
       this.users = this.contacts.sort((a,b) => {
         if(a.name < b.name){
           return -1;
@@ -172,13 +170,13 @@ export class GroupContactsPage implements OnInit {
         return 0;
       });
       console.log(this.users);
-      
+
       this.showLoader = false;
     });
   }
 
   loadUsers(){
-    this.options = { 
+    this.options = {
       headers: this.headers,
     };
     this.chatService.getAllUsers().subscribe((res:any)=>{
@@ -191,7 +189,7 @@ export class GroupContactsPage implements OnInit {
       else{
         this.contacts = res.users.filter(data => data.username != this.loggedUser.me.username);
       }
-      
+
       this.users = this.contacts.sort((a,b) => {
         if(a.name < b.name){
           return -1;
@@ -202,7 +200,7 @@ export class GroupContactsPage implements OnInit {
         return 0;
       });
       console.log(this.users);
-      
+
       this.showLoader = false;
     });
   }
@@ -228,7 +226,7 @@ export class GroupContactsPage implements OnInit {
   async close(){
     this.modalController.dismiss();
     if(this.isGroupCreated){
-      console.log('go to conversa'); 
+      console.log('go to conversa');
     }
     else{
       this.modalController.dismiss();
@@ -272,7 +270,7 @@ export class GroupContactsPage implements OnInit {
       }
       this.chatService.addUserToGroup(body).subscribe(res=>{
         console.log(res['success']);
-      }); 
+      });
     });
   }
 
@@ -285,14 +283,14 @@ export class GroupContactsPage implements OnInit {
         console.log(res['group']);
         this.addContacts(res['group']);
         this.openGroupMessages(res['group']);
-        
+
       });
-      
+
     }
     else{
       this.addContacts(this.room);
-      this.close(); 
-    } 
+      this.close();
+    }
   } */
 
   async newGroup(){
@@ -312,7 +310,7 @@ export class GroupContactsPage implements OnInit {
       component: GroupMessagesPage,
       componentProps: {
         room: room,
-      }, 
+      },
       cssClass: 'group-messages',
       backdropDismiss: false
     });