From f006cd61127600560bcaabbb7fd96751bea8ce05 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 20 Aug 2021 12:31:14 +0100 Subject: [PATCH 1/6] save --- src/app/services/storage.service.ts | 10 +++++++--- 1 file changed, 7 insertions(+), 3 deletions(-) diff --git a/src/app/services/storage.service.ts b/src/app/services/storage.service.ts index 95ba38c25..884c6407c 100644 --- a/src/app/services/storage.service.ts +++ b/src/app/services/storage.service.ts @@ -16,15 +16,19 @@ const { Storage } = Plugins; */ // Get the value async get(key: string) { const ret = await this.storage.get(key).then((val) => { return val; }); - return JSON.parse(unescape(atob(ret))); + try { + return JSON.parse(unescape(atob(ret))); + } catch (error) { + return unescape(atob(ret)) + } } async remove(key: string){ await this.storage.remove(key); } - -/* + +/* // Get the value async get(storageKey: string) { const ret = await Storage.get({ key: storageKey }); From d2729a43b63338e1d9be738eb9c3dde57af0a89a Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 20 Aug 2021 12:55:39 +0100 Subject: [PATCH 2/6] save --- config.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/config.xml b/config.xml index 7b18d7926..97d2fb38d 100644 --- a/config.xml +++ b/config.xml @@ -3,7 +3,7 @@ gabinete digital An awesome Ionic/Cordova app. Ionic Framework Team - + From ef9858dbeae7ddc84325969135a16d33701908d6 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 20 Aug 2021 13:45:46 +0100 Subject: [PATCH 3/6] save --- src/app/shared/popover/chat-popover/chat-popover.page.html | 1 - src/app/shared/popover/chat-popover/chat-popover.page.ts | 6 +----- 2 files changed, 1 insertion(+), 6 deletions(-) diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index 806cedd83..c16ada8e6 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -8,7 +8,6 @@
- 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 58ead2ef5..990d70100 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.ts +++ b/src/app/shared/popover/chat-popover/chat-popover.page.ts @@ -25,7 +25,7 @@ export class ChatPopoverPage implements OnInit { } close(){ - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 701){ this.popoverController.dismiss('cancel'); this.modalController.dismiss('cancel'); } @@ -86,8 +86,4 @@ export class ChatPopoverPage implements OnInit { this.modalController.dismiss('edit'); } - bookMeeting(){ - - } - } From 68c8e334c0643e06e2b6ed2b68883fd5c94fa5cb Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 20 Aug 2021 14:45:44 +0100 Subject: [PATCH 4/6] save --- .../chat-options-features/chat-options-features.page.scss | 2 +- .../chat-options-features/chat-options-features.page.ts | 2 +- .../chat-options-popover/chat-options-popover.page.ts | 2 +- .../shared/popover/chat-popover/chat-popover.page.html | 2 +- .../shared/popover/chat-popover/chat-popover.page.scss | 8 +++++++- .../popover/messages-options/messages-options.page.scss | 4 ++-- .../popover/messages-options/messages-options.page.ts | 8 +++++--- src/global.scss | 2 +- 8 files changed, 19 insertions(+), 11 deletions(-) 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 3389864c6..86ac0ae4b 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 @@ -30,7 +30,7 @@ margin: 0 auto !important; margin-bottom: 10px; } -@media only screen and (min-width: 1024px) { +@media only screen and (min-width: 701px) { .arrow-right{ display: flex; justify-content: flex-end; diff --git a/src/app/modals/chat-options-features/chat-options-features.page.ts b/src/app/modals/chat-options-features/chat-options-features.page.ts index 9e419dc03..66fbb4545 100644 --- a/src/app/modals/chat-options-features/chat-options-features.page.ts +++ b/src/app/modals/chat-options-features/chat-options-features.page.ts @@ -46,7 +46,7 @@ export class ChatOptionsFeaturesPage implements OnInit { } close(){ - if( window.innerWidth <= 1024){ + if( window.innerWidth < 701){ this.popoverController.dismiss(); } else{ diff --git a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts index baf6f1d5a..bd38ed2c1 100644 --- a/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts +++ b/src/app/shared/popover/chat-options-popover/chat-options-popover.page.ts @@ -46,7 +46,7 @@ export class ChatOptionsPopoverPage implements OnInit { } close(){ - if( window.innerWidth <= 1024){ + if( window.innerWidth < 701){ this.popoverController.dismiss(); } else{ diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.html b/src/app/shared/popover/chat-popover/chat-popover.page.html index c16ada8e6..10bab132a 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.html +++ b/src/app/shared/popover/chat-popover/chat-popover.page.html @@ -6,7 +6,7 @@
- +
diff --git a/src/app/shared/popover/chat-popover/chat-popover.page.scss b/src/app/shared/popover/chat-popover/chat-popover.page.scss index 5605876c3..ceeee4fcf 100644 --- a/src/app/shared/popover/chat-popover/chat-popover.page.scss +++ b/src/app/shared/popover/chat-popover/chat-popover.page.scss @@ -25,7 +25,8 @@ border-top: 1px solid #bbb; margin: 10px auto !important; } -@media only screen and (min-width: 1024px) { + +@media only screen and (min-width: 701px) { .arrow-right{ display: flex; justify-content: flex-end; @@ -35,6 +36,10 @@ width: 100% !important; margin-bottom: 10px !important; } + .btn-cancel:hover, .btn-delete:hover{ + background-color: #42b9fe; + color: #fff !important; + } .btn-ok{ width: 100% !important; } @@ -48,4 +53,5 @@ .mobile-only{ display: none !important; } + } diff --git a/src/app/shared/popover/messages-options/messages-options.page.scss b/src/app/shared/popover/messages-options/messages-options.page.scss index 03fcefe0d..dd61665a1 100644 --- a/src/app/shared/popover/messages-options/messages-options.page.scss +++ b/src/app/shared/popover/messages-options/messages-options.page.scss @@ -25,7 +25,7 @@ border-top: 1px solid #bbb; margin: 0 auto !important; } -@media only screen and (min-width: 1024px) { +@media only screen and (min-width: 701px) { .arrow-right{ display: flex; justify-content: flex-end; @@ -43,4 +43,4 @@ /* .solid{ display: block; } */ -} \ No newline at end of file +} diff --git a/src/app/shared/popover/messages-options/messages-options.page.ts b/src/app/shared/popover/messages-options/messages-options.page.ts index 44262ee86..c6d3340b0 100644 --- a/src/app/shared/popover/messages-options/messages-options.page.ts +++ b/src/app/shared/popover/messages-options/messages-options.page.ts @@ -16,8 +16,8 @@ export class MessagesOptionsPage implements OnInit { private modalController: ModalController, private chatService: ChatService, private navParams: NavParams, - ) - { + ) + { this.roomId = this.navParams.get('roomId'); } @@ -25,11 +25,13 @@ export class MessagesOptionsPage implements OnInit { } close(){ - if( window.innerWidth <= 1024){ + if( window.innerWidth <= 701){ + this.modalController.dismiss(); this.popoverController.dismiss(); } else{ this.modalController.dismiss(); + this.popoverController.dismiss(); } } diff --git a/src/global.scss b/src/global.scss index 275a011df..841dad997 100644 --- a/src/global.scss +++ b/src/global.scss @@ -370,7 +370,7 @@ td.monthview-secondary-with-event, td.monthview-secondary-with-event[_ngcontent- border-radius: 0 0 25px 25px; } - @media only screen and (min-width: 1140px) { + @media only screen and (min-width: 701px) { .modal-wrapper{ max-width: 400px; } From d78e8bab591a2400ed8a899ae9c71389c1601aa6 Mon Sep 17 00:00:00 2001 From: "tiago.kayaya" Date: Fri, 20 Aug 2021 15:08:36 +0100 Subject: [PATCH 5/6] save --- src/app/pages/chat/messages/messages.page.html | 2 +- src/app/shared/chat/messages/messages.page.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/app/pages/chat/messages/messages.page.html b/src/app/pages/chat/messages/messages.page.html index 1972dea42..dfbf5e17a 100644 --- a/src/app/pages/chat/messages/messages.page.html +++ b/src/app/pages/chat/messages/messages.page.html @@ -11,7 +11,7 @@ {{users.name}}
-
+ -
+