Merge branch 'master' of https://github.com/dotnet/eShopOnContainers.git

Author: jsuarezruiz

README.md

@@ -23,8 +23,8 @@ Finally, those microservices are consumed by multiple client web and mobile apps
 <b>*MVC Application (ASP.NET Core)*</b>: Its an MVC 6 application where you can find interesting scenarios on how to consume HTTP-based microservices from C# running in the server side, as it is a typical ASP.NET Core MVC application. Since it is a server-side application, access to other containers/microservices is done within the internal Docker Host network with its internal name resolution.
 <img src="img/eshop-webmvc-app-screenshot.png">
 
-<b>*SPA (Single Page Application)*</b>: Developed with Angular 2, Typescript and ASP.NET Core MVC 6. This is another approach for client web applications to be used when you want to have a more modern behavior which is not behaving with the typical browser round-trip on every action but behaving like a Single-Page-Application which is more similar to a desktop app experience. The consumption of the HTTP-based microservices is done from TypeScript/JavaScript in the client browser, so out of the Docker Host internal network (Like from your network or even from the Internet). 
--  <<<<< TBD Image for SPA App >>>>>
+<b>*SPA (Single Page Application)*</b>: Providing similar "eShop business functionality" but developed with Angular 2, Typescript and slightly using ASP.NET Core MVC 6. This is another approach for client web applications to be used when you want to have a more modern client behavior which is not behaving with the typical browser round-trip on every action but behaving like a Single-Page-Application which is more similar to a desktop app usage experience. The consumption of the HTTP-based microservices is done from TypeScript/JavaScript in the client browser, so the client calls to the microservices come from out of the Docker Host internal network (Like from your network or even from the Internet). 
+<img src="img/eshop-webspa-app-screenshot.png">
 
 <b>*Xamarin Mobile App (For iOS, Android and Windows/UWP)*</b>: It is a client mobile app supporting the most common mobilee OS platforms (iOS, Android and Windows/UWP). In this case, the consumption of the microservices is done from C# but running on the client devices, so out of the Docker Host internal network (Like from your network or even the Internet).
 

README.md.saved.bak

@@ -16,7 +16,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>

img/eshop-webmvc-app-screenshot.png

@@ -16,7 +16,7 @@
     <AndroidResgenFile>Resources\Resource.Designer.cs</AndroidResgenFile>
     <GenerateSerializationAssemblies>Off</GenerateSerializationAssemblies>
     <AndroidUseLatestPlatformSdk>True</AndroidUseLatestPlatformSdk>
-    <TargetFrameworkVersion>v6.0</TargetFrameworkVersion>
+    <TargetFrameworkVersion>v7.0</TargetFrameworkVersion>
     <AndroidManifest>Properties\AndroidManifest.xml</AndroidManifest>
     <NuGetPackageImportStamp>
     </NuGetPackageImportStamp>

img/eshop-webspa-app-screenshot.png

@@ -52,7 +52,7 @@ public async Task<IActionResult> Index(Dictionary<string, int> quantities, strin
 
         public async Task<IActionResult> AddToCart(CatalogItem productDetails)
         {
-            if (productDetails != null)
+            if (productDetails.Id != null)
             {
                 var user = _appUserParser.Parse(HttpContext.User);
                 var product = new BasketItem()

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj

@@ -4,7 +4,7 @@
 <form asp-controller="Cart" asp-action="AddToCart">
 
     <img class="esh-catalog-thumbnail" src="@Model.PictureUri" />
-    <input class="esh-catalog-button" type="submit" value="[ ADD TO CART ]" />
+    <input class="esh-catalog-button @((!User.Identity.IsAuthenticated) ? "is-disabled" : "")" type="submit" value="[ ADD TO CART ]" />
 
     <div class="esh-catalog-name">
         <span>@Model.Name</span>

src/Mobile/eShopOnContainers/eShopOnContainers.TestRunner.Droid/eShopOnContainers.TestRunner.Droid.csproj.bak

@@ -86,6 +86,8 @@
     text-align: center;
     margin-bottom: 1.5rem;
     width: 33%;
+    display: inline-block;
+    float: none !important;
 }
 
 @media screen and (max-width: 1024px) {
@@ -116,6 +118,10 @@
     transition: all 0.35s;
     width: 80%;
 }
+    .esh-catalog-button.is-disabled {
+        opacity: .5;
+        pointer-events: none;
+    }
 
     .esh-catalog-button:hover {
         background-color: #4a760f;

src/Web/WebMVC/Controllers/CartController.cs

@@ -24,7 +24,7 @@ export class BasketStatusComponent implements OnInit {
         // Subscribe to Add Basket Observable:
         this.basketItemAddedSubscription = this.basketEvents.addItemToBasket$.subscribe(
             item => {
-                this.service.setBasket(item).subscribe(res => {
+                this.service.addItemToBasket(item).subscribe(res => {
                     this.service.getBasket().subscribe(basket => {
                         if (basket)
                             this.badge = basket.items.length;