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

save

Browse Source
This commit is contained in:
tiago.kayaya
2021-08-18 18:58:02 +01:00
parent 4439604772
commit 24e2a8f518
5000 changed files with 655398 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/app/pages/chat/group-messages/group-messages.page.scss
+5 -1
View File
@@ -22,7 +22,7 @@
.middle{
padding: 0!important;
float: left;
width: 280px;
width:calc(100% - 77px);
margin: 2.5px 0 0 5px;
}
.right{
@@ -60,6 +60,10 @@
.title{
font-size: 25px;
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
float: left;
}
.div-icon{
width: 40px;
src/app/pages/chat/group-messages/group-messages.page.ts
+1
View File
@@ -184,6 +184,7 @@ export class GroupMessagesPage implements OnInit, AfterViewChecked {
});
return await popover.present();
}
async addContacts(){
console.log(this.members);
src/app/pages/chat/messages/messages.page.html
+2 -2
View File
@@ -75,8 +75,8 @@
<ion-footer>
<div class="container width-100 d-flex">
<div>
<button class="btn-no-color"> <!-- (click)="openChatOptions()" -->
<ion-icon class="chat-icon-options" src="assets/icon/icons-chat-options.svg"></ion-icon>
<button class="btn-no-color" (click)="openChatOptions()">
<ion-icon class="chat-icon-options" src="assets/images/icons-add-new-event.svg"></ion-icon>
</button>
</div>
<div class="width-70">
src/app/pages/chat/messages/messages.page.scss
+7 -4
View File
@@ -29,7 +29,7 @@
.middle{
padding: 0!important;
float: left;
width: 280px;
width:calc(100% - 77px);
margin: 2.5px 0 0 5px;
display: flex;
align-items: center;
@@ -70,7 +70,9 @@
.title{
font-size: 25px;
overflow: auto;
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
float: left;
}
.div-icon{
@@ -154,14 +156,15 @@
.container{
justify-content: center;
justify-content: space-evenly;
align-items: center;
}
.chat-icon-options{
display:block !important;
font-size: 25px;
font-size: 35px;
float: right !important;
margin-top: 10px;
margin-top: 5px;
}
.chat-icon-send{
src/app/pages/chat/messages/messages.page.ts
+10 -1
View File
@@ -28,6 +28,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
dmUsers:any;
roomId:string;
el:any;
members:any;
constructor(
@@ -115,6 +116,7 @@ export class MessagesPage implements OnInit, AfterViewChecked {
getChatMembers(){
this.showLoader = true;
this.chatService.getMembers(this.roomId).subscribe(res=> {
this.members = res['members'];
this.dmUsers = res['members'].filter(data => data.username != this.loggedUser.me.username)
console.log(res);
console.log(this.dmUsers);
@@ -148,11 +150,18 @@ export class MessagesPage implements OnInit, AfterViewChecked {
modal.onDidDismiss();
}
async openChatOptions(ev?: any) {
async openChatOptions(ev?: any) {
console.log(this.members);
const popover = await this.popoverController.create({
component: ChatOptionsPopoverPage,
cssClass: 'chat-options-popover',
event: ev,
componentProps: {
room: this.roomId,
members: this.members,
eventSelectedDate: new Date(),
},
translucent: true
});
return await popover.present();
src/app/shared/chat/group-messages/group-messages.page.scss
+5 -2
View File
@@ -19,7 +19,7 @@
.middle{
padding: 0!important;
float: left;
width: 280px;
width:calc(100% - 77px);
margin: 2.5px 0 0 5px;
}
.right{
@@ -55,7 +55,10 @@
.title{
font-size: 25px;
border: 1px solid red;
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
float: left;
}
.div-icon{
width: 40px;
src/app/shared/chat/messages/messages.page.scss
+4 -2
View File
@@ -22,7 +22,7 @@
.middle{
//padding: 0!important;
float: left;
width: 280px;
width:calc(100% - 77px);
margin: 2px 0 0 5px;
display: flex;
align-items: center;
@@ -63,7 +63,9 @@
.title{
font-size: 25px;
overflow: auto;
white-space: nowrap;
overflow: hidden !important;
text-overflow: ellipsis !important;
float: left;
}
.div-icon{
src/app/shared/chat/messages/messages.page.ts
+3 -14
View File
@@ -10,6 +10,7 @@ import { MessagesOptionsPage } from 'src/app/shared/popover/messages-options/mes
import { ProfileComponent } from '../../headers/header-no-search/profile/profile.page';
import { ContactsPage } from '../new-group/contacts/contacts.page';
import { Router } from '@angular/router';
import { ChatOptionsFeaturesPage } from 'src/app/modals/chat-options-features/chat-options-features.page';
@Component({
selector: 'app-messages',
@@ -170,7 +171,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
}
openSendMessageOptions(ev?:any){
if(window.innerWidth <= 1024){
if(window.innerWidth < 701){
console.log('mobile');
this.openChatOptions(ev);
}
@@ -268,22 +269,10 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges {
return enterAnimation(baseEl).direction('reverse');
}
/* const popover = await this.popoverController.create({
component: MessagesOptionsPage,
componentProps: {
roomId: this.dm._id,
},
cssClass: 'messages-options',
event: ev,
translucent: true,
});
return await popover.present(); */
const modal = await this.modalController.create({
enterAnimation,
leaveAnimation,
component: ChatOptionsPopoverPage,
component: ChatOptionsFeaturesPage,
cssClass: 'model profile-modal search-submodal',
componentProps: {
roomId: this.roomId,