mirror of
https://github.com/GNS3/gns3-web-ui.git
synced 2024-12-30 01:38:50 +00:00
Toaster - ng2-toasty, Fixes: #8
This commit is contained in:
parent
adac191ded
commit
d32c1b6112
@ -20,6 +20,7 @@
|
|||||||
"prefix": "app",
|
"prefix": "app",
|
||||||
"styles": [
|
"styles": [
|
||||||
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
|
"../node_modules/bootstrap/dist/css/bootstrap.min.css",
|
||||||
|
"../node_modules/ng2-toasty/bundles/style-material.css",
|
||||||
"styles.css",
|
"styles.css",
|
||||||
"theme.scss"
|
"theme.scss"
|
||||||
],
|
],
|
||||||
|
5
package-lock.json
generated
5
package-lock.json
generated
@ -6219,6 +6219,11 @@
|
|||||||
"inherits": "2.0.3"
|
"inherits": "2.0.3"
|
||||||
}
|
}
|
||||||
},
|
},
|
||||||
|
"ng2-toasty": {
|
||||||
|
"version": "4.0.3",
|
||||||
|
"resolved": "https://registry.npmjs.org/ng2-toasty/-/ng2-toasty-4.0.3.tgz",
|
||||||
|
"integrity": "sha1-6njvjRh1fUHrq6Eb2fkKVD9Y/Xo="
|
||||||
|
},
|
||||||
"no-case": {
|
"no-case": {
|
||||||
"version": "2.3.2",
|
"version": "2.3.2",
|
||||||
"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
|
"resolved": "https://registry.npmjs.org/no-case/-/no-case-2.3.2.tgz",
|
||||||
|
@ -28,6 +28,7 @@
|
|||||||
"bootstrap": "^4.0.0-beta",
|
"bootstrap": "^4.0.0-beta",
|
||||||
"core-js": "^2.4.1",
|
"core-js": "^2.4.1",
|
||||||
"d3-ng2-service": "^1.16.0",
|
"d3-ng2-service": "^1.16.0",
|
||||||
|
"ng2-toasty": "^4.0.3",
|
||||||
"npm-check-updates": "^2.13.0",
|
"npm-check-updates": "^2.13.0",
|
||||||
"rxjs": "^5.4.1",
|
"rxjs": "^5.4.1",
|
||||||
"zone.js": "^0.8.14"
|
"zone.js": "^0.8.14"
|
||||||
|
@ -1 +1,2 @@
|
|||||||
<router-outlet></router-outlet>
|
<router-outlet></router-outlet>
|
||||||
|
<ng2-toasty></ng2-toasty>
|
||||||
|
@ -2,6 +2,7 @@ import { Component, OnInit } from '@angular/core';
|
|||||||
import {Http} from "@angular/http";
|
import {Http} from "@angular/http";
|
||||||
import {MatIconRegistry} from "@angular/material";
|
import {MatIconRegistry} from "@angular/material";
|
||||||
import {DomSanitizer} from "@angular/platform-browser";
|
import {DomSanitizer} from "@angular/platform-browser";
|
||||||
|
import {ToastyConfig} from "ng2-toasty";
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
selector: 'app-root',
|
selector: 'app-root',
|
||||||
@ -11,8 +12,10 @@ import {DomSanitizer} from "@angular/platform-browser";
|
|||||||
]
|
]
|
||||||
})
|
})
|
||||||
export class AppComponent implements OnInit {
|
export class AppComponent implements OnInit {
|
||||||
constructor(http: Http, iconReg: MatIconRegistry, sanitizer: DomSanitizer) {
|
constructor(http: Http, iconReg: MatIconRegistry, sanitizer: DomSanitizer, toastyConfig: ToastyConfig) {
|
||||||
iconReg.addSvgIcon('gns3', sanitizer.bypassSecurityTrustResourceUrl('./assets/gns3_icon.svg'));
|
toastyConfig.theme = 'material';
|
||||||
|
|
||||||
|
iconReg.addSvgIcon('gns3', sanitizer.bypassSecurityTrustResourceUrl('./assets/gns3_icon.svg'));
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit(): void {
|
ngOnInit(): void {
|
||||||
|
@ -2,26 +2,7 @@ import { BrowserModule } from '@angular/platform-browser';
|
|||||||
import { NgModule } from '@angular/core';
|
import { NgModule } from '@angular/core';
|
||||||
import { HttpModule } from '@angular/http';
|
import { HttpModule } from '@angular/http';
|
||||||
import { FormsModule } from '@angular/forms';
|
import { FormsModule } from '@angular/forms';
|
||||||
|
import { CdkTableModule } from "@angular/cdk/table";
|
||||||
import { D3Service } from 'd3-ng2-service';
|
|
||||||
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
|
||||||
|
|
||||||
import { AppRoutingModule } from './app-routing.module';
|
|
||||||
|
|
||||||
import { AppComponent } from './app.component';
|
|
||||||
import { MapComponent } from './cartography/map/map.component';
|
|
||||||
import {CreateSnapshotDialogComponent, ProjectMapComponent} from './project-map/project-map.component';
|
|
||||||
import { ServersComponent, AddServerDialogComponent } from './servers/servers.component';
|
|
||||||
import { ProjectsComponent } from './projects/projects.component';
|
|
||||||
|
|
||||||
import { VersionService } from './shared/services/version.service';
|
|
||||||
import { ProjectService } from './shared/services/project.service';
|
|
||||||
import { SymbolService } from "./shared/services/symbol.service";
|
|
||||||
import { ServerService } from "./shared/services/server.service";
|
|
||||||
import { IndexedDbService } from "./shared/services/indexed-db.service";
|
|
||||||
import { HttpServer } from "./shared/services/http-server.service";
|
|
||||||
import { DefaultLayoutComponent } from './default-layout/default-layout.component';
|
|
||||||
|
|
||||||
|
|
||||||
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
|
||||||
import {
|
import {
|
||||||
@ -36,10 +17,30 @@ import {
|
|||||||
MatDialogModule, MatProgressBarModule
|
MatDialogModule, MatProgressBarModule
|
||||||
} from '@angular/material';
|
} from '@angular/material';
|
||||||
|
|
||||||
import {CdkTableModule} from "@angular/cdk/table";
|
import { D3Service } from 'd3-ng2-service';
|
||||||
import {SnapshotService} from "./shared/services/snapshot.service";
|
import { NgbModule } from '@ng-bootstrap/ng-bootstrap';
|
||||||
|
import { ToastyModule } from 'ng2-toasty';
|
||||||
|
|
||||||
|
import { AppRoutingModule } from './app-routing.module';
|
||||||
|
|
||||||
|
|
||||||
|
import { VersionService } from './shared/services/version.service';
|
||||||
|
import { ProjectService } from './shared/services/project.service';
|
||||||
|
import { SymbolService } from "./shared/services/symbol.service";
|
||||||
|
import { ServerService } from "./shared/services/server.service";
|
||||||
|
import { IndexedDbService } from "./shared/services/indexed-db.service";
|
||||||
|
import { HttpServer } from "./shared/services/http-server.service";
|
||||||
|
import { SnapshotService } from "./shared/services/snapshot.service";
|
||||||
|
import { ProgressDialogService } from "./shared/progress-dialog/progress-dialog.service";
|
||||||
|
|
||||||
|
import { ProjectsComponent } from './projects/projects.component';
|
||||||
|
import { DefaultLayoutComponent } from './default-layout/default-layout.component';
|
||||||
import { ProgressDialogComponent } from './shared/progress-dialog/progress-dialog.component';
|
import { ProgressDialogComponent } from './shared/progress-dialog/progress-dialog.component';
|
||||||
import {ProgressDialogService} from "./shared/progress-dialog/progress-dialog.service";
|
import { AppComponent } from './app.component';
|
||||||
|
import { MapComponent } from './cartography/map/map.component';
|
||||||
|
import { CreateSnapshotDialogComponent, ProjectMapComponent } from './project-map/project-map.component';
|
||||||
|
import { ServersComponent, AddServerDialogComponent } from './servers/servers.component';
|
||||||
|
|
||||||
|
|
||||||
@NgModule({
|
@NgModule({
|
||||||
declarations: [
|
declarations: [
|
||||||
@ -55,6 +56,7 @@ import {ProgressDialogService} from "./shared/progress-dialog/progress-dialog.se
|
|||||||
],
|
],
|
||||||
imports: [
|
imports: [
|
||||||
NgbModule.forRoot(),
|
NgbModule.forRoot(),
|
||||||
|
ToastyModule.forRoot(),
|
||||||
BrowserModule,
|
BrowserModule,
|
||||||
HttpModule,
|
HttpModule,
|
||||||
AppRoutingModule,
|
AppRoutingModule,
|
||||||
|
@ -19,11 +19,12 @@ import { MapComponent } from "../cartography/map/map.component";
|
|||||||
import { ServerService } from "../shared/services/server.service";
|
import { ServerService } from "../shared/services/server.service";
|
||||||
import { ProjectService } from '../shared/services/project.service';
|
import { ProjectService } from '../shared/services/project.service';
|
||||||
import { Server } from "../shared/models/server";
|
import { Server } from "../shared/models/server";
|
||||||
import {MAT_DIALOG_DATA, MatDialog, MatDialogRef} from "@angular/material";
|
import { MAT_DIALOG_DATA, MatDialog, MatDialogRef } from "@angular/material";
|
||||||
import {SnapshotService} from "../shared/services/snapshot.service";
|
import { SnapshotService } from "../shared/services/snapshot.service";
|
||||||
import {Snapshot} from "../shared/models/snapshot";
|
import { Snapshot } from "../shared/models/snapshot";
|
||||||
import {ProgressDialogService} from "../shared/progress-dialog/progress-dialog.service";
|
import { ProgressDialogService } from "../shared/progress-dialog/progress-dialog.service";
|
||||||
import {ProgressDialogComponent} from "../shared/progress-dialog/progress-dialog.component";
|
import { ProgressDialogComponent } from "../shared/progress-dialog/progress-dialog.component";
|
||||||
|
import { ToastyService } from "ng2-toasty";
|
||||||
|
|
||||||
|
|
||||||
@Component({
|
@Component({
|
||||||
@ -50,7 +51,8 @@ export class ProjectMapComponent implements OnInit {
|
|||||||
private symbolService: SymbolService,
|
private symbolService: SymbolService,
|
||||||
private snapshotService: SnapshotService,
|
private snapshotService: SnapshotService,
|
||||||
private dialog: MatDialog,
|
private dialog: MatDialog,
|
||||||
private progressDialogService: ProgressDialogService) {
|
private progressDialogService: ProgressDialogService,
|
||||||
|
private toastyService: ToastyService) {
|
||||||
}
|
}
|
||||||
|
|
||||||
ngOnInit() {
|
ngOnInit() {
|
||||||
@ -170,10 +172,17 @@ export class ProjectMapComponent implements OnInit {
|
|||||||
const progress = this.progressDialogService.open();
|
const progress = this.progressDialogService.open();
|
||||||
|
|
||||||
const subscription = creation.subscribe((created_snapshot: Snapshot) => {
|
const subscription = creation.subscribe((created_snapshot: Snapshot) => {
|
||||||
|
this.toastyService.success({
|
||||||
}, () => {
|
'title': 'Snapshot created',
|
||||||
|
'msg': `Snapshot '${snapshot.name}' has been created.`
|
||||||
}, () => {
|
});
|
||||||
|
progress.close();
|
||||||
|
}, (response) => {
|
||||||
|
const error = response.json();
|
||||||
|
this.toastyService.error({
|
||||||
|
'title': 'Cannot create snapshot',
|
||||||
|
'msg': error.message
|
||||||
|
});
|
||||||
progress.close();
|
progress.close();
|
||||||
});
|
});
|
||||||
|
|
||||||
|
@ -66,7 +66,7 @@ export class AddServerDialogComponent {
|
|||||||
|
|
||||||
constructor(
|
constructor(
|
||||||
public dialogRef: MatDialogRef<AddServerDialogComponent>,
|
public dialogRef: MatDialogRef<AddServerDialogComponent>,
|
||||||
@Inject(MAT_DIALOG_DATA) public data: any, serverService: ServerService) {
|
@Inject(MAT_DIALOG_DATA) public data: any) {
|
||||||
}
|
}
|
||||||
|
|
||||||
onAddClick(): void {
|
onAddClick(): void {
|
||||||
|
Loading…
Reference in New Issue
Block a user