Merge branch 'Dev' of https://github.com/dotnet/eShopOnContainers into Dev

Author: unaizorrilla

src/Web/WebMVC/Controllers/AccountController.cs

@@ -19,21 +19,15 @@ public class AccountController : Controller
     {
         private readonly UserManager<ApplicationUser> _userManager;
         private readonly SignInManager<ApplicationUser> _signInManager;
-        private readonly IEmailSender _emailSender;
-        private readonly ISmsSender _smsSender;
         private readonly ILogger _logger;
 
         public AccountController(
             UserManager<ApplicationUser> userManager,
             SignInManager<ApplicationUser> signInManager,
-            IEmailSender emailSender,
-            ISmsSender smsSender,
             ILoggerFactory loggerFactory)
         {
             _userManager = userManager;
             _signInManager = signInManager;
-            _emailSender = emailSender;
-            _smsSender = smsSender;
             _logger = loggerFactory.CreateLogger<AccountController>();
         }
 
@@ -151,7 +145,7 @@ public async Task<IActionResult> LogOff()
         {
             await _signInManager.SignOutAsync();
             _logger.LogInformation(4, "User logged out.");
-            return RedirectToAction(nameof(HomeController.Index), "Home");
+            return RedirectToAction(nameof(CatalogController.Index), "Catalog");
         }
 
         //
@@ -368,44 +362,6 @@ public async Task<ActionResult> SendCode(string returnUrl = null, bool rememberM
             return View(new SendCodeViewModel { Providers = factorOptions, ReturnUrl = returnUrl, RememberMe = rememberMe });
         }
 
-        //
-        // POST: /Account/SendCode
-        [HttpPost]
-        [AllowAnonymous]
-        [ValidateAntiForgeryToken]
-        public async Task<IActionResult> SendCode(SendCodeViewModel model)
-        {
-            if (!ModelState.IsValid)
-            {
-                return View();
-            }
-
-            var user = await _signInManager.GetTwoFactorAuthenticationUserAsync();
-            if (user == null)
-            {
-                return View("Error");
-            }
-
-            // Generate the token and send it
-            var code = await _userManager.GenerateTwoFactorTokenAsync(user, model.SelectedProvider);
-            if (string.IsNullOrWhiteSpace(code))
-            {
-                return View("Error");
-            }
-
-            var message = "Your security code is: " + code;
-            if (model.SelectedProvider == "Email")
-            {
-                await _emailSender.SendEmailAsync(await _userManager.GetEmailAsync(user), "Security Code", message);
-            }
-            else if (model.SelectedProvider == "Phone")
-            {
-                await _smsSender.SendSmsAsync(await _userManager.GetPhoneNumberAsync(user), message);
-            }
-
-            return RedirectToAction(nameof(VerifyCode), new { Provider = model.SelectedProvider, ReturnUrl = model.ReturnUrl, RememberMe = model.RememberMe });
-        }
-
         //
         // GET: /Account/VerifyCode
         [HttpGet]
@@ -476,7 +432,7 @@ private IActionResult RedirectToLocal(string returnUrl)
             }
             else
             {
-                return RedirectToAction(nameof(HomeController.Index), "Home");
+                return RedirectToAction(nameof(CatalogController.Index), "Catalog");
             }
         }
 

src/Web/WebMVC/Controllers/CartController.cs

@@ -0,0 +1,69 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.AspNetCore.Identity;
+using Microsoft.eShopOnContainers.WebMVC.Services;
+using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.AspNetCore.Authorization;
+
+namespace Microsoft.eShopOnContainers.WebMVC.Controllers
+{
+    [Authorize]
+    public class CartController : Controller
+    {
+        private readonly UserManager<ApplicationUser> _userManager;
+        private readonly IBasketService _basketSvc;
+        private readonly ICatalogService _catalogSvc;
+
+        public CartController(IBasketService basketSvc, ICatalogService catalogSvc, UserManager<ApplicationUser> userManager)
+        {
+            _userManager = userManager;
+            _basketSvc = basketSvc;
+            _catalogSvc = catalogSvc;
+        }
+
+        public async Task<IActionResult> Index()
+        {
+            var user = await _userManager.GetUserAsync(HttpContext.User);
+            var vm = _basketSvc.GetBasket(user);
+
+            return View(vm);
+        }
+
+        
+        [HttpPost]
+        public async Task<IActionResult> Index(Dictionary<string, int> quantities, string action)
+        {
+            var user = await _userManager.GetUserAsync(HttpContext.User);
+            var basket = _basketSvc.SetQuantities(user, quantities);
+            var vm = _basketSvc.UpdateBasket(basket);
+
+            if (action == "[ Checkout ]")
+            {
+                var order = _basketSvc.MapBasketToOrder(basket);
+                return RedirectToAction("Create", "Order");
+            }
+           
+            return View(vm);
+        }
+
+        public async Task<IActionResult> AddToCart(string productId)
+        {
+            var user = await _userManager.GetUserAsync(HttpContext.User);
+            var productDetails = _catalogSvc.GetCatalogItem(productId);
+            var product = new BasketItem()
+            {
+                Id = Guid.NewGuid().ToString(),
+                Quantity = 1,
+                ProductName = productDetails.Name,
+                PictureUrl = productDetails.PictureUrl,
+                UnitPrice = productDetails.Price, 
+                ProductId = productId
+            };
+            _basketSvc.AddItemToBasket(user, product);
+            return RedirectToAction("Index", "Catalog");
+        }
+    }
+}

src/Web/WebMVC/Controllers/CatalogController.cs

@@ -0,0 +1,55 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Threading.Tasks;
+using System.Net.Http;
+using Microsoft.AspNetCore.Mvc;
+using Microsoft.eShopOnContainers.WebMVC.Models;
+using Microsoft.Extensions.Options;
+using Newtonsoft.Json;
+using Microsoft.eShopOnContainers.WebMVC.Services;
+using Microsoft.eShopOnContainers.WebMVC.Models.CatalogViewModels;
+using BikeSharing_Private_Web_Site.Services.Pagination;
+
+namespace Microsoft.eShopOnContainers.WebMVC.Controllers
+{
+    public class CatalogController : Controller
+    {
+        private ICatalogService _catalogSvc;
+
+        public CatalogController(ICatalogService catalogSvc)
+        {
+            _catalogSvc = catalogSvc;
+        }
+
+        public async Task<IActionResult> Index(int? BrandFilterApplied, int? TypesFilterApplied, int? page)
+        {
+            var vm = new IndexViewModel()
+            {
+                CatalogItems = await _catalogSvc.GetCatalogItems(6 * (page ?? 0), 6),
+                Brands = _catalogSvc.GetBrands(),
+                Types = _catalogSvc.GetTypes(),
+                BrandFilterApplied = BrandFilterApplied ?? 0,
+                TypesFilterApplied = TypesFilterApplied ?? 0,
+                PaginationInfo = new PaginationInfo()
+                {
+                    ActualPage = page ?? 0,
+                    ItemsPerPage = 6,
+                    TotalItems = _catalogSvc.TotalItems, 
+                    TotalPages = int.Parse(Math.Round(((decimal)_catalogSvc.TotalItems / 6), MidpointRounding.AwayFromZero).ToString())
+                }
+            };
+
+            vm.PaginationInfo.Next = (vm.PaginationInfo.ActualPage == vm.PaginationInfo.TotalPages - 1) ? "is-disabled" : "";
+            vm.PaginationInfo.Previous = (vm.PaginationInfo.ActualPage == 0) ? "is-disabled" : "";
+
+            return View(vm);
+        }
+
+        public IActionResult Error()
+        {
+            return View();
+        }
+    }
+}
+