git pull made and peter chnages recived

This commit is contained in:
Eudes Inácio
2023-03-09 16:58:34 +01:00
74 changed files with 296 additions and 274 deletions
-2
View File
@@ -17,7 +17,6 @@ import { EditGroupPageModule } from 'src/app/shared/chat/edit-group/edit-group.m
import { GroupContactsPageModule } from 'src/app/shared/chat/group-messages/group-contacts/group-contacts.module';
import { MessagesPageModule } from 'src/app/shared/chat/messages/messages.module';
import { EmptyChatPageModule } from 'src/app/shared/chat/empty-chat/empty-chat.module';
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';
@@ -32,7 +31,6 @@ import { ImageCropperModule } from 'ngx-image-cropper';
PipesModule,
ChatPageRoutingModule,
RouterModule,
HeaderPageModule,
MessagesPageModule,
ContactsPageModule,
GroupMessagesPageModule,
-4
View File
@@ -1,7 +1,3 @@
<ion-header class="ion-no-border">
<app-header></app-header>
</ion-header>
<ion-content class="height-100 container-wrapper">
<ion-refresher name="refresher" slot="fixed" (ionRefresh)="doRefresh($event)">
@@ -549,6 +549,9 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
else if (res.data == 'edit') {
this.editGroup(this.roomId);
} else if (res.data == 'addUser') {
this.addContacts();
}
});
}
@@ -823,25 +826,27 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy {
}
async addContacts() {
if(this.isAdmin) {
const modal = await this.modalController.create({
component: GroupContactsPage,
componentProps: {
isCreated: this.isGroupCreated,
room: this.room,
members: this.members,
name: this.room.name,
},
cssClass: 'contacts',
backdropDismiss: false
});
const modal = await this.modalController.create({
component: GroupContactsPage,
componentProps: {
isCreated: this.isGroupCreated,
room: this.room,
members: this.members,
name: this.room.name,
},
cssClass: 'contacts',
backdropDismiss: false
});
await modal.present();
modal.onDidDismiss().then(() => {
this.getRoomInfo();
});
}
await modal.present();
modal.onDidDismiss().then(() => {
this.getRoomInfo();
});
}
async editGroup(roomId) {