diff --git a/src/Web/WebMVC/Controllers/AccountController.cs b/src/Web/WebMVC/Controllers/AccountController.cs index f48b6e884..c76e6eabc 100644 --- a/src/Web/WebMVC/Controllers/AccountController.cs +++ b/src/Web/WebMVC/Controllers/AccountController.cs @@ -151,7 +151,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers { await _signInManager.SignOutAsync(); _logger.LogInformation(4, "User logged out."); - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(CatalogController.Index), "Catalog"); } // @@ -476,7 +476,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers } else { - return RedirectToAction(nameof(HomeController.Index), "Home"); + return RedirectToAction(nameof(CatalogController.Index), "Catalog"); } } diff --git a/src/Web/WebMVC/Controllers/CatalogController.cs b/src/Web/WebMVC/Controllers/CatalogController.cs new file mode 100644 index 000000000..e04c86be9 --- /dev/null +++ b/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 Index(int? BrandFilterApplied, int? TypesFilterApplied, int? page) + { + var vm = new IndexViewModel() + { + CatalogItems = await _catalogSvc.GetCatalogItems(8 * (page ?? 0), 8), + Brands = _catalogSvc.GetTypes(), + Types = _catalogSvc.GetBrands(), + BrandFilterApplied = BrandFilterApplied ?? 0, + TypesFilterApplied = TypesFilterApplied ?? 0, + PaginationInfo = new PaginationInfo() + { + ActualPage = page ?? 0, + ItemsPerPage = 8, + TotalItems = _catalogSvc.TotalItems, + TotalPages = int.Parse(Math.Round(((decimal)_catalogSvc.TotalItems / 8), 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(); + } + } +} + diff --git a/src/Web/WebMVC/Controllers/HomeController.cs b/src/Web/WebMVC/Controllers/HomeController.cs deleted file mode 100644 index 402243dae..000000000 --- a/src/Web/WebMVC/Controllers/HomeController.cs +++ /dev/null @@ -1,55 +0,0 @@ -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.HomeViewModels; - -namespace Microsoft.eShopOnContainers.WebMVC.Controllers -{ - public class HomeController : Controller - { - private HttpClient _http; - private AppSettings _settings; - private ICatalogService _catalogSvc; - - public HomeController(IOptions options, ICatalogService catalogSvc) - { - _http = new HttpClient(); - _settings = options.Value; - _catalogSvc = catalogSvc; - } - public async Task Index() - { - //var dataString = await _http.GetStringAsync(_settings.CatalogUrl); - //var items = JsonConvert.DeserializeObject>(dataString); - //items.AddRange(items); - var items = await _catalogSvc.GetCatalogItems(); - var vm = new IndexViewModel() - { - CatalogItems = items - }; - return View(vm); - } - - public async Task Orders() - { - ViewData["Message"] = "Orders page."; - - var ordersUrl = _settings.OrderingUrl + "/api/ordering/orders"; - var dataString = await _http.GetStringAsync(ordersUrl); - var items = JsonConvert.DeserializeObject>(dataString); - return View(items); - } - - public IActionResult Error() - { - return View(); - } - } -} diff --git a/src/Web/WebMVC/Controllers/OrderController.cs b/src/Web/WebMVC/Controllers/OrderController.cs index d1818d1e3..f6f785195 100644 --- a/src/Web/WebMVC/Controllers/OrderController.cs +++ b/src/Web/WebMVC/Controllers/OrderController.cs @@ -16,6 +16,11 @@ namespace Microsoft.eShopOnContainers.WebMVC.Controllers _orderSvc = orderSvc; } + public IActionResult AddToCart() + { + return View(); + } + public IActionResult Cart() { return View(); diff --git a/src/Web/WebMVC/Models/CatalogItem.cs b/src/Web/WebMVC/Models/CatalogItem.cs index 8643fffe9..1a4d7e8e4 100644 --- a/src/Web/WebMVC/Models/CatalogItem.cs +++ b/src/Web/WebMVC/Models/CatalogItem.cs @@ -8,5 +8,6 @@ namespace Microsoft.eShopOnContainers.WebMVC.Models public string Name { get; set; } public string Description { get; set; } public decimal Price { get; set; } + public string PicsUrl { get; set; } } } \ No newline at end of file diff --git a/src/Web/WebMVC/Models/HomeViewModels/IndexViewModel.cs b/src/Web/WebMVC/Models/CatalogViewModels/IndexViewModel.cs similarity index 65% rename from src/Web/WebMVC/Models/HomeViewModels/IndexViewModel.cs rename to src/Web/WebMVC/Models/CatalogViewModels/IndexViewModel.cs index f5ba57dad..9283c8e59 100644 --- a/src/Web/WebMVC/Models/HomeViewModels/IndexViewModel.cs +++ b/src/Web/WebMVC/Models/CatalogViewModels/IndexViewModel.cs @@ -1,10 +1,11 @@ -using Microsoft.AspNetCore.Mvc.Rendering; +using BikeSharing_Private_Web_Site.Services.Pagination; +using Microsoft.AspNetCore.Mvc.Rendering; using System; using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; -namespace Microsoft.eShopOnContainers.WebMVC.Models.HomeViewModels +namespace Microsoft.eShopOnContainers.WebMVC.Models.CatalogViewModels { public class IndexViewModel { @@ -13,5 +14,6 @@ namespace Microsoft.eShopOnContainers.WebMVC.Models.HomeViewModels public IEnumerable Types { get; set; } public int BrandFilterApplied { get; set; } public int TypesFilterApplied { get; set; } + public PaginationInfo PaginationInfo { get; set; } } } diff --git a/src/Web/WebMVC/Models/Pagination/PaginationInfo.cs b/src/Web/WebMVC/Models/Pagination/PaginationInfo.cs new file mode 100644 index 000000000..3baffa560 --- /dev/null +++ b/src/Web/WebMVC/Models/Pagination/PaginationInfo.cs @@ -0,0 +1,17 @@ +using System; +using System.Collections.Generic; +using System.Linq; +using System.Threading.Tasks; + +namespace BikeSharing_Private_Web_Site.Services.Pagination +{ + public class PaginationInfo + { + public int TotalItems { get; set; } + public int ItemsPerPage { get; set; } + public int ActualPage { get; set; } + public int TotalPages { get; set; } + public string Previous { get; set; } + public string Next { get; set; } + } +} diff --git a/src/Web/WebMVC/Services/CartService.cs b/src/Web/WebMVC/Services/CartService.cs index aeb59cfaa..13cc1f627 100644 --- a/src/Web/WebMVC/Services/CartService.cs +++ b/src/Web/WebMVC/Services/CartService.cs @@ -28,7 +28,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services throw new NotImplementedException(); } - public Task GetOrderInProgress() + public Task GetActiveOrder() { return Task.Run(() => { return _order; }); } diff --git a/src/Web/WebMVC/Services/CatalogService.cs b/src/Web/WebMVC/Services/CatalogService.cs index 0a600747e..b2416a9de 100644 --- a/src/Web/WebMVC/Services/CatalogService.cs +++ b/src/Web/WebMVC/Services/CatalogService.cs @@ -3,21 +3,65 @@ using System.Collections.Generic; using System.Linq; using System.Threading.Tasks; using Microsoft.eShopOnContainers.WebMVC.Models; +using Microsoft.CodeAnalysis.Options; +using Microsoft.Extensions.Options; +using System.Net.Http; +using Microsoft.AspNetCore.Mvc.Rendering; namespace Microsoft.eShopOnContainers.WebMVC.Services { public class CatalogService : ICatalogService { - List _items; + private readonly List _items; //Fake data while services are ready. + private readonly IOptions _settings; + private HttpClient _apiClient; + private readonly string _remoteServiceBaseUrl; + private int _totalItems; - public CatalogService() { + public int TotalItems + { + get + { + return _totalItems; + } + } + + public CatalogService(IOptions settings) { + _settings = settings; + + #region fake data _items = new List() { - new CatalogItem() { Id = Guid.NewGuid(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12 }, - new CatalogItem() { Id = Guid.NewGuid(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17 }, - new CatalogItem() { Id = Guid.NewGuid(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12 }, - new CatalogItem() { Id = Guid.NewGuid(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5") } + new CatalogItem() { Id = Guid.NewGuid(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PicsUrl = "https://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PicsUrl = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PicsUrl = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PicsUrl = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PicsUrl = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PicsUrl = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PicsUrl = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Roslyn Red T-Shirt", Name = "Roslyn Red T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=RoslynRedT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Cupt Black & White Mug", Name = "Cupt Black & White Mug", Price= 17, PicsUrl = "https://fakeimg.pl/370x240/EEEEEE/000/?text=CuptBlack&WhiteMug" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = "Prism White T-Shirt", Name = "Prism White T-Shirt", Price = 12, PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.PrismWhiteT-Shirt" }, + new CatalogItem() { Id = Guid.NewGuid(), Description = ".NET Bot Black Sweatshirt", Name = ".NET Bot Black Sweatshirt", Price = decimal.Parse("19.5"), PicsUrl = "http://fakeimg.pl/370x240/EEEEEE/000/?text=.NETBotBlack" } }; + #endregion } public CatalogItem GetCatalogItem(Guid Id) @@ -25,9 +69,37 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services return _items.Where(x => x.Id == Id).FirstOrDefault(); } - public Task> GetCatalogItems() + public Task> GetCatalogItems(int? skip,int? take) { - return Task.Run(() => { return _items; }); + var res = _items; + + _totalItems = _items.Count(); + + if (skip.HasValue) + return Task.Run(() => { return _items.Skip(skip.Value).Take(take.Value).ToList(); }); + else + return Task.Run(() => { return _items; }); + } + + public IEnumerable GetBrands() + { + var items = new List(); + items.Add(new SelectListItem() { Value = "0", Text = "All", Selected = true }); + items.Add(new SelectListItem() { Value = "1", Text = "Visual Studio" }); + items.Add(new SelectListItem() { Value = "2", Text = "Azure" }); + + return items; + } + + public IEnumerable GetTypes() + { + var items = new List(); + items.Add(new SelectListItem() { Value = "0", Text = "All", Selected = true }); + items.Add(new SelectListItem() { Value = "1", Text = "Mug" }); + items.Add(new SelectListItem() { Value = "2", Text = "T-Shirt" }); + + + return items; } } } diff --git a/src/Web/WebMVC/Services/ICartService.cs b/src/Web/WebMVC/Services/ICartService.cs index 233dea570..8705ab2dc 100644 --- a/src/Web/WebMVC/Services/ICartService.cs +++ b/src/Web/WebMVC/Services/ICartService.cs @@ -11,6 +11,6 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services void AddItemToOrder(CatalogItem item); void RemoveItemFromOrder(Guid itemIdentifier); int GetItemCountFromOrderInProgress(); - Task GetOrderInProgress(); + Task GetActiveOrder(); } } diff --git a/src/Web/WebMVC/Services/ICatalogService.cs b/src/Web/WebMVC/Services/ICatalogService.cs index bf6b90ff7..50f2f9f54 100644 --- a/src/Web/WebMVC/Services/ICatalogService.cs +++ b/src/Web/WebMVC/Services/ICatalogService.cs @@ -1,4 +1,5 @@ -using Microsoft.eShopOnContainers.WebMVC.Models; +using Microsoft.AspNetCore.Mvc.Rendering; +using Microsoft.eShopOnContainers.WebMVC.Models; using System; using System.Collections.Generic; using System.Linq; @@ -8,7 +9,11 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services { public interface ICatalogService { - Task> GetCatalogItems(); + int TotalItems { get; } + + Task> GetCatalogItems(int? skip, int? take); CatalogItem GetCatalogItem(Guid Id); + IEnumerable GetBrands(); + IEnumerable GetTypes(); } } diff --git a/src/Web/WebMVC/Services/OrderingService.cs b/src/Web/WebMVC/Services/OrderingService.cs index 06ae93b1d..c9f2c3eb6 100644 --- a/src/Web/WebMVC/Services/OrderingService.cs +++ b/src/Web/WebMVC/Services/OrderingService.cs @@ -9,6 +9,9 @@ namespace Microsoft.eShopOnContainers.WebMVC.Services public class OrderingService : IOrderingService { private List _orders; + //var ordersUrl = _settings.OrderingUrl + "/api/ordering/orders"; + //var dataString = await _http.GetStringAsync(ordersUrl); + //var items = JsonConvert.DeserializeObject>(dataString); public OrderingService() { diff --git a/src/Web/WebMVC/Startup.cs b/src/Web/WebMVC/Startup.cs index dbf614716..24381c2f2 100644 --- a/src/Web/WebMVC/Startup.cs +++ b/src/Web/WebMVC/Startup.cs @@ -22,7 +22,8 @@ namespace Microsoft.eShopOnContainers.WebMVC var builder = new ConfigurationBuilder() .SetBasePath(env.ContentRootPath) .AddJsonFile("appsettings.json", optional: true, reloadOnChange: true) - .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true); + .AddJsonFile($"appsettings.{env.EnvironmentName}.json", optional: true) + .AddEnvironmentVariables(); if (env.IsDevelopment()) { @@ -73,7 +74,7 @@ namespace Microsoft.eShopOnContainers.WebMVC } else { - app.UseExceptionHandler("/Home/Error"); + app.UseExceptionHandler("/Catalog/Error"); } app.UseStaticFiles(); @@ -86,7 +87,7 @@ namespace Microsoft.eShopOnContainers.WebMVC { routes.MapRoute( name: "default", - template: "{controller=Home}/{action=Index}/{id?}"); + template: "{controller=Catalog}/{action=Index}/{id?}"); }); } } diff --git a/src/Web/WebMVC/ViewComponents/Cart.cs b/src/Web/WebMVC/ViewComponents/CartList.cs similarity index 82% rename from src/Web/WebMVC/ViewComponents/Cart.cs rename to src/Web/WebMVC/ViewComponents/CartList.cs index dd59738bf..0e56ddd0a 100644 --- a/src/Web/WebMVC/ViewComponents/Cart.cs +++ b/src/Web/WebMVC/ViewComponents/CartList.cs @@ -8,11 +8,11 @@ using System.Threading.Tasks; namespace Microsoft.eShopOnContainers.WebMVC.ViewComponents { - public class Cart : ViewComponent + public class CartList : ViewComponent { private readonly ICartService _cartSvc; - public Cart(ICartService cartSvc) + public CartList(ICartService cartSvc) { _cartSvc = cartSvc; } @@ -24,7 +24,7 @@ namespace Microsoft.eShopOnContainers.WebMVC.ViewComponents } private Task GetItemsAsync() { - return _cartSvc.GetOrderInProgress(); + return _cartSvc.GetActiveOrder(); } } } diff --git a/src/Web/WebMVC/Views/Catalog/Index.cshtml b/src/Web/WebMVC/Views/Catalog/Index.cshtml new file mode 100644 index 000000000..d701b3f7e --- /dev/null +++ b/src/Web/WebMVC/Views/Catalog/Index.cshtml @@ -0,0 +1,110 @@ +@{ + ViewData["Title"] = "Catalog"; + @model Microsoft.eShopOnContainers.WebMVC.Models.CatalogViewModels.IndexViewModel +} + +
+
+
+
+ +
+
+
+
+ + +
+
+ + +
+ +
+
+
+
+ +
+
+
+
+ +
+
Showing @Html.DisplayFor(modelItem => modelItem.PaginationInfo.ItemsPerPage) of @Html.DisplayFor(modelItem => modelItem.PaginationInfo.TotalItems) products - Page @(Model.PaginationInfo.ActualPage + 1) of @Html.DisplayFor(x => x.PaginationInfo.TotalPages)
+
+ +
+
+
+
+ @foreach (var catalogItem in Model.CatalogItems) + { +
+
+ + + ADD TO CART + +
+
+ @catalogItem.Name +
+
+ @catalogItem.Price.ToString("N2") +
+
+ } +
+
+
+
+ +
+
Showing @Html.DisplayFor(modelItem => modelItem.PaginationInfo.ItemsPerPage) of @Html.DisplayFor(modelItem => modelItem.PaginationInfo.TotalItems) products - Page @(Model.PaginationInfo.ActualPage + 1) of @Html.DisplayFor(x => x.PaginationInfo.TotalPages)
+
+ +
+
+
+
diff --git a/src/Web/WebMVC/Views/Home/Orders.cshtml b/src/Web/WebMVC/Views/Catalog/Orders.cshtml similarity index 100% rename from src/Web/WebMVC/Views/Home/Orders.cshtml rename to src/Web/WebMVC/Views/Catalog/Orders.cshtml diff --git a/src/Web/WebMVC/Views/Home/Index.cshtml b/src/Web/WebMVC/Views/Home/Index.cshtml deleted file mode 100644 index 792599621..000000000 --- a/src/Web/WebMVC/Views/Home/Index.cshtml +++ /dev/null @@ -1,67 +0,0 @@ -@{ - ViewData["Title"] = "Home Page"; - @model Microsoft.eShopOnContainers.WebMVC.Models.HomeViewModels.IndexViewModel -} - -
-
-
-
- -
-
- @* - *@ -
- - -
-
- - -
- - APPLY - -
-
-
- -
-
- @foreach (var catalogItem in Model.CatalogItems) - { -
-
- - - ADD TO CART - -
-
- @catalogItem.Name -
-
- @catalogItem.Price.ToString("N2") -
-
- } -
-
- diff --git a/src/Web/WebMVC/Views/Order/Cart.cshtml b/src/Web/WebMVC/Views/Order/Cart.cshtml index afbb48436..ab497fe9c 100644 --- a/src/Web/WebMVC/Views/Order/Cart.cshtml +++ b/src/Web/WebMVC/Views/Order/Cart.cshtml @@ -6,14 +6,11 @@
-
-  Continue Shopping  -




@@ -41,7 +38,7 @@ - @await Component.InvokeAsync("Cart") + @await Component.InvokeAsync("CartList")
diff --git a/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml b/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml index ccd1a7f7f..55acc63b1 100644 --- a/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml +++ b/src/Web/WebMVC/Views/Shared/Components/Cart/Default.cshtml @@ -4,17 +4,7 @@ ViewData["Title"] = "My Cart"; } -@foreach (var item in Model.OrderItems) -{ - - @*image*@ - @item.ProductName - ROSLYN - $ @item.UnitPrice - @item.Quantity - $ @item.Quantity * @item.UnitPrice - -} + diff --git a/src/Web/WebMVC/Views/Shared/Components/CartList/Default.cshtml b/src/Web/WebMVC/Views/Shared/Components/CartList/Default.cshtml new file mode 100644 index 000000000..ccd1a7f7f --- /dev/null +++ b/src/Web/WebMVC/Views/Shared/Components/CartList/Default.cshtml @@ -0,0 +1,20 @@ +@model Microsoft.eShopOnContainers.WebMVC.Models.Order + +@{ + ViewData["Title"] = "My Cart"; +} + +@foreach (var item in Model.OrderItems) +{ + + @*image*@ + @item.ProductName + ROSLYN + $ @item.UnitPrice + @item.Quantity + $ @item.Quantity * @item.UnitPrice + +} + + + diff --git a/src/Web/WebMVC/Views/Shared/_Layout.cshtml b/src/Web/WebMVC/Views/Shared/_Layout.cshtml index ab274a9ad..2c3c6f982 100644 --- a/src/Web/WebMVC/Views/Shared/_Layout.cshtml +++ b/src/Web/WebMVC/Views/Shared/_Layout.cshtml @@ -17,17 +17,11 @@ -
+
- @**@ - +
diff --git a/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml b/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml index 1b602cda8..d68a9cb54 100644 --- a/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml +++ b/src/Web/WebMVC/Views/Shared/_LoginPartial.cshtml @@ -9,15 +9,20 @@ } else { } diff --git a/src/Web/WebMVC/appsettings.json b/src/Web/WebMVC/appsettings.json index 8609c96b2..37270d7b6 100644 --- a/src/Web/WebMVC/appsettings.json +++ b/src/Web/WebMVC/appsettings.json @@ -1,7 +1,7 @@ { "ConnectionStrings": { //"DefaultConnection": "Server=(localdb)\\mssqllocaldb;Database=aspnet-Microsoft.eShopOnContainers.WebMVC-946ae052-8305-4a99-965b-ec8636ddbae3;Trusted_Connection=True;MultipleActiveResultSets=true;" - "DefaultConnection": "Server=(localdb)\\MSSQLLocalDB;Database=aspnet-Microsoft.eShopOnContainers.WebMVC;Initial Catalog=master;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False;Trusted_Connection=True;" + "DefaultConnection": "Server=.;Database=aspnet-Microsoft.eShopOnContainers.WebMVC;Integrated Security=True;Connect Timeout=30;Encrypt=False;TrustServerCertificate=True;ApplicationIntent=ReadWrite;MultiSubnetFailover=False;Trusted_Connection=True;" }, "CatalogUrl": "http://localhost:56986/", "OrderingUrl": "http://localhost:2446/", @@ -14,5 +14,3 @@ } } } - -Data Source=tcp:eshoponcontainerswebmvc2016dbserver.database.windows.net,1433;Initial Catalog=eShopOnContainersWebMVC2016_db;User Id=eshoponcontainerswebmvc2016dbserver@eshoponcontainerswebmvc2016dbserver;Password=Patata.123 diff --git a/src/Web/WebMVC/wwwroot/css/site.css b/src/Web/WebMVC/wwwroot/css/site.css index 71bf51367..291800c62 100644 --- a/src/Web/WebMVC/wwwroot/css/site.css +++ b/src/Web/WebMVC/wwwroot/css/site.css @@ -37,13 +37,17 @@ textarea { margin-right: 20px; color: white; padding-top: 20px; - padding-bottom: 5px; - min-width: 120px; + padding-bottom: 3px; + min-width: 140px; border-color: #37c7ca; max-height: 43px; -webkit-appearance: none; } + .select-filter option { + background-color: #00a69c; + } + select::-ms-expand { display: none; } @@ -62,13 +66,13 @@ select::-ms-expand { position: absolute; font-size: 10px; margin-top: 15px; - margin-left: 25px; + margin-left: 21px; color: white; } .select-filter-arrow { position: absolute; - margin-left: 110px; + margin-left: 130px; margin-top: 40px; } @@ -181,6 +185,11 @@ select::-ms-expand { float: right; } +.btn-catalog-apply { + padding-left: 10px; + padding-top: 13px; +} + .form-label { text-transform: uppercase; font-weight: normal!important; @@ -299,6 +308,7 @@ select::-ms-expand { .home-catalog-container { min-height: 400px; + margin-bottom: 20px; } .home-catalog-filter-container { @@ -409,7 +419,11 @@ footer { margin-top: 10px; } -form .text { +.text { + color: #83D01B; +} + +.text:hover { color: #83D01B; } @@ -517,10 +531,74 @@ form .col-md-4 { .login-user { position: absolute!important; - top: 40px; + top: 15px; right: 65px; } +.login-user-dropdown { + position: relative; + display: inline-block; +} + +.login-user-dropdown-content { + display: none; + position: absolute; + background-color: #f9f9f9; + min-width: 160px; + box-shadow: 0px 8px 16px 0px rgba(0,0,0,0.2); +} + +.login-user-dropdown-content a { + color: black; + padding: 12px 16px; + text-decoration: none; + display: block; +} + +.es-header { + min-height: 80px!important; +} + +.es-pager-bottom { + margin-top: 40px; +} + +.es-pager-top { + margin-bottom: 20px; + margin-top: 20px; +} + +.es-pager-top ul { + list-style: none; +} + +.es-pager-bottom ul { + list-style: none; +} + +.page-item { + cursor: pointer; +} + +.next { + position: absolute; + right: 0; + top: 0; +} + +.previous { + position: absolute; + left: 0; + top: 0; +} + +.is-disabled{ + cursor: not-allowed; + opacity: .5; + pointer-events: none; +} + + /* Hide/rearrange for smaller screens */ @media screen and (max-width: 767px) { /* Hide captions */ diff --git a/src/Web/WebMVC/wwwroot/css/site.min.css b/src/Web/WebMVC/wwwroot/css/site.min.css index 11da88cd6..4abd6ea27 100644 --- a/src/Web/WebMVC/wwwroot/css/site.min.css +++ b/src/Web/WebMVC/wwwroot/css/site.min.css @@ -1 +1 @@ -@font-face{font-family:Montserrat;font-weight:400;src:url("/fonts/Montserrat-Regular.eot?") format("eot"),url("/fonts/Montserrat-Regular.woff") format("woff"),url("/fonts/Montserrat-Regular.ttf") format("truetype"),url("/fonts/Montserrat-Regular.svg#Montserrat") format("svg")}@font-face{font-family:Montserrat;font-weight:700;src:url("/fonts/Montserrat-Bold.eot?") format("eot"),url("/fonts/Montserrat-Bold.woff") format("woff"),url("/fonts/Montserrat-Bold.ttf") format("truetype"),url("/fonts/Montserrat-Bold.svg#Montserrat") format("svg")}body{padding-top:80px;font-family:Montserrat,sans-serif}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.carousel-caption p{font-size:20px;line-height:1.4}.btn-bracketed:hover:before{display:inline-block;content:"[";padding-right:.5em;color:#7fff00}.btn-bracketed:hover:after{display:inline-block;content:"]";padding-left:.5em;color:#7fff00}.btn-brand{background-color:#83d01b;color:#fff;padding:10px 20px 10px 20px;font-weight:bold;border-radius:0;border:none;width:255px;display:inline-block;text-align:center;text-transform:uppercase}.btn-brand-big{width:360px;margin-top:20px}.btn-brand-dark{background-color:#00a69c}.btn-brand:hover{color:#fff;background-color:#83d01b}.btn-brand-dark:hover{background-color:#00a69c}.btn-cart{float:right}.form-label{text-transform:uppercase;font-weight:600;text-align:left;margin-bottom:10px !important}.form-input{border-radius:0;padding:10px;height:45px;width:360px;max-width:360px}.form-input-small{max-width:100px}.form-select{border-radius:0;padding:10px;height:45px;width:150px}.carousel-inner .item img[src$=".svg"]{width:100%}.navbar-inverse{background-color:#fff;border-color:#fff}.navbar-inverse li{margin-top:10px}.btn-login{border:1px solid #00a69c;height:40px;margin-right:10px;margin-top:5px;background-color:#fff;color:#00a69c}.navbar-inverse li a{height:30px;padding:5px 20px;color:#00a69c !important}.navbar-brand{margin-top:10px;background-image:url(../images/brand.PNG);width:201px;height:44px;margin-left:5px !important}.nav>li>a{color:#fff}.nav>li>a:hover,.nav>li>a:focus{background-color:#00a69c;font-weight:bolder}.container-fluid{padding-left:0;padding-right:0}.home-banner{width:100%;margin-right:0;margin-left:0;background-image:url(../images/main_banner.PNG);background-size:cover;height:340px;background-position:center}.home-catalog-container{min-height:400px}.home-catalog-filter-container{background-color:#00a69c}.home-catalog-filter-container li a{padding-top:5px !important}.home-catalog-filter-brands::before{content:'BRAND';color:#fff;font-size:x-small;opacity:.5;margin:10px 0 0 15px}.home-catalog-filter-types::before{content:'TYPES';color:#fff;font-size:x-small;opacity:.5;margin:10px 0 0 15px}.home-catalog-item{margin-top:10px;margin-bottom:10px}.home-catalog-item-image{width:100%;object-fit:cover;max-width:320px}.home-catalog-item-image-addCart{position:absolute;background-color:#83d01b;color:#fff;display:block;top:50%;transform:translateY(-50%);left:50%;transform:translateX(-50%);padding:10px 20px 10px 20px;font-weight:bold}.home-catalog-item-image-addCart:hover{color:#fff;text-decoration:none}.home-catalog-item-image:hover:after{cursor:pointer}.home-catalog-item-title{text-align:center;text-transform:uppercase;font-weight:300;font-size:16px;margin-top:20px}.home-catalog-item-price{text-align:center;font-weight:900}.home-catalog-item-price::before{content:'$'}.container .nav .navbar-nav .col-sm-6 ::before{content:'BRAND'}footer{background-color:#000;height:150px;vertical-align:middle}footer .brand{margin-top:10px;background-image:url(../images/brand_dark.PNG);max-width:231px;height:52px;margin-left:5px !important}footer .text{text-align:right;width:100%;height:100%;color:#83d01b;vertical-align:bottom}form .text{color:#83d01b}form .col-md-4{text-align:right}.brand-header-block{background-color:#00a69c;height:50px}.brand-header-block li{list-style:none;display:inline;opacity:.5;margin-top:15px;margin-left:10px;float:right;cursor:pointer;color:#fff}.brand-header-block li a{color:#fff}.brand-header-block li a:hover{text-decoration:none}.brand-header-block .active{opacity:1}.brand-header-block .active::before{content:'[ ';color:#adff2f}.brand-header-block .active::after{content:' ]';color:#adff2f}.brand-header-back{float:left!important;margin-top:20px!important;text-transform:uppercase}.account-login-container{min-height:70vh;text-align:center}.account-register-container{min-height:70vh;text-align:center !important;align-content:center}.cart-index-container{min-height:70vh;padding-top:40px}.input-validation-error{border:1px solid #fb0d0d}.text-danger{color:#fb0d0d}.cart{border:none !important}.form-horizontal h4{margin-top:30px}.form-control:focus{border-color:#83d01b}.account-register-container>input[type=text],input[type=password],input[type=email]{margin:auto}.order-create-section-title{margin-left:-15px;text-transform:uppercase}.order-create-section-items{margin-left:-30px}.fr{float:right!important}@media screen and (max-width:767px){.carousel-caption{display:none}footer .text{text-align:left;margin-top:-15px}} \ No newline at end of file +@font-face{font-family:Montserrat;font-weight:400;src:url("/fonts/Montserrat-Regular.eot?") format("eot"),url("/fonts/Montserrat-Regular.woff") format("woff"),url("/fonts/Montserrat-Regular.ttf") format("truetype"),url("/fonts/Montserrat-Regular.svg#Montserrat") format("svg")}@font-face{font-family:Montserrat;font-weight:700;src:url("/fonts/Montserrat-Bold.eot?") format("eot"),url("/fonts/Montserrat-Bold.woff") format("woff"),url("/fonts/Montserrat-Bold.ttf") format("truetype"),url("/fonts/Montserrat-Bold.svg#Montserrat") format("svg")}body{padding-top:80px;font-family:Montserrat,sans-serif}.body-content{padding-left:15px;padding-right:15px}input,select,textarea{max-width:280px}.select-filter{background-color:transparent;padding:10px;margin:10px;margin-right:20px;color:#fff;padding-top:20px;padding-bottom:5px;min-width:120px;border-color:#37c7ca;max-height:43px;-webkit-appearance:none}select::-ms-expand{display:none}.select-filter-wrapper{z-index:0;display:inline-block;margin-left:-10px}.select-filter-wrapper::before{content:attr(data-name);opacity:.5;z-index:1;text-transform:uppercase;position:absolute;font-size:10px;margin-top:15px;margin-left:25px;color:#fff}.select-filter-arrow{position:absolute;margin-left:110px;margin-top:40px}.btn-brand-small-filter{margin-top:10px;position:absolute;margin-left:15px}.carousel-caption p{font-size:20px;line-height:1.4}.layout-cart-image{height:36px;margin-top:5px}.btn-bracketed:hover:before{display:inline-block;content:"[";padding-right:.5em;color:#7fff00}.btn-bracketed:hover:after{display:inline-block;content:"]";padding-left:.5em;color:#7fff00}.btn-brand{background-color:#83d01b;color:#fff;padding:10px 20px 10px 20px;border-radius:0;border:none;width:255px;display:inline-block;text-align:center;text-transform:uppercase;height:45px;font-size:16px;font-weight:normal}.btn-brand::before{content:'['}.btn-brand::after{content:']'}.btn-brand:hover:before{padding-right:5px}.btn-brand:hover:after{padding-left:5px}.btn-brand-big{width:360px;margin-top:20px}.btn-brand-small{width:120px;font-size:14px}.btn-brand-small::before{content:''}.btn-brand-small::after{content:''}.btn-brand-small:hover:before{content:'';padding:0}.btn-brand-small:hover:after{content:'';padding:0}.btn-brand-dark{background-color:#00a69c}.btn-brand:hover{color:#fff;background-color:#83d01b;text-decoration:none}.btn-brand-dark:hover{background-color:#00a69c}.btn-cart{float:right}.form-label{text-transform:uppercase;font-weight:normal!important;text-align:left;margin-bottom:10px !important;color:#404040}.form-input{border-radius:0;padding:10px;height:45px;width:360px;max-width:360px}.form-input-small{max-width:100px}.form-select{border-radius:0;padding:10px;height:45px;width:150px}.carousel-inner .item img[src$=".svg"]{width:100%}.navbar-inverse{background-color:#fff;border-color:#fff}.navbar-inverse li{margin-top:10px}.btn-login{border:1px solid #00a69c;height:36px!important;margin-right:10px;margin-top:10px;background-color:#fff;color:#00a69c;text-transform:uppercase;max-width:140px;width:140px;padding-top:8px!important}.btn-login{font-weight:normal!important}.btn-login::before{content:'['}.btn-login::after{content:']'}.btn-login:hover:before{content:'[ '}.btn-login:hover:after{content:' ]'}.navbar-inverse li a{height:30px;padding:5px 20px;color:#00a69c !important}.navbar-brand{margin-top:20px;background-image:url(../images/brand.PNG);width:201px;height:44px;margin-left:0 !important}.nav>li>a{color:#fff}.nav>li>a:hover,.nav>li>a:focus{background-color:#00a69c;font-weight:bolder}.container-fluid{padding-left:0;padding-right:0}.home-banner{width:100%;margin-right:0;margin-left:0;background-image:url(../images/main_banner.PNG);background-size:cover;height:258px;background-position:center}.home-banner-text{margin-top:70px}.home-catalog-container{min-height:400px}.home-catalog-filter-container{background-color:#00a69c;height:63px}.home-catalog-filter-container li a{padding-top:5px !important}.home-catalog-filter-brands::before{content:'BRAND';color:#fff;font-size:x-small;opacity:.5;margin:10px 0 0 15px}.home-catalog-filter-types::before{content:'TYPES';color:#fff;font-size:x-small;opacity:.5;margin:10px 0 0 15px}.home-catalog-item{margin-top:10px;margin-bottom:10px}.home-catalog-item-image{width:100%;object-fit:cover;max-width:320px}.home-catalog-item-image-addCart{background-color:#83d01b;color:#fff;display:block;height:43px;padding:10px 20px 10px 20px;font-weight:bold;text-align:center;margin-top:10px;margin-left:50px;font-size:16px;font-weight:normal}.home-catalog-item-image-addCart:hover{color:#fff;text-decoration:none}.home-catalog-item-image:hover:after{cursor:pointer}.home-catalog-item-title{text-align:center;text-transform:uppercase;font-weight:300;font-size:16px;margin-top:20px}.home-catalog-item-price{text-align:center;font-weight:900;font-size:28px}.home-catalog-item-price::before{content:'$'}.container .nav .navbar-nav .col-sm-6 ::before{content:'BRAND'}.validation-summary-errors li{list-style:none}footer{background-color:#000;height:150px;vertical-align:middle}footer .brand{margin-top:25px;background-image:url(../images/brand_dark.PNG);max-width:231px;height:52px;margin-left:0 !important}footer .text{text-align:right;width:100%;height:100%;color:#83d01b;margin-top:10px}form .text{color:#83d01b}form .col-md-4{text-align:right}.brand-header-block{background-color:#00a69c;height:63px}.brand-header-block li{list-style:none;display:inline;opacity:.5;margin-top:25px;margin-left:10px;float:right;cursor:pointer;color:#fff}.brand-header-block li a{color:#fff}.brand-header-block li a:hover{text-decoration:none}.brand-header-block .active{opacity:1}.brand-header-block .active::before{content:'[ ';color:#adff2f}.brand-header-block .active::after{content:' ]';color:#adff2f}.brand-header-back{float:left!important;margin-top:20px!important;text-transform:uppercase}.account-login-container{min-height:70vh;text-align:center}.account-register-container{min-height:70vh;text-align:center !important;align-content:center}.cart-index-container{min-height:70vh;padding-top:40px}.input-validation-error{border:1px solid #fb0d0d}.text-danger{color:#fb0d0d;font-size:12px}.cart{border:none !important}.form-horizontal h4{margin-top:30px}.form-control:focus{border-color:#83d01b}.form-input-center{margin:auto}.order-create-section-title{margin-left:-15px;text-transform:uppercase}.order-create-section-items{margin-left:-30px}.fr{float:right!important}.login-user{position:absolute!important;top:40px;right:65px}@media screen and (max-width:767px){.carousel-caption{display:none}footer .text{text-align:left;margin-top:-15px}}@media screen and (max-width:415px){.btn-brand-small-filter{width:65px;padding:10px 10px 10px 10px;font-size:10px}} \ No newline at end of file