diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index bb9cef918..5a5452277 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -101,11 +101,13 @@ #messagecontainer> @@ -117,16 +119,19 @@ + {{message}}
- + 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 9873b07ef..cd36c3f60 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.scss +++ b/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; } } 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 b2098e07f..a6b1e491e 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/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; diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index c2b613be9..0e4ce007b 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -56,7 +56,7 @@
- + diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss index 547b63b8f..eee2a3788 100644 --- a/src/app/shared/chat/messages/messages.page.scss +++ b/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; } - - \ No newline at end of file + diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index c4db23c5d..78c3659f0 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -89,10 +89,6 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { } } - loadMoreMessages(ev:any){ - - } - sendMessage(){ let body = { @@ -111,7 +107,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.showLoader = false; @@ -120,7 +116,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);