From 5152d9ad304fe8a05db8dedcb76dd0c2df194568 Mon Sep 17 00:00:00 2001 From: gofnnp Date: Wed, 8 Mar 2023 00:29:44 +0400 Subject: [PATCH] =?UTF-8?q?dev=20#13882=20=D0=BF=D1=80=D0=B0=D0=B2=D0=BA?= =?UTF-8?q?=D0=B8?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../bonus-program/bonus-program.component.scss | 4 +++- angular/src/app/pages/main/main.component.ts | 11 +++++++++-- angular/src/app/services/messaging.service.ts | 4 ++++ 3 files changed, 16 insertions(+), 3 deletions(-) diff --git a/angular/src/app/pages/account/bonus-program/bonus-program.component.scss b/angular/src/app/pages/account/bonus-program/bonus-program.component.scss index 623bb5d..2f3885f 100644 --- a/angular/src/app/pages/account/bonus-program/bonus-program.component.scss +++ b/angular/src/app/pages/account/bonus-program/bonus-program.component.scss @@ -198,12 +198,14 @@ } .add-to-wallet { - margin-top: 12px; height: 36px; border-radius: 8px; background: #09467f; border-color: #09467f; color: #fff; + max-width: 400px; + width: 100%; + margin: 12px auto 0; } } } diff --git a/angular/src/app/pages/main/main.component.ts b/angular/src/app/pages/main/main.component.ts index 92405d9..7f6270a 100644 --- a/angular/src/app/pages/main/main.component.ts +++ b/angular/src/app/pages/main/main.component.ts @@ -34,6 +34,7 @@ export class MainComponent implements OnInit { public el: ElementRef, public renderer: Renderer2, private messagingService: MessagingService, + private messageService: MessageService, private cookiesService: CookiesService, ) { route.queryParams.subscribe((params) => { @@ -57,8 +58,14 @@ export class MainComponent implements OnInit { } requestPermission() { - if ('safari' in window) { - console.log('safari'); + const userAgent = window.navigator.userAgent.toLowerCase(); + const ios = /iphone|ipod|ipad/.test(userAgent); + if (ios) { + this.messageService.add({ + severity: 'custom', + summary: `Чтобы получать уведомления, добавьте карту в Apple Wallet`, + life: 5000, + }); // var permissionData = window.safari.pushNotification.permission('web.com.example.domain'); // $scope.checkRemotePermission(permissionData); diff --git a/angular/src/app/services/messaging.service.ts b/angular/src/app/services/messaging.service.ts index bd6f9b9..0e905b9 100644 --- a/angular/src/app/services/messaging.service.ts +++ b/angular/src/app/services/messaging.service.ts @@ -86,5 +86,9 @@ export class MessagingService { console.log('new message received. ', payload); this.currentMessage.next(payload); }); + this.angularFireMessaging.onMessage((res) => { + console.log('@@@@: ', res); + + }) } }