diff --git a/src/app/modals/chat-options-features/chat-options-features.page.html b/src/app/modals/chat-options-features/chat-options-features.page.html index 8b387656a..d7c27f6b5 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.html +++ b/src/app/modals/chat-options-features/chat-options-features.page.html @@ -5,10 +5,10 @@
- - - - + + + +
diff --git a/src/app/modals/chat-options-features/chat-options-features.page.scss b/src/app/modals/chat-options-features/chat-options-features.page.scss index 7e30d88ff..3389864c6 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.scss +++ b/src/app/modals/chat-options-features/chat-options-features.page.scss @@ -40,6 +40,7 @@ } .btn-cancel:hover{ background-color: #42b9fe; + color: #fff !important; } .mobile-only{ display: none !important; diff --git a/src/app/pages/chat/chat.page.html b/src/app/pages/chat/chat.page.html index 925be1fda..9d8259898 100644 --- a/src/app/pages/chat/chat.page.html +++ b/src/app/pages/chat/chat.page.html @@ -111,6 +111,8 @@ [style.display]="showMessages ? 'flex' : 'none'" (closeAllDesktopComponents)="closeAllDesktopComponents()" (showEmptyContainer)="showEmptyContainer()" + (showEmptyContainer)="showEmptyContainer()" + (openNewEventPage)="openNewEventPage($event)" [style.display]="showMessages ? 'flex' : 'none'" [roomId]="roomId" [showMessages]="showMessages" #messagecontainer> diff --git a/src/app/shared/chat/messages/messages.page.html b/src/app/shared/chat/messages/messages.page.html index 0e4ce007b..18fe275d1 100644 --- a/src/app/shared/chat/messages/messages.page.html +++ b/src/app/shared/chat/messages/messages.page.html @@ -51,7 +51,7 @@
diff --git a/src/app/shared/chat/messages/messages.page.scss b/src/app/shared/chat/messages/messages.page.scss index dfaf654ff..657d5510a 100644 --- a/src/app/shared/chat/messages/messages.page.scss +++ b/src/app/shared/chat/messages/messages.page.scss @@ -165,9 +165,9 @@ .chat-icon-options{ display:block !important; - font-size: 25px; + font-size: 35px; float: right !important; - margin-top: 10px; + margin-top: 5px; } .chat-icon-send{ diff --git a/src/app/shared/chat/messages/messages.page.ts b/src/app/shared/chat/messages/messages.page.ts index d9b161f7e..2d5347fb3 100644 --- a/src/app/shared/chat/messages/messages.page.ts +++ b/src/app/shared/chat/messages/messages.page.ts @@ -1,4 +1,4 @@ -import { AfterViewChecked, Component, ElementRef, Input, OnChanges, OnInit, SimpleChanges, ViewChild } from '@angular/core'; +import { AfterViewChecked, Component, ElementRef, EventEmitter, Input, OnChanges, OnInit, Output, SimpleChanges, ViewChild } from '@angular/core'; import { AnimationController, ModalController, PopoverController } from '@ionic/angular'; import { AlertService } from 'src/app/services/alert.service'; import { AuthService } from 'src/app/services/auth.service'; @@ -29,10 +29,13 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { userPresence=''; dmUsers:any; checktimeOut: boolean; + members:any; @Input() roomId:string; @Input() showMessages:string; + @Output() openNewEventPage:EventEmitter = new EventEmitter(); + connection = connection @@ -67,15 +70,11 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { console.log(this.roomId); console.log("Chat route", this.route.url) - - } ngOnDestroy(){ this.checktimeOut = false; console.log('On Destroy') - - } notImplemented(){ @@ -106,6 +105,14 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { } } + openBookMeetingComponent(){ + let data = { + roomId: this.roomId, + members: this.members + } + this.openNewEventPage.emit(data); + } + sendMessage() { this.connection.$send({}) @@ -141,6 +148,7 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { //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); @@ -280,9 +288,22 @@ export class MessagesPage implements OnInit, AfterViewChecked, OnChanges { cssClass: 'model profile-modal search-submodal', componentProps: { roomId: this.roomId, + members: this.members, } }); - return await modal.present(); + await modal.present(); + modal.onDidDismiss().then((res)=>{ + console.log(res['data']); + if(res['data'] == 'meeting'){ + //this.closeAllDesktopComponents.emit(); + let data = { + roomId: this.roomId, + members: this.members + } + this.openNewEventPage.emit(data); + } + + }); } async serverLongPull(){ diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html index a3adebd27..0525e41fe 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.html @@ -5,34 +5,13 @@
- - - - + + + +
-