Merge f5bb184dbe into d2e27b770a

src/Web/WebSPA/AppSettings.cs

@@ -1,9 +1,4 @@
-using System;
-using System.Collections.Generic;
-using System.Linq;
-using System.Threading.Tasks;
-
-namespace eShopOnContainers.WebSPA
+namespace eShopOnContainers.WebSPA
 {
     public class AppSettings
     {
@@ -14,6 +9,6 @@ namespace eShopOnContainers.WebSPA
         public string BasketUrl { get; set; }
         public string MarketingUrl { get; set; }
         public string ActivateCampaignDetailFunction { get; set; }
-	public bool UseCustomizationData { get; set; }
+	    public bool UseCustomizationData { get; set; }
     }
 }

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

@@ -49,12 +49,12 @@ export class BasketComponent implements OnInit {
     checkOut(event: any) {
         this.update(event)
             .subscribe(
-                x => {
-                    this.errorMessages = [];
-                    this.basketwrapper.basket = this.basket;
-                    this.router.navigate(['order'],
+            x => {
+                this.errorMessages = [];
+                this.basketwrapper.basket = this.basket;
+                this.router.navigate(['order']);
+               }, 
                 errMessage => this.errorMessages = errMessage.messages);
-        });
     }
 
     private calculateTotalPrice() {

src/Web/WebSPA/Server/Infrastructure/WebContextSeed.cs

@@ -17,7 +17,7 @@ namespace WebSPA.Infrastructure
         {
             var log = loggerFactory.CreateLogger("WebSPA seed");
 
-            var settings = (AppSettings)applicationBuilder
+            var settings = applicationBuilder
                 .ApplicationServices.GetRequiredService<IOptions<AppSettings>>().Value;
 
             var useCustomizationData = settings.UseCustomizationData;

src/Web/WebSPA/package.json

@@ -5,7 +5,7 @@
   "keywords": [
     "aspnetcore",
     "entityframework core",
-    "angular2",
+    "angular5",
     "webpack2",
     "typescript2",
     "bootstrap4",
@@ -26,41 +26,44 @@
     "lint:ts": "tslint -c tslint.json Client/**/*.ts"
   },
   "dependencies": {
-    "@angular/common": "^4.0.0",
-    "@angular/compiler": "^4.0.0",
-    "@angular/core": "^4.0.0",
-    "@angular/forms": "^4.0.0",
-    "@angular/http": "^4.0.0",
-    "@angular/platform-browser": "^4.0.0",
-    "@angular/platform-browser-dynamic": "^4.0.0",
-    "@angular/router": "^4.0.0",
-    "@ng-bootstrap/ng-bootstrap": "1.0.0-alpha.22",
-    "bootstrap": "4.0.0-alpha.5",
+    "@angular/common": "^5.1.2",
+    "@angular/compiler": "^5.1.2",
+    "@angular/core": "^5.1.2",
+    "@angular/forms": "^5.1.2",
+    "@angular/http": "^5.1.2",
+    "@angular/platform-browser": "^5.1.2",
+    "@angular/platform-browser-dynamic": "^5.1.2",
+    "@angular/router": "^5.1.2",
+    "@ng-bootstrap/ng-bootstrap": "^1.0.0-beta.7",
+    "bootstrap": "4.0.0-beta.2 ",
+    "jquery": "^3.2.1",
+    "popper.js": "^1.12.9",
     "core-js": "^2.4.1",
+    "enhanced-resolve": "^3.4.1",
     "file-loader": "0.9.0",
     "font-awesome": "4.6.3",
     "isomorphic-fetch": "2.2.1",
     "normalize.css": "5.0.0",
     "preboot": "4.5.2",
-    "rxjs": "^5.1.0",
+    "rxjs": "^5.5.5",
     "zone.js": "^0.8.4"
   },
   "devDependencies": {
-    "@angular/cli": "^1.3.0",
-    "@angular/compiler-cli": "^4.0.0",
+    "@angular/cli": "1.6.2",
+    "@angular/compiler-cli": "^5.1.2",
     "@types/core-js": "0.9.34",
     "@types/hammerjs": "2.0.33",
     "@types/jasmine": "2.5.38",
     "@types/node": "~6.0.60",
     "@types/protractor": "1.5.20",
     "@types/selenium-webdriver": "2.44.26",
-    "codelyzer": "~2.0.0",
-    "sass-lint": "1.10.2",
-    "ts-helpers": "1.1.1",
-    "ts-node": "~2.0.0",
-    "tslint": "~4.5.0",
-    "typedoc": "0.5.0",
-    "typescript": "~2.2.0",
+    "codelyzer": "^4.0.2",
+    "sass-lint": "^1.12.1",
+    "ts-helpers": "^1.1.2",
+    "ts-node": "^4.1.0",
+    "tslint": "^5.8.0",
+    "typedoc": "0.9.0",
+    "typescript": "2.6",
     "url-loader": "0.5.7"
   }
 }