Fixing up merge issues

src/Web/WebSPA/.angular-cli.json

@@ -1,59 +0,0 @@
-{
-  "$schema": "./node_modules/@angular/cli/lib/config/schema.json",
-  "project": {
-    "name": "WebSPA"
-  },
-  "apps": [
-    {
-      "root": "Client",
-      "outDir": "wwwroot",
-      "assets": [
-        "assets",
-        "favicon.ico"
-      ],
-      "index": "index.html",
-      "main": "main.ts",
-      "polyfills": "polyfills.ts",
-      "test": "test.ts",
-      "tsconfig": "tsconfig.app.json",
-      "testTsconfig": "tsconfig.spec.json",
-      "prefix": "app",
-      "styles": [
-        "globals.scss",
-        "../node_modules/bootstrap/scss/bootstrap.scss",
-        "../node_modules/ng2-toastr/bundles/ng2-toastr.min.css"
-      ],
-      "scripts": [],
-      "environmentSource": "environments/environment.ts",
-      "environments": {
-        "dev": "environments/environment.ts",
-        "prod": "environments/environment.prod.ts"
-      }
-    }
-  ],
-  "e2e": {
-    "protractor": {
-      "config": "./protractor.conf.js"
-    }
-  },
-  "lint": [
-    {
-      "project": "Client/tsconfig.app.json"
-    },
-    {
-      "project": "Client/tsconfig.spec.json"
-    },
-    {
-      "project": "e2e/tsconfig.e2e.json"
-    }
-  ],
-  "test": {
-    "karma": {
-      "config": "./karma.conf.js"
-    }
-  },
-  "defaults": {
-    "styleExt": "scss",
-    "component": {}
-  }
-}

src/Web/WebSPA/Client/modules/app.component.ts

@@ -7,7 +7,7 @@ import { DataService } from './shared/services/data.service';
 import { SecurityService } from './shared/services/security.service';
 import { ConfigurationService } from './shared/services/configuration.service';
 import { SignalrService } from './shared/services/signalr.service';
-import { ToastsManager } from 'ng2-toastr';
+import { ToastrService } from 'ngx-toastr';
 
 /*
  * App Component
@@ -27,10 +27,8 @@ export class AppComponent implements OnInit {
         private securityService: SecurityService,
         private configurationService: ConfigurationService,
         private signalrService: SignalrService,
-        private toastr: ToastsManager,
-        vcr: ViewContainerRef
+        private toastr: ToastrService
     ) {
-        this.toastr.setRootViewContainerRef(vcr);
         this.Authenticated = this.securityService.IsAuthorized;
     }
 

src/Web/WebSPA/Client/modules/app.module.ts

@@ -13,7 +13,7 @@ import { CatalogModule }  from './catalog/catalog.module';
 import { OrdersModule }  from './orders/orders.module';
 import { BasketModule } from './basket/basket.module';
 import { CampaignsModule } from './campaigns/campaigns.module';
-import { ToastModule } from 'ng2-toastr/ng2-toastr';
+import { ToastrModule } from 'ngx-toastr';
 
 
 @NgModule({
@@ -21,7 +21,7 @@ import { ToastModule } from 'ng2-toastr/ng2-toastr';
     imports: [
         BrowserAnimationsModule,
         BrowserModule,
-        ToastModule.forRoot(),
+        ToastrModule.forRoot(),
         routing,
         HttpClientModule,
         // Only module that app module loads

src/Web/WebSPA/Client/modules/shared/services/signalr.service.ts

@@ -2,7 +2,7 @@
 import { SecurityService } from './security.service';
 import { ConfigurationService } from './configuration.service';
 import { HubConnection, HttpConnection, TransportType } from '@aspnet/signalr';
-import { ToastsManager } from 'ng2-toastr/ng2-toastr';
+import { ToastrService } from 'ngx-toastr';
 import { Subject } from 'rxjs';
 
 @Injectable()
@@ -16,7 +16,7 @@ export class SignalrService {
 
     constructor(
         private securityService: SecurityService,
-        private configurationService: ConfigurationService, private toastr: ToastsManager,
+        private configurationService: ConfigurationService, private toastr: ToastrService,
     ) {
         if (this.configurationService.isReady) {
             this.SignalrHubUrl = this.configurationService.serverSettings.signalrHubUrl;

src/Web/WebSPA/package.json

@@ -27,6 +27,7 @@
     "lint:ts": "tslint -c tslint.json Client/**/*.ts"
   },
   "dependencies": {
+    "@angular/animations": "^6.0.1",
     "@angular/common": "^6.0.1",
     "@angular/compiler": "^6.0.1",
     "@angular/core": "^6.0.1",
@@ -42,14 +43,14 @@
     "file-loader": "0.9.0",
     "font-awesome": "4.6.3",
     "isomorphic-fetch": "2.2.1",
-    "ng2-toastr": "^4.1.2",
+    "ngx-toastr": "^8.6.0",
     "normalize.css": "5.0.0",
     "preboot": "4.5.2",
     "rxjs": "^6.1.0",
     "zone.js": "^0.8.26"
   },
   "devDependencies": {
-    "@angular-devkit/build-angular": "~0.6.1",
+    "@angular-devkit/build-angular": "^0.6.1",
     "@angular/cli": "^6.0.1",
     "@angular/compiler-cli": "^6.0.1",
     "@types/core-js": "0.9.34",