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 @@
{{title}}
-
+
+
+
+
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();
- 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),
});