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

improve chat

Browse Source
This commit is contained in:
Peter Maquiran
2022-10-04 11:33:46 +01:00
parent b3dfb396f3
commit e738bf08f3
14 changed files with 74 additions and 144 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.html
+1 -1
View File
@@ -48,7 +48,7 @@
</ion-list>
</div>
<ion-virtual-scroll [items]="users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
<ion-virtual-scroll [items]="ChatSystemService.users | filter:textSearch: 'name'" approxItemHeight="70px" [headerFn]="separateLetter">
<div class="item-divider" *virtualHeader="let header">
<ion-label>{{header}}</ion-label>
src/app/shared/chat/group-messages/group-contacts/group-contacts.page.ts
+3 -6
View File
@@ -8,6 +8,7 @@ import { NewGroupPage } from '../../new-group/new-group.page';
import { GroupMessagesPage } from '../group-messages.page';
import { ThemeService } from 'src/app/services/theme.service'
import { SessionStore } from 'src/app/store/session.service';
import { ChatSystemService } from 'src/app/services/chat/chat-system.service';
@Component({
selector: 'app-group-contacts',
@@ -42,18 +43,14 @@ export class GroupContactsPage implements OnInit {
private http: HttpClient,
private chatService: ChatService,
private authService: AuthService,
public ThemeService: ThemeService
//private navParams: NavParams,
public ThemeService: ThemeService,
public ChatSystemService: ChatSystemService
)
{
this.loggedUser = authService.ValidatedUserChat['data'];
this.textSearch="";
this.dm=null;
this.room=null;
/* this.isGroupCreated = this.navParams.get('isCreated');
this.groupName = this.navParams.get('name');
this.room = this.navParams.get('room');
this.members = this.navParams.get('members'); */
}
ngOnInit() {
src/app/shared/chat/group-messages/group-messages.page.ts
-1
View File
@@ -163,7 +163,6 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe
}
ngOnInit() {
this.chatService.refreshtoken();
// console.log(this.roomId)
this.loggedUser = this.loggedUserChat;
//setTimeout(() => {
src/app/shared/chat/messages/contacts/contacts.page.html
+1 -1
View File
@@ -22,7 +22,7 @@
<ion-content>
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
<ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar>
<!-- <ion-progress-bar type="indeterminate" *ngIf="showLoader"></ion-progress-bar> -->
<ion-refresher-content>
</ion-refresher-content>
</ion-refresher>
src/app/shared/chat/messages/contacts/contacts.page.ts
+1 -24
View File
@@ -14,13 +14,10 @@ import { SessionStore } from 'src/app/store/session.service';
styleUrls: ['./contacts.page.scss'],
})
export class ContactsPage implements OnInit {
showLoader: boolean;
loggedUser: any;
users = [];
headers: HttpHeaders;
options:any;
contacts:any;
textSearch:string;
room:any;
dm:any;
@@ -45,9 +42,6 @@ export class ContactsPage implements OnInit {
async ngOnInit() {
this.loadUsers();
await this.chatService.refreshtoken();
this.loadUsers();
}
onChange(event){
@@ -71,24 +65,7 @@ export class ContactsPage implements OnInit {
}
loadUsers() {
this.options = {
headers: this.headers,
};
this.chatService.getAllUsers().subscribe((res:any)=> {
//this.contacts = res.users.filter(data => data.username != this.sessionStore.user.UserName);
this.contacts = res.users.filter(data => data.username != this.sessionStore.user.UserName);
this.users = this.contacts.sort((a,b) => {
if(a.name < b.name){
return -1;
}
if(a.name > b.name){
return 1;
}
return 0;
});
this.showLoader = false;
});
this.ChatSystemService.getUser()
}
separateLetter(record, recordIndex, records){
src/app/shared/chat/messages/messages.page.html
+2 -2
View File
@@ -3,9 +3,9 @@
<div class="main-header">
<div class="header-top">
<div class="middle">
<ion-label class="title">{{ this.ChatSystemService.getDmRoom(this.roomId).name }}</ion-label>
<ion-label class="title">{{ ChatSystemService.getDmRoom(this.roomId).name }}</ion-label>
<button (click)="ChatMessageDebuggingPage()">Dev</button>
<!-- <span><ion-icon class="{{users.status}}" name="ellipse"></ion-icon></span> -->
<span><ion-icon class="{{ ChatSystemService.getDmRoom(this.roomId).online }}" name="ellipse"></ion-icon></span>
</div>
<div hidden class="right">
<button title="Menu" class="btn-no-color" (click)="_openMessagesOptions()">
src/app/shared/chat/new-group/contacts/contacts.page.ts
+5 -83
View File
@@ -1,8 +1,8 @@
import { HttpHeaders } from '@angular/common/http';
import { Component, OnInit } from '@angular/core';
import { ModalController } from '@ionic/angular';
import { GroupMessagesPage } from '../../group-messages/group-messages.page';
import { ThemeService } from 'src/app/services/theme.service'
import { ChatSystemService } from 'src/app/services/chat/chat-system.service'
@Component({
selector: 'app-contacts',
@@ -10,58 +10,15 @@ import { ThemeService } from 'src/app/services/theme.service'
styleUrls: ['./contacts.page.scss'],
})
export class ContactsPage implements OnInit {
showLoader: boolean;
users = [];
contact: string[] = [" Ana M.", "Andre F.", "Bruno G.", "Catarina T", "Tiago"];
headers: HttpHeaders;
options:any;
contacts = [
{
first: 'Ana',
last: 'Manuel',
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
},
{
first: 'Abdullah',
last: 'Hill',
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
},
{
first: 'Batur',
last: 'Oymen',
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
},
{
first: 'Bianca',
last: 'Costa',
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
},
{
first: 'Zaya',
last: 'Mary',
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
},
{
first: 'Tiago',
last: 'Kayaya',
url: 'https://randomuser.me/api/portraits/med/women/54.jpg',
}
];
constructor(
private modalController: ModalController,
public ThemeService: ThemeService
public ThemeService: ThemeService,
public ChatSystemService: ChatSystemService
)
{
this.headers = new HttpHeaders();
this.headers = this.headers.set('Access-Control-Allow-Origin' , '*');
this.headers = this.headers.set('Access-Control-Allow-Methods', 'POST, GET, OPTIONS, PUT');
this.headers = this.headers.set('Accept','application/json');
this.headers = this.headers.set('content-type','application/json');
}
ngOnInit() {
@@ -70,46 +27,11 @@ export class ContactsPage implements OnInit {
}
loadUsers(){
this.options = {
headers: this.headers,
};
/* this.http.get('https://randomuser.me/api/?results=100', this.options)
.subscribe(res => {
this.users = res['results'].sort((a,b) => {
if(a.name.first < b.name.first){
return -1;
}
if(a.name.first > b.name.first){
return 1;
}
return 0;
});
}); */
this.users = this.contacts.sort((a,b) => {
if(a.first < b.first){
return -1;
}
if(a.first > b.first){
return 1;
}
return 0;
});
this.ChatSystemService.getUser()
}
separateLetter(record, recordIndex, records){
/* if(recordIndex == 0){
return record.name.first[0];
}
let first_prev = records[recordIndex - 1].name.first[0];
let first_current = record.name.first[0];
if(first_prev != first_current){
return first_current;
}
return null; */
if(recordIndex == 0){
return record.first[0];
}