mirror of
https://code.equilibrium.co.ao/ITO/doneit-web.git
synced 2026-04-19 13:02:56 +00:00
Merge branch 'bugfix/chat-tab' into develop_bitOut
This commit is contained in:
@@ -27,7 +27,8 @@
|
||||
</button>
|
||||
</div>
|
||||
</div>
|
||||
<ion-toolbar>
|
||||
|
||||
<ion-toolbar [class.block-button]="showNewEvent || showNewGroup || showContacts">
|
||||
<ion-segment [(ngModel)]="segment" (ionChange)="onSegmentChange()">
|
||||
<ion-segment-button value="Contactos">
|
||||
Conversas
|
||||
@@ -198,6 +199,7 @@
|
||||
|
||||
<app-contacts
|
||||
(openMessage)="openMessagesPage($event)"
|
||||
(emptyTextDescriptionOpen)="emptyTextDescriptionOpen()"
|
||||
*ngIf="showContacts"
|
||||
[style.display]="showContacts ? 'flex' : 'none'"
|
||||
class=" height-100 flex-column">
|
||||
@@ -205,6 +207,7 @@
|
||||
|
||||
<app-new-group
|
||||
(addGroupMessage)="openGroupContactsPage($event)"
|
||||
(closeAllDesktopComponents)="closeAllDesktopComponents()"
|
||||
[style.display]="showNewGroup ? 'flex' : 'none'"
|
||||
class=" height-100 flex-column">
|
||||
</app-new-group>
|
||||
|
||||
@@ -182,4 +182,9 @@ ion-content{
|
||||
|
||||
.bold-message {
|
||||
font-weight: bold;
|
||||
}
|
||||
|
||||
.block-button {
|
||||
pointer-events: none;
|
||||
opacity: 0.2;
|
||||
}
|
||||
@@ -604,6 +604,12 @@ export class ChatPage implements OnInit {
|
||||
|
||||
}
|
||||
|
||||
|
||||
async emptyTextDescriptionOpen() {
|
||||
this.closeAllDesktopComponents()
|
||||
this.showEmptyComponent = true
|
||||
}
|
||||
|
||||
async getGroups(event?) {
|
||||
this.result = this.chatService.getAllPrivateGroups().subscribe(async (res: any) => {
|
||||
//
|
||||
@@ -701,8 +707,6 @@ export class ChatPage implements OnInit {
|
||||
|
||||
async openGroupMessagesModal(roomId: any) {
|
||||
|
||||
|
||||
|
||||
const modal = await this.modalController.create({
|
||||
component: GroupMessagesPage,
|
||||
cssClass: 'modal modal-desktop isGroupChatOpened',
|
||||
|
||||
@@ -4,6 +4,7 @@
|
||||
<div class="title-content width-100">
|
||||
<div class="left">
|
||||
<button class="btn-no-color" (click)="close()">
|
||||
/././../
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'default' " slot="end" src='assets/images/icons-arrow-arrow-left.svg'></ion-icon>
|
||||
<ion-icon *ngIf="ThemeService.currentTheme == 'gov' " slot="end" src='assets/images/theme/gov/icons-calendar-arrow-left.svg'></ion-icon>
|
||||
</button>
|
||||
|
||||
Reference in New Issue
Block a user