From a25b8ba40f25c50166eebfe285a91d8f00543a5d Mon Sep 17 00:00:00 2001 From: Peter Maquiran Date: Fri, 10 Mar 2023 11:41:44 +0100 Subject: [PATCH] fix chat --- src/app/pages/chat/chat.page.ts | 4 ++- .../group-messages/group-messages.page.ts | 2 +- .../group-messages/group-messages.page.ts | 2 +- .../popover/chat-popover/chat-popover.page.ts | 17 +++--------- src/theme/variables.scss | 26 +++++++++++++++++++ version/git-version.ts | 12 ++++----- 6 files changed, 40 insertions(+), 23 deletions(-) diff --git a/src/app/pages/chat/chat.page.ts b/src/app/pages/chat/chat.page.ts index 31f8c4831..42b5f2efe 100644 --- a/src/app/pages/chat/chat.page.ts +++ b/src/app/pages/chat/chat.page.ts @@ -816,7 +816,9 @@ export class ChatPage implements OnInit { }, }); await modal.present(); - modal.onDidDismiss(); + modal.onDidDismiss().then(() =>{ + this.ChatSystemService.currentRoom.roomLeave() + }); } } diff --git a/src/app/pages/chat/group-messages/group-messages.page.ts b/src/app/pages/chat/group-messages/group-messages.page.ts index 2b1529809..4901d347a 100644 --- a/src/app/pages/chat/group-messages/group-messages.page.ts +++ b/src/app/pages/chat/group-messages/group-messages.page.ts @@ -528,7 +528,7 @@ export class GroupMessagesPage implements OnInit, AfterViewInit, OnDestroy { async openOptions() { const modal = await this.popoverController.create({ component: ChatPopoverPage, - cssClass: 'chat-popover', + cssClass: 'popover-bottom', componentProps: { roomId: this.roomId, members: this.members, diff --git a/src/app/shared/chat/group-messages/group-messages.page.ts b/src/app/shared/chat/group-messages/group-messages.page.ts index 5ac3f36a4..249aa5739 100644 --- a/src/app/shared/chat/group-messages/group-messages.page.ts +++ b/src/app/shared/chat/group-messages/group-messages.page.ts @@ -519,7 +519,7 @@ export class GroupMessagesPage implements OnInit, OnChanges, AfterViewInit, OnDe enterAnimation, leaveAnimation, component: ChatPopoverPage, - cssClass: 'model profile-modal search-submodal chat-aside', + cssClass: 'model search-submodal chat-option-aside', componentProps: { roomId: this.roomId, members: this.members, diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.ts b/src/app/shared/popover/chat-popover/chat-popover.page.ts index 2ee30fe75..48c217b02 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -39,10 +39,8 @@ export class ChatPopoverPage implements OnInit { close(action:any){ if( window.innerWidth < 701){ this.popoverController.dismiss(action); - this.modalController.dismiss(action) } else{ - this.popoverController.dismiss(action); this.modalController.dismiss(action) } } @@ -123,25 +121,16 @@ export class ChatPopoverPage implements OnInit { }); } }); - this.popoverController.dismiss('delete'); - this.modalController.dismiss('delete') + this.close('delete'); } async openChangeGroupName(){ - if( window.innerWidth < 701){ - this.popoverController.dismiss('edit'); - this.modalController.dismiss('edit') - } - else{ - this.popoverController.dismiss('edit'); - this.modalController.dismiss('edit') - } + this.close('edit'); } async addUser() { - this.popoverController.dismiss('addUser'); - this.modalController.dismiss('addUser') + this.close('addUser'); } } diff --git a/src/theme/variables.scss b/src/theme/variables.scss index 664b0a0b1..a59fe8646 100644 --- a/src/theme/variables.scss +++ b/src/theme/variables.scss @@ -348,6 +348,32 @@ $app-theme: mat-light-theme( right: 0 !important; top: unset !important; } + +.popover-bottom::part(content), .popover-bottom .popover-content { + top: unset !important; + bottom: 0px; + position: absolute; + width: 100%; + left: 0px !important; + right: 0px; +} + +.chat-option-aside::part(content), .chat-option-aside .modal-wrapper{ + position: absolute; + right: 0px; + height: 90%; + max-width: 100%; + top: -40px; + border-radius: 0 0 25px 25px; + -webkit-border-radius: 0 0 25px 25px; + -moz-border-radius: 0 0 25px 25px; + -ms-border-radius: 0 0 25px 25px; + -o-border-radius: 0 0 25px 25px; + max-width: 400px; + width: 100%; + opacity: 1; +} + .exp-options .popover-content { width: 100% !important; left: 0 !important; diff --git a/version/git-version.ts b/version/git-version.ts index a81b15cc3..b1ffa625c 100644 --- a/version/git-version.ts +++ b/version/git-version.ts @@ -1,12 +1,12 @@ export let versionData = { - "shortSHA": "a558e835a", - "SHA": "a558e835a044e44664bb473f0e70428ad8a82b56", + "shortSHA": "9c7281ce4", + "SHA": "9c7281ce48b7bd3b792db5b350d99dd7cf06f60e", "branch": "no_bug_movemente", "lastCommitAuthor": "'Peter Maquiran'", - "lastCommitTime": "'Thu Mar 9 17:13:19 2023 +0100'", - "lastCommitMessage": "remove plugin and remove header", - "lastCommitNumber": "4857", + "lastCommitTime": "'Thu Mar 9 17:14:42 2023 +0100'", + "lastCommitMessage": "fix", + "lastCommitNumber": "4858", "change": "", - "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/shared/publication/view-publications/view-publications.page.ts", + "changeStatus": "On branch no_bug_movemente\nChanges to be committed:\n (use \"git restore --staged ...\" to unstage)\n\tmodified: src/app/pages/chat/chat.page.ts\n\tmodified: src/app/pages/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/chat/group-messages/group-messages.page.ts\n\tmodified: src/app/shared/popover/chat-popover/chat-popover.page.ts\n\tmodified: src/theme/variables.scss\n\tmodified: version/git-version.ts", "changeAuthor": "peter.maquiran" } \ No newline at end of file