This commit is contained in:
tiago.kayaya
2021-07-27 00:01:38 +01:00
parent 189f35ae46
commit 1b791bf80a
3 changed files with 43 additions and 20 deletions
+18 -18
View File
@@ -41,55 +41,55 @@
<div class=" aside overflow-y-auto d-flex flex-wrap flex-grow-1">
<div class="width-100" [ngSwitch]="segment">
<ion-list *ngSwitchCase="'Contactos'">
<ion-item-group>
<ion-item-sliding>
<ion-item class="item width-100 d-flex ion-no-padding ion-no-margin"
lines="none"
*ngFor="let dm of userDirectMessages">
<div class="item width-100 d-flex ion-no-padding ion-no-margin"
*ngFor="let dm of userDirectMessages"
[class.item-active]="dm._id ==idSelected">
<div class="item-icon">
<ion-icon class="icon" slot="start" src="assets/images/icons-chat-chat-40.svg"></ion-icon>
</div>
<div (click)="openMessagesPage(dm._id)" class="item-content flex-grow-1"><!-- (click)="openMessages(dm)" -->
<div [class.highlight]="dm._id =='cjFv5XfreKz5j3fWW'"
(click)="openMessagesPage(dm._id)"
class="item-content flex-grow-1"><!-- (click)="openMessages(dm)" -->
<div class="item-title-time">
<div class="item-title">
<div class="item-title" [class.item-title-active]="dm._id == idSelected">
<ion-label *ngFor="let user of dm.usernames">
<span *ngIf="user !=loggedUserChat.me.username">
{{user}}
</span>
</ion-label>
</div>
<div class="item-date">{{dm._updatedAt | date: 'HH:mm'}}</div>
<div class="item-date" [class.item-date-active]="dm._id == idSelected">{{dm._updatedAt | date: 'HH:mm'}}</div>
</div>
<div class="item-description">
<div class="item-description" [class.item-description-active]="dm._id == idSelected">
<ion-label *ngIf="dm.lastMessage">{{dm.lastMessage.msg}}</ion-label>
</div>
</div>
</ion-item>
</div>
</ion-item-sliding>
</ion-item-group>
</ion-list>
<ion-list *ngSwitchCase="'Grupos'" >
<ion-item-group>
<ion-item-sliding>
<div *ngFor="let group of allGroups" class="item d-flex">
<div *ngFor="let group of allGroups"
[class.item-active]="group._id ==idSelected"
class="item d-flex">
<div class="item-icon">
<ion-icon class="icon" slot="start" src="assets/images/icons-chat-group-chat-40.svg"></ion-icon>
</div>
<div (click)="openGroupMessagesPage(group._id)" class="item-content flex-grow-1">
<div
(click)="openGroupMessagesPage(group._id)" class="item-content flex-grow-1">
<div class="item-title-time">
<div class="item-title">
<div class="item-title" [class.item-title-active]="group._id ==idSelected">
<ion-label>{{group.name.split('-').join(' ')}}</ion-label>
</div>
<div class="item-date" *ngIf="group.lastMessage">{{group.lastMessage._updatedAt | date: 'HH:mm'}}</div>
<div class="item-date" [class.item-date-active]="group._id ==idSelected" *ngIf="group.lastMessage">{{group.lastMessage._updatedAt | date: 'HH:mm'}}</div>
</div>
<div class="item-description" *ngIf="group.lastMessage">
<div class="item-description" [class.item-description-active]="group._id ==idSelected" *ngIf="group.lastMessage">
<ion-label>{{group.lastMessage.u.name}}: {{group.lastMessage.msg}}</ion-label>
</div>
</div>
</div>
</ion-item-sliding>
</ion-item-group>
</ion-list>
</div>
<!-- <button (click)="sendMsg()" style="height: 41px;">Send message</button> -->
+22 -2
View File
@@ -51,7 +51,7 @@ ion-content{
}
.aside{
padding: 0px 20px 0 20px !important;
padding: 0 !important;
}
}
@@ -73,6 +73,7 @@ ion-content{
.item{
width: 100%;
border-bottom: 1px solid #ebebeb;
padding: 0px 20px 0 20px !important;
overflow: auto;
.item-icon{
@@ -86,8 +87,9 @@ ion-content{
}
.item-content{
width: 317px;
float:right
float:right;
}
.item-title-time{
width: 100%;
overflow: auto;
@@ -99,6 +101,9 @@ ion-content{
font-size: 15px;
color: #0d89d1;
}
.item-title-active{
color: #fff;
}
.item-date{
width: 20%;
float: right;
@@ -106,10 +111,20 @@ ion-content{
color: #797979;
text-align: right;
}
.item-date-active{
color: #fff;
}
.item-description{
font-size: 13px;
color: #000;
}
.item-description-active{
color: #fff;
}
}
.item-active{
color: #fff !important;
background-color: #42b9fe !important;
}
@media only screen and (min-width: 801px) {
.main-content{
@@ -142,3 +157,8 @@ ion-content{
}
}
.highlight {
color: #fff !important;
background-color: #42b9fe !important;
}
+3
View File
@@ -49,6 +49,7 @@ export class ChatPage implements OnInit {
userDirectMessages: any[];
result:any;
dmUsers:any;
idSelected: string;
desktopComponent: any = {
showMessages: false,
@@ -177,6 +178,7 @@ hideRefreshButton(){
}
}
openMessagesPage(rid) {
this.idSelected = rid;
if( window.innerWidth < 801){
this.openMessagesModal(rid);
}
@@ -220,6 +222,7 @@ hideRefreshButton(){
}
openGroupMessagesPage(rid) {
this.idSelected = rid;
console.log(rid);
if( window.innerWidth < 801){