This commit is contained in:
Peter Maquiran
2022-02-24 14:59:47 +01:00
parent 945dd72142
commit ef0e724f58
15 changed files with 72 additions and 15 deletions
+5
View File
@@ -16504,6 +16504,11 @@
"tslib": "^2.0.0" "tslib": "^2.0.0"
} }
}, },
"ngx-letters-avatar": {
"version": "1.0.2",
"resolved": "https://registry.npmjs.org/ngx-letters-avatar/-/ngx-letters-avatar-1.0.2.tgz",
"integrity": "sha512-mCQtMCAM+r+emSruczu3EKGzZuGxvHU0TRcx3P9RQ9at/BWd6cTz2bkz3uJm0T5TwaXRNwTe/NNySx+/NqD2Mw=="
},
"ngx-socket-io": { "ngx-socket-io": {
"version": "3.4.0", "version": "3.4.0",
"resolved": "https://registry.npmjs.org/ngx-socket-io/-/ngx-socket-io-3.4.0.tgz", "resolved": "https://registry.npmjs.org/ngx-socket-io/-/ngx-socket-io-3.4.0.tgz",
+1
View File
@@ -137,6 +137,7 @@
"ngx-cookie-service": "^12.0.3", "ngx-cookie-service": "^12.0.3",
"ngx-image-compress": "^11.0.3", "ngx-image-compress": "^11.0.3",
"ngx-image-cropper": "^5.0.1", "ngx-image-cropper": "^5.0.1",
"ngx-letters-avatar": "^1.0.2",
"ngx-socket-io": "^3.2.0", "ngx-socket-io": "^3.2.0",
"pdfjs": "^2.4.6", "pdfjs": "^2.4.6",
"pdfjs-dist": "^2.9.359", "pdfjs-dist": "^2.9.359",
@@ -15,6 +15,7 @@ import { BtnModalDismissPageModule } from 'src/app/shared/btn-modal-dismiss/btn-
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { ImageCropperModule } from 'ngx-image-cropper'; import { ImageCropperModule } from 'ngx-image-cropper';
import { AngularCropperjsModule } from 'angular-cropperjs'; import { AngularCropperjsModule } from 'angular-cropperjs';
import { LettersAvatarModule } from "ngx-letters-avatar";
@NgModule({ @NgModule({
imports: [ imports: [
@@ -25,6 +26,7 @@ import { AngularCropperjsModule } from 'angular-cropperjs';
GroupMessagesPageRoutingModule, GroupMessagesPageRoutingModule,
ChatPopoverPageModule, ChatPopoverPageModule,
BtnModalDismissPageModule, BtnModalDismissPageModule,
LettersAvatarModule
/* ImageCropperModule, /* ImageCropperModule,
AngularCropperjsModule */ AngularCropperjsModule */
@@ -346,8 +346,16 @@
.typing { .typing {
position: relative; position: relative;
top: -34px; top: -25px;
height: 0px; height: 0px;
left: 0px; left: 0px;
margin-left: 22px; margin-left: 22px;
display: flex;
font-size: 12px;
align-items: center;
}
.typing ngx-letters-avatar {
padding-left: 10px;
} }
@@ -11,7 +11,7 @@ import { SharedModule } from 'src/app/shared/shared.module';
import { BtnModalDismissPage } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page'; import { BtnModalDismissPage } from 'src/app/shared/btn-modal-dismiss/btn-modal-dismiss.page';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { MatMenuModule } from '@angular/material/menu'; import { MatMenuModule } from '@angular/material/menu';
import { LettersAvatarModule } from "ngx-letters-avatar";
@NgModule({ @NgModule({
imports: [ imports: [
@@ -21,6 +21,7 @@ import { MatMenuModule } from '@angular/material/menu';
FontAwesomeModule, FontAwesomeModule,
MessagesPageRoutingModule, MessagesPageRoutingModule,
MatMenuModule, MatMenuModule,
LettersAvatarModule
], ],
declarations: [MessagesPage] declarations: [MessagesPage]
}) })
@@ -307,8 +307,16 @@ display: block;
.typing { .typing {
position: relative; position: relative;
top: -34px; top: -25px;
height: 0px; height: 0px;
left: 0px; left: 0px;
margin-left: 22px; margin-left: 22px;
display: flex;
font-size: 12px;
align-items: center;
}
.typing ngx-letters-avatar {
padding-left: 10px;
} }
+3 -3
View File
@@ -49,7 +49,7 @@ export class MessageService {
private WsChatService: WsChatService) { private WsChatService: WsChatService) {
} }
setData({customFields, channels, mentions, msg ,rid ,ts, u, t, _id, _updatedAt, file, attachments, temporaryData, localReference}:Message) { setData({customFields = {}, channels, mentions, msg ,rid ,ts, u, t, _id, _updatedAt, file, attachments, temporaryData, localReference}:Message) {
this.customFields = customFields this.customFields = customFields
this.channels = channels || [] this.channels = channels || []
this.mentions = mentions || [] this.mentions = mentions || []
@@ -124,7 +124,7 @@ export class MessageService {
if (environment.chatOffline) { if (environment.chatOffline) {
this.redefinedMessage(ChatMessage) // this.redefinedMessage(ChatMessage)
this.offline = false this.offline = false
} }
@@ -155,7 +155,7 @@ export class MessageService {
let ChatMessage = message.result let ChatMessage = message.result
if (environment.chatOffline) { if (environment.chatOffline) {
this.redefinedMessage(ChatMessage) // this.redefinedMessage(ChatMessage)
this.offline = false this.offline = false
} }
+2 -2
View File
@@ -11,9 +11,9 @@ export class NfService {
downloadFileMsg = async (message: MessageService, room?: RoomService): Promise<boolean> => new Promise ((resolve, reject)=> (resolve(true))); downloadFileMsg = async (message: MessageService, room?: RoomService): Promise<boolean> => new Promise ((resolve, reject)=> (resolve(true)));
fix_updatedAt(message) { fix_updatedAt(message) {
if (message.result) { if (message?.result) {
message.result._updatedAt = message.result._updatedAt['$date'] message.result._updatedAt = message.result._updatedAt['$date']
} else if(message._updatedAt) { } else if(message?._updatedAt) {
if(message._updatedAt.hasOwnProperty('$date')) { if(message._updatedAt.hasOwnProperty('$date')) {
message._updatedAt = message._updatedAt['$date'] message._updatedAt = message._updatedAt['$date']
} }
+2 -2
View File
@@ -71,7 +71,7 @@ export class RoomService {
this.NativeNotificationService.askForPermission() this.NativeNotificationService.askForPermission()
} }
setData({ customFields, id, name, t, lastMessage = new MessageService(this.storage, this.NfService, this.WsChatService), _updatedAt }) { setData({ customFields = {}, id, name, t, lastMessage = new MessageService(this.storage, this.NfService, this.WsChatService), _updatedAt }) {
this.customFields = customFields this.customFields = customFields
this.id = id this.id = id
this.name = name this.name = name
@@ -184,7 +184,7 @@ export class RoomService {
let index; let index;
const find = messages.find((message, _index)=> { const find = messages.find((message, _index)=> {
if(message.localReference) { if(message.localReference) {
if(message.localReference == ChatMessage.localReference) { if(message?.localReference == ChatMessage?.localReference) {
index = _index index = _index
return true return true
} }
@@ -14,6 +14,7 @@ import { NewEventPageModule } from '../../agenda/new-event/new-event.module';
import { PdfViewerModule } from 'ng2-pdf-viewer'; import { PdfViewerModule } from 'ng2-pdf-viewer';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import {MatMenuModule} from '@angular/material/menu'; import {MatMenuModule} from '@angular/material/menu';
import { LettersAvatarModule } from "ngx-letters-avatar";
@NgModule({ @NgModule({
imports: [ imports: [
@@ -24,7 +25,8 @@ import {MatMenuModule} from '@angular/material/menu';
PdfViewerModule, PdfViewerModule,
ChatPopoverPageModule, ChatPopoverPageModule,
GroupMessagesPageRoutingModule, GroupMessagesPageRoutingModule,
MatMenuModule MatMenuModule,
LettersAvatarModule
// //
], ],
exports: [GroupMessagesPage], exports: [GroupMessagesPage],
@@ -276,8 +276,16 @@
.typing { .typing {
position: relative; position: relative;
top: -34px; top: -25px;
height: 0px; height: 0px;
left: 0px; left: 0px;
margin-left: 22px; margin-left: 22px;
display: flex;
font-size: 12px;
align-items: center;
}
.typing ngx-letters-avatar {
padding-left: 10px;
} }
@@ -11,6 +11,7 @@ import { SharedModule } from 'src/app/shared/shared.module';
import { FontAwesomeModule } from '@fortawesome/angular-fontawesome'; import { FontAwesomeModule } from '@fortawesome/angular-fontawesome';
import { MatButtonModule } from '@angular/material/button'; import { MatButtonModule } from '@angular/material/button';
import {MatMenuModule} from '@angular/material/menu'; import {MatMenuModule} from '@angular/material/menu';
import { LettersAvatarModule } from "ngx-letters-avatar";
@NgModule({ @NgModule({
imports: [ imports: [
@@ -20,7 +21,8 @@ import {MatMenuModule} from '@angular/material/menu';
FontAwesomeModule, FontAwesomeModule,
MessagesPageRoutingModule, MessagesPageRoutingModule,
MatButtonModule, MatButtonModule,
MatMenuModule MatMenuModule,
LettersAvatarModule
], ],
exports: [MessagesPage], exports: [MessagesPage],
@@ -198,7 +198,14 @@
<ion-footer> <ion-footer>
<div class="typing" >A escrever...</div> <div class="typing" >
<ngx-letters-avatar *ngIf="showAvatar"
[avatarName]= "wsChatMethodsService.getDmRoom(roomId).name"
[width]="30"
[circular]="true"
fontFamily="Open Sans"></ngx-letters-avatar>
A escrever...
</div>
<div class="container width-100 d-flex"> <div class="container width-100 d-flex">
<div> <div>
@@ -316,8 +316,16 @@ display: block;
.typing { .typing {
position: relative; position: relative;
top: -34px; top: -25px;
height: 0px; height: 0px;
left: 0px; left: 0px;
margin-left: 22px; margin-left: 22px;
display: flex;
font-size: 12px;
align-items: center;
}
.typing ngx-letters-avatar {
padding-left: 10px;
} }
@@ -78,6 +78,8 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
downloadFile: any; downloadFile: any;
massages: MessageService[] = [] massages: MessageService[] = []
showAvatar = true
constructor( constructor(
public popoverController: PopoverController, public popoverController: PopoverController,
private modalController: ModalController, private modalController: ModalController,
@@ -121,8 +123,11 @@ export class MessagesPage implements OnInit, OnChanges, AfterViewInit, OnDestroy
let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise() let guid: any = await this.AttachmentsService.uploadFile(formData).toPromise()
} }
this.showAvatar = false
setTimeout(() => { setTimeout(() => {
this.scrollToBottomClicked() this.scrollToBottomClicked()
this.showAvatar = true
}, 150) }, 150)
} }