ExternalVendorCode/gns3-web-ui
1
0
Fork 0
mirror of https://github.com/GNS3/gns3-web-ui.git synced 2025-05-22 18:24:15 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Fixes after review

Browse Source
This commit is contained in:
Piotr Pekala 2019-05-29 00:42:14 -07:00
parent a3110e87aa
commit d37b043711
3 changed files with 13 additions and 21 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
src/app/components/notification-box/notification-box.component.html
View File

@ -1,13 +1,10 @@
<div class="notification-box" *ngIf="isVisible"> <div class="notification-box" *ngIf="isVisible">
<mat-progress-bar mode="determinate" [value]="progress"></mat-progress-bar> <mat-progress-bar mode="determinate" [value]="progress"></mat-progress-bar>
<div style="display: flex; height: 80px;"> <div style="display: flex; height: 82px;">
<div class="edgeline"></div>
<div class="content"> <div class="content">
<app-adbutler theme="dark"></app-adbutler> <app-adbutler theme="dark"></app-adbutler>
<mat-icon (click)="closeNotification()" class="close-button">close</mat-icon> <mat-icon (click)="closeNotification()" class="close-button">close</mat-icon>
<!-- <button class="check-button" mat-button>CHECK IT OUT</button> --> <!-- <button class="check-button" mat-button>CHECK IT OUT</button> -->
</div> </div>
<div class="edgeline"></div>
</div> </div>
<div class="bottomline"></div>
</div> </div>

17
src/app/components/notification-box/notification-box.component.scss
View File

@ -1,5 +1,5 @@
.notification-box { .notification-box {
posiTion: fixed; position: fixed;
bottom: 20px; bottom: 20px;
right: 20px; right: 20px;
width: 412px; width: 412px;
@ -9,6 +9,9 @@
.content { .content {
background-color: #263238; background-color: #263238;
padding-left: 8px; padding-left: 8px;
border-left: 2px solid #0097a7;
border-right: 2px solid #0097a7;
border-bottom: 2px solid #0097a7;
} }
.close-button { .close-button {
@ -22,18 +25,6 @@
color: #0097a7; color: #0097a7;
} }
.edgeline {
height: 80px;
width: 2px;
background-color: #0097a7;
}
.bottomline {
width: 412px;
height: 2px;
background-color: #0097a7;
}
.check-button { .check-button {
background-color: #0097a7; background-color: #0097a7;
margin-top: -10px; margin-top: -10px;

12
src/app/components/notification-box/notification-box.component.ts
View File

@ -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 { timer, interval, Observable, Subscription } from 'rxjs';
import { take } from 'rxjs/operators'; import { take } from 'rxjs/operators';
import { NotificationSettingsService } from '../../services/notification-settings.service'; import { NotificationSettingsService } from '../../services/notification-settings.service';
@ -9,7 +9,7 @@ import { NotificationSettings } from '../../models/notification-settings-models/
templateUrl: './notification-box.component.html', templateUrl: './notification-box.component.html',
styleUrls: ['./notification-box.component.scss'] styleUrls: ['./notification-box.component.scss']
}) })
export class NotificationBoxComponent implements OnInit { export class NotificationBoxComponent implements OnInit, OnDestroy {
notificationSettings: NotificationSettings; notificationSettings: NotificationSettings;
timer: Observable<number>; timer: Observable<number>;
timerSubscription: Subscription; timerSubscription: Subscription;
@ -17,7 +17,7 @@ export class NotificationBoxComponent implements OnInit {
viewsCounter = 0; viewsCounter = 0;
ticks: number = 1000; ticks: number = 1000;
progress: number = 0; progress: number = 0;
isVisible = false; isVisible = true;
interval = 10; interval = 10;
constructor( constructor(
@ -26,7 +26,7 @@ export class NotificationBoxComponent implements OnInit {
ngOnInit() { ngOnInit() {
this.notificationSettings = this.notifactionSettingsService.getConfiguration(); this.notificationSettings = this.notifactionSettingsService.getConfiguration();
this.startTimer(); //this.startTimer();
} }
startTimer() { startTimer() {
@ -63,4 +63,8 @@ export class NotificationBoxComponent implements OnInit {
closeNotification() { closeNotification() {
this.isVisible = false; this.isVisible = false;
} }
ngOnDestroy() {
this.timerSubscription.unsubscribe();
}
} }