From d66f72dc2ed3a6b5c00b7df57164fc30ef38b231 Mon Sep 17 00:00:00 2001
From: nikolay <gugalohikolaychur@gmail.com>
Date: Mon, 19 Jun 2023 10:04:45 +0400
Subject: [PATCH] =?UTF-8?q?dev=20#14537=20=D0=94=D0=BE=D0=B1=D0=B0=D0=B2?=
 =?UTF-8?q?=D0=B8=D1=82=D1=8C=20=D0=BA=D0=BD=D0=BE=D0=BF=D0=BA=D1=83=20?=
 =?UTF-8?q?=D0=BF=D0=BE=D0=B4=D0=BF=D0=B8=D1=81=D0=BA=D0=B8=20=D0=BD=D0=B0?=
 =?UTF-8?q?=20=D1=83=D0=B2=D0=B5=D0=B4=D0=BE=D0=BC=D0=BB=D0=B5=D0=BD=D0=B8?=
 =?UTF-8?q?=D1=8F=20CL?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 .../components/navbar/navbar.component.html        | 12 +++++++++++-
 .../components/navbar/navbar.component.scss        | 14 +++++++++++++-
 .../components/navbar/navbar.component.ts          |  4 +++-
 .../pages/guest-card/guest-card.component.ts       |  1 -
 angular/src/app/services/messaging.service.ts      |  1 +
 5 files changed, 28 insertions(+), 4 deletions(-)

diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html
index c3ba5c6..005236d 100644
--- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html
+++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.html
@@ -2,5 +2,15 @@
     <mat-icon style="cursor: pointer;" aria-hidden="false" aria-label="Назад" fontIcon="arrow_back_ios" class="back-arrow" (click)="back()"></mat-icon>
     <h1 class="title">{{title}}</h1>
     <!-- <div class="plug"></div> -->
-    <button mat-stroked-button appDownloadApp>Установить</button>
+    <div class="wrapper">
+      <button
+	mat-button
+	*ngIf="!messagingService.checkRequestPermission()"
+	(click)="messagingService.requestPermission()"
+	class="notification"
+	>
+	<img src="./assets/notification.svg" alt="notification" />
+      </button>
+      <button mat-stroked-button appDownloadApp>Установить</button>
+    </div>
 </div>
diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss
index 0d6cf27..39c7475 100644
--- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss
+++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.scss
@@ -1,5 +1,12 @@
 :host {
-  width: 100%;
+    width: 100%;
+
+    .notification {	
+	img {
+	    width: 28px;
+	    height: 28px;	    
+	}
+    }    
 }
 
 .container {
@@ -31,4 +38,9 @@
     line-height: 22px;
     margin: 0;
   }
+  .wrapper {
+      display: flex;
+      align-items: center;
+      gap: 10px;
+  }
 }
diff --git a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts
index f0300d0..3c698d4 100644
--- a/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts
+++ b/angular/src/app/presentation-options/default-option/components/navbar/navbar.component.ts
@@ -1,4 +1,5 @@
 import { Component, EventEmitter, Input, OnInit, Output } from '@angular/core';
+import { MessagingService } from 'src/app/services/messaging.service';
 
 @Component({
   selector: 'app-navbar[title]',
@@ -9,7 +10,7 @@ export class NavbarComponent implements OnInit {
   @Input() title: string = 'Название не задано'
   @Output() backEvent = new EventEmitter<null>();
 
-  constructor() { }
+  constructor(public messagingService: MessagingService) { }
 
   ngOnInit(): void {
   }
@@ -18,4 +19,5 @@ export class NavbarComponent implements OnInit {
     this.backEvent.emit(null)
   }
 
+
 }
diff --git a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts
index a70a80f..38fb195 100644
--- a/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts
+++ b/angular/src/app/presentation-options/default-option/pages/guest-card/guest-card.component.ts
@@ -76,7 +76,6 @@ export class GuestCardComponent implements OnInit {
     } else {
       //FIREBASE HERE
       this.messagingService.requestPermission();
-      this.messagingService.receiveMessage();
       // this.message = this.messagingService.currentMessage;
     }
   }
diff --git a/angular/src/app/services/messaging.service.ts b/angular/src/app/services/messaging.service.ts
index c5f6044..be242a6 100644
--- a/angular/src/app/services/messaging.service.ts
+++ b/angular/src/app/services/messaging.service.ts
@@ -78,6 +78,7 @@ export class MessagingService {
       this.angularFireMessaging.requestToken.subscribe({
         next: (token) => {
           this.updateToken(token);
+          this.receiveMessage();
         },
         error: (e) => console.error(e),
       });