This commit is contained in:
tiago.kayaya
2021-07-26 12:12:59 +01:00
parent b6c9008ae0
commit ee55ada059
7 changed files with 29 additions and 27 deletions
@@ -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>
@@ -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;
}
}
@@ -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;
@@ -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>
+11 -11
View File
@@ -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;
}
@@ -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);