diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index a128a16c4..a5cdae1f5 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -49,10 +49,10 @@ -
{{dm.lastMessage._updatedAt | date: 'HH:mm'}}
+
{{dm._updatedAt | date: 'HH:mm'}}
- {{dm.lastMessage.msg}} + {{dm.lastMessage.msg}}
diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index e5b25c79e..916c56720 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -56,13 +56,8 @@ export class ChatPage implements OnInit { }); this.doRefresh(); - /* this.loadJoinedRooms(); */ - } - loadJoinedRooms(){ - this.chatService.loadJoinedRooms().subscribe(res => { - console.log(res); - }); } + onSegmentChange(){ this.doRefresh(); } @@ -84,7 +79,6 @@ export class ChatPage implements OnInit { getDirectMessages(){ this.showLoader = true; - /* this.result = */ this.chatService.getAllDirectMessages().subscribe((res:any)=>{ console.log(res.ims); @@ -101,8 +95,6 @@ export class ChatPage implements OnInit { getChatMembers(){ this.chatService.getMembers(this.userDirectMessages[0]._id).subscribe(res=> { this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username) - /* console.log(res); - console.log(this.dmUsers); */ }); } getGroups(){ @@ -123,38 +115,7 @@ export class ChatPage implements OnInit { }); }); } - /* getConnectedChannels(){ - this.showLoader = true; - - this.result = this.chatService.getAllUserChannels().subscribe((res:any)=>{ - this.userChannels = res.channels; - console.log(res); - - this.showLoader = false; - }); - } */ - - /* getConnectedRooms(){ - this.showLoader = true; - - this.result = this.chatService.getAllRooms().subscribe((res:any)=>{ - this.userRooms = res.update; - console.log(res.update); - - this.showLoader = false; - }); - } */ - - /* getConnectedUsers(){ - this.showLoader = true; - - this.result = this.chatService.getAllConnectedUsers().subscribe((res:any)=>{ - this.userConnectedList = res.users; - - this.showLoader = false; - }); - } */ - + async startConversation(selectedUser) { const modal = await this.modalController.create({ component: ConversationPage, 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 55c5b7413..9443f32fb 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.html +++ b/src/app/pages/chat/group-messages/group-messages.page.html @@ -30,8 +30,8 @@ Esta conversa passou a grupo
A conversa original mantêm-se como chat individual -
-
+
+
{{msg.u.username}} {{msg._updatedAt | date: 'HH:mm' }} @@ -40,6 +40,9 @@ {{msg.msg}}
+
+ Alterou o assunto de para "{{msg.msg.split('-').join(' ')}}"
+
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 7606ec8d5..08390cfcc 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.scss +++ b/src/app/pages/chat/group-messages/group-messages.page.scss @@ -90,6 +90,19 @@ margin: 20px 39px 25px; border-radius: 8px; } + .info-text{ + /* width: 322px; */ + width: em(422px); + background: #fef4c5; + text-align: center; + font-size: 13px; + color: #262420; + padding: 10px; + margin: 10px auto; + line-height: 1.2rem; + /* margin: 15px 0px 15px 0px; */ + border-radius: 8px; + } .messages{ font-size: 13px; font-family: Roboto; diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 448a31182..3275ddc51 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -49,42 +49,6 @@ {{msg.msg}}
- diff --git a/src/app/pages/chat/messages/messages.page.ts b/src/app/pages/chat/messages/messages.page.ts index ba034b2c4..0cbe7c8ce 100644 --- a/src/app/pages/chat/messages/messages.page.ts +++ b/src/app/pages/chat/messages/messages.page.ts @@ -47,7 +47,6 @@ export class MessagesPage implements OnInit, AfterViewChecked { /* console.log(this.dm); */ /* setInterval(()=>{ */ - this.checkUserPresence(); this.loadMessages(); /* }, 2000); */ @@ -71,11 +70,6 @@ export class MessagesPage implements OnInit, AfterViewChecked { } - checkUserPresence(){ - this.chatService.getUserPresence(this.dm.lastMessage.u._id).subscribe(res=>{ - this.userPresence = res['presence']; - }); - } sendMessage(){ let body = { @@ -95,6 +89,8 @@ export class MessagesPage implements OnInit, AfterViewChecked { this.chatService.getRoomMessages(this.dm._id).subscribe(res => { /* console.log(res); */ this.messages = res['messages'].reverse(); + console.log(this.messages); + }) } getChatMembers(){ diff --git a/src/app/services/chat.service.ts b/src/app/services/chat.service.ts index 6c9f8330f..64d026274 100644 --- a/src/app/services/chat.service.ts +++ b/src/app/services/chat.service.ts @@ -84,23 +84,8 @@ export class ChatService { getAllConnectedUsers(){ return this.http.get(environment.apiChatUrl+'users.presence', this.options); } - //Check whether user is online or offline - getUserPresence(id:any){ - - let params = new HttpParams(); - params = params.set("userId", id); - - let opts = { - headers: this.headers, - params: params - } - return this.http.get(environment.apiChatUrl+'users.getPresence', opts); - } //Load messages from roomId - loadJoinedRooms(){ - return this.http.get(environment.apiChatUrl+'im.list', this.options); - } getAllDirectMessages(){ return this.http.get(environment.apiChatUrl+'im.list', this.options); }