diff --git a/src/app/components/notification-box/notification-box.component.html b/src/app/components/notification-box/notification-box.component.html index e5eadb5b..fa0581b5 100644 --- a/src/app/components/notification-box/notification-box.component.html +++ b/src/app/components/notification-box/notification-box.component.html @@ -1,13 +1,10 @@
-
-
+
close
-
-
diff --git a/src/app/components/notification-box/notification-box.component.scss b/src/app/components/notification-box/notification-box.component.scss index 99253285..24b0ec74 100644 --- a/src/app/components/notification-box/notification-box.component.scss +++ b/src/app/components/notification-box/notification-box.component.scss @@ -1,5 +1,5 @@ .notification-box { - posiTion: fixed; + position: fixed; bottom: 20px; right: 20px; width: 412px; @@ -9,6 +9,9 @@ .content { background-color: #263238; padding-left: 8px; + border-left: 2px solid #0097a7; + border-right: 2px solid #0097a7; + border-bottom: 2px solid #0097a7; } .close-button { @@ -22,18 +25,6 @@ color: #0097a7; } -.edgeline { - height: 80px; - width: 2px; - background-color: #0097a7; -} - -.bottomline { - width: 412px; - height: 2px; - background-color: #0097a7; -} - .check-button { background-color: #0097a7; margin-top: -10px; diff --git a/src/app/components/notification-box/notification-box.component.ts b/src/app/components/notification-box/notification-box.component.ts index a984bee8..905819a6 100644 --- a/src/app/components/notification-box/notification-box.component.ts +++ b/src/app/components/notification-box/notification-box.component.ts @@ -1,4 +1,4 @@ -import { Component, OnInit } from '@angular/core'; +import { Component, OnInit, OnDestroy } from '@angular/core'; import { timer, interval, Observable, Subscription } from 'rxjs'; import { take } from 'rxjs/operators'; import { NotificationSettingsService } from '../../services/notification-settings.service'; @@ -9,7 +9,7 @@ import { NotificationSettings } from '../../models/notification-settings-models/ templateUrl: './notification-box.component.html', styleUrls: ['./notification-box.component.scss'] }) -export class NotificationBoxComponent implements OnInit { +export class NotificationBoxComponent implements OnInit, OnDestroy { notificationSettings: NotificationSettings; timer: Observable; timerSubscription: Subscription; @@ -17,7 +17,7 @@ export class NotificationBoxComponent implements OnInit { viewsCounter = 0; ticks: number = 1000; progress: number = 0; - isVisible = false; + isVisible = true; interval = 10; constructor( @@ -26,7 +26,7 @@ export class NotificationBoxComponent implements OnInit { ngOnInit() { this.notificationSettings = this.notifactionSettingsService.getConfiguration(); - this.startTimer(); + //this.startTimer(); } startTimer() { @@ -63,4 +63,8 @@ export class NotificationBoxComponent implements OnInit { closeNotification() { this.isVisible = false; } + + ngOnDestroy() { + this.timerSubscription.unsubscribe(); + } }