peter/doneit-web
1
0
Fork 0
mirror of https://code.equilibrium.co.ao/ITO/doneit-web.git synced 2026-04-19 21:06:06 +00:00
Code Issues Packages Projects Releases Wiki Activity

pull made

Browse Source
This commit is contained in:
Eudes Inácio
2021-09-29 17:02:13 +01:00
parent 8f7cf20110 f6970c4d10
commit eb8d955b46
449 changed files with 126943 additions and 407 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/chat.module.ts
+2 -1
View File
@@ -28,13 +28,14 @@ import { EmptyChatPageModule } from 'src/app/shared/chat/empty-chat/empty-chat.m
import { HeaderPageModule } from 'src/app/shared/header/header.module';
import { NewEventPageModule } from 'src/app/shared/agenda/new-event/new-event.module';
import { AttendeeModalPageModule } from 'src/app/shared/event/attendee-modal/attendee-modal.module';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
@NgModule({
imports: [
CommonModule,
FormsModule,
IonicModule,
FontAwesomeModule,
PipesModule,
ChatPageRoutingModule,
RouterModule,
src/app/pages/chat/chat.page.html
+22 -2
View File
@@ -67,6 +67,16 @@
</div>
<div class="item-description" [class.item-description-active]="dm._id == idSelected">
<ion-label *ngIf="dm.lastMessage">{{dm.lastMessage.msg}}</ion-label>
<ion-label *ngIf="dm.lastMessage.file">
<fa-icon icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
<span> {{dm.lastMessage.file.name}}</span>
</ion-label>
<ion-label *ngIf="dm.lastMessage.attachments">
<div *ngIf="dm.lastMessage.attachments[0].image_url">
<fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="dm._id == idSelected"></fa-icon>
<span> Fotografia</span>
</div>
</ion-label>
</div>
</div>
</div>
@@ -88,8 +98,18 @@
</div>
<div class="item-date" [class.item-date-active]="group._id ==idSelected" *ngIf="group.lastMessage">{{showDateDuration(group._updatedAt)}}</div>
</div>
<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 class="item-description d-flex align-items-center" [class.item-description-active]="group._id ==idSelected" *ngIf="group.lastMessage">
<div class="item-message">{{group.lastMessage.u.name}}: {{group.lastMessage.msg}} </div>
<div class="item-files" *ngIf="group.lastMessage.file">
<fa-icon icon="file-alt" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
<span> {{group.lastMessage.file.name}}</span>
</div>
<div class="item-files" *ngIf="group.lastMessage.attachments">
<div *ngIf="group.lastMessage.attachments[0].image_url">
<fa-icon icon="image" class="file-icon" [class.set-active-item-font-to-white]="group._id == idSelected"></fa-icon>
<span> Fotografia</span>
</div>
</div>
</div>
</div>
</div>
src/app/pages/chat/chat.page.scss
+13 -4
View File
@@ -86,7 +86,7 @@ ion-content{
}
}
.item-content{
width: 317px;
//width: 317px;
float:right;
}
@@ -96,7 +96,7 @@ ion-content{
margin-top: 10px;
}
.item-title{
width: 80%;
width: calc(100% - 75px);
float: left;
font-size: 15px;
color: #0d89d1;
@@ -105,7 +105,7 @@ ion-content{
color: #fff;
}
.item-date{
width: 20%;
width: 75px;
float: right;
font-size: 13px;
color: #797979;
@@ -114,9 +114,19 @@ ion-content{
.item-date-active{
color: #fff;
}
.item-description{
font-size: 13px;
color: #000;
overflow: auto;
.item-message{
float: left;
padding-right: 5px;
}
.item-files{
float: left;
}
}
.item-description-active{
color: #fff;
@@ -130,7 +140,6 @@ ion-content{
@media only screen and (min-width: 701px) {
.main-content{
.aside-wrapper{
width: 35%;
border-right: 1px solid #d8d8d8;
src/app/pages/chat/messages/messages.page.ts
-4
View File
@@ -139,9 +139,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
let scroll = e.srcElement.scrollTop;
let windowHeight = e.srcElement.scrollHeight;
let containerHeight = windowHeight - e.srcElement.clientHeight;
console.log(this.startPosition);
console.log(windowHeight);
if (scroll > this.currentPosition) {
//alert('BOTTOM');
@@ -156,7 +153,6 @@ export class MessagesPage implements OnInit, AfterViewInit, OnDestroy {
this.scrollToBottomBtn = false;
}
this.currentPosition = scroll;
console.log(this.currentPosition);
}