From 0f7e4d787e4b842c93614e8e668f24701742726c Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 11:12:43 +0300 Subject: [PATCH 01/22] moved catalog to public index page --- .../EShopOnAbpPublicWebMenuContributor.cs | 10 -- .../Menus/EShopOnAbpPublicWebMenus.cs | 1 - .../EShopOnAbp.PublicWeb/Pages/Index.cshtml | 122 ++++++++---------- .../Pages/Index.cshtml.cs | 14 +- .../Pages/{Catalog.css => index.css} | 0 .../Pages/{Catalog.cshtml.js => index.js} | 5 +- 6 files changed, 70 insertions(+), 82 deletions(-) rename apps/public-web/src/EShopOnAbp.PublicWeb/Pages/{Catalog.css => index.css} (100%) rename apps/public-web/src/EShopOnAbp.PublicWeb/Pages/{Catalog.cshtml.js => index.js} (93%) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebMenuContributor.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebMenuContributor.cs index f78e4c34..f2ea9b52 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebMenuContributor.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebMenuContributor.cs @@ -44,16 +44,6 @@ namespace EShopOnAbp.PublicWeb.Menus order: 0 ) ); - // Products - context.Menu.AddItem( - new ApplicationMenuItem( - EShopOnAbpPublicWebMenus.Catalog, - l["Catalog"], - "/Catalog", - icon: "fa fa-product-hunt", - order: 1 - ) - ); return Task.CompletedTask; } diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebMenus.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebMenus.cs index 0c9dc4e4..cb80e44b 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebMenus.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebMenus.cs @@ -5,6 +5,5 @@ private const string Prefix = "EShopOnAbp.Public"; public const string HomePage = Prefix + ".HomePage"; - public const string Catalog = Prefix + ".Catalog"; } } diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml index 5c9faabd..7d32de7b 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml @@ -1,72 +1,62 @@ @page @model EShopOnAbp.PublicWeb.Pages.IndexModel +@{ + const int productsColumnSize = 3; +} - - - - - - - - - +@section styles{ + +} +@section scripts { + + +} -
-
-
- -

Heading

-

Vestibulum id ligula porta.

-

Donec sed odio dui. Etiam porta sem malesuada magna mollis euismod. Morbi leo risus, porta ac consectetur ac, vestibulum at eros. Praesent commodo cursus magna.

-

View details »

-
-
- -

Heading

-

Nulla non metus auctor.

-

Duis mollis, est non commodo luctus, nisi erat porttitor ligula, eget lacinia odio sem nec elit.Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh.

-

View details »

-
-
- -

Heading

-

Metus auctor fringilla.

-

Donec sed odio dui. Cras justo odio, dapibus ac facilisis in, egestas eget quam. Fusce dapibus, tellus ac cursus commodo, tortor mauris condimentum nibh, sit amet risus.

-

View details »

-
-
- -
-
-

First featurette heading. It'll blow your mind.

-

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper.

-

Praesent commodo cursus magna, vel scelerisque nisl consectetur. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo.

-
-
- -
-
- -
-
-

Oh yeah, it's that good. See for yourself.

-

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper.

-

Praesent commodo cursus magna, vel scelerisque nisl consectetur. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo.

-
-
- +
+
+

Our Products

+
+ @for (int i = 0; i < Math.Ceiling(Model.Products.Count / (double)productsColumnSize); i++) + { + + @for (int j = 0; j < productsColumnSize; j++) + { + + @if ((i * productsColumnSize) + j < Model.Products.Count) + { + var product = Model.Products[(i * productsColumnSize) + j]; +
+ @if (!product.ImageName.IsNullOrEmpty()) + { + + } + else + { + + } +
+
+
+
@product.Name
+ @product.Code - Stock count: @product.StockCount +
+
+
+ $@product.Price +
+
+
+ } + + } + + }
- -
-
-

And lastly, this one. Checkmate.

-

Donec ullamcorper nulla non metus auctor fringilla. Vestibulum id ligula porta felis euismod semper.

-

Praesent commodo cursus magna, vel scelerisque nisl consectetur. Vestibulum id ligula porta felis euismod semper. Fusce dapibus, tellus ac cursus commodo.

-
-
- -
-
- -
+ @*
*@ + @*

Your Basket

*@ + @*
*@ + @* @await Component.InvokeAsync(typeof(BasketWidgetViewComponent)) *@ + @*
*@ + @*
*@ +
\ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml.cs index 22c79292..9e02dd2c 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml.cs @@ -1,4 +1,6 @@ -using System.Threading.Tasks; +using System.Collections.Generic; +using System.Threading.Tasks; +using EShopOnAbp.CatalogService.Products; using Microsoft.AspNetCore.Authentication; using Volo.Abp.AspNetCore.Mvc.UI.RazorPages; @@ -6,9 +8,17 @@ namespace EShopOnAbp.PublicWeb.Pages { public class IndexModel : AbpPageModel { - public void OnGet() + public IReadOnlyList Products { get; private set; } + private readonly IPublicProductAppService _productAppService; + + public IndexModel(IPublicProductAppService productAppService) { + _productAppService = productAppService; + } + public async Task OnGet() + { + Products = (await _productAppService.GetListAsync()).Items; } public async Task OnPostLoginAsync() diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Catalog.css b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.css similarity index 100% rename from apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Catalog.css rename to apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.css diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Catalog.cshtml.js b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js similarity index 93% rename from apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Catalog.cshtml.js rename to apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js index fefd8436..c3bad1c6 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Catalog.cshtml.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js @@ -1,8 +1,7 @@ -(function(){ +(function(){ $(function(){ + var basketWidget = new abp.WidgetManager('#BasketArea'); - var basketWidget = new abp.WidgetManager('#BasketArea'); - $('.product-list-item').click(function(){ var $this = $(this); var productId = $this.attr('data-product-id'); From 205e68fa62f5347f85b6bba736bfb752c78fe3dc Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 12:02:58 +0300 Subject: [PATCH 02/22] added cart widget This is not done since it requires CurrentUserId to perform basket requests. --- .../Cart/CartWidgetScriptContributor.cs | 15 +++++++++ .../Toolbar/Cart/CartWidgetViewComponent.cs | 29 +++++++++++++++++ .../Components/Toolbar/Cart/Default.cshtml | 10 ++++++ .../EShopOnAbpPublicWebToolbarContributor.cs | 3 ++ .../wwwroot/components/cart/cart-widget.css | 0 .../wwwroot/components/cart/cart-widget.js | 32 +++++++++++++++++++ 6 files changed, 89 insertions(+) create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetScriptContributor.cs create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.css create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetScriptContributor.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetScriptContributor.cs new file mode 100644 index 00000000..b7027a15 --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetScriptContributor.cs @@ -0,0 +1,15 @@ +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.SignalR; +using Volo.Abp.Modularity; + +namespace EShopOnAbp.PublicWeb.Components.Toolbar.Cart; + +[DependsOn(typeof(SignalRBrowserScriptContributor))] +public class CartWidgetScriptContributor: BundleContributor +{ + public override void ConfigureBundle(BundleConfigurationContext context) + { + context.Files.AddIfNotContains("/components/cart/cart-widget.js"); + } +} \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs new file mode 100644 index 00000000..5211dea0 --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs @@ -0,0 +1,29 @@ +using System.Threading.Tasks; +using EShopOnAbp.BasketService; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Widgets; + +namespace EShopOnAbp.PublicWeb.Components.Toolbar.Cart; + +[Widget( + AutoInitialize = true, + RefreshUrl = "/Widgets/Cart", + StyleFiles = new[] {"/components/cart/cart-widget.css"}, + ScriptTypes = new[] {typeof(CartWidgetScriptContributor)} +)] +public class CartWidgetViewComponent : AbpViewComponent +{ + private readonly IBasketAppService _basketAppService; + + public CartWidgetViewComponent(IBasketAppService basketAppService) + { + _basketAppService = basketAppService; + } + + public async Task InvokeAsync() + { + var basketDto = await _basketAppService.GetAsync(); + return View("~/Components/Toolbar/Cart/Default.cshtml", basketDto); + } +} \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml new file mode 100644 index 00000000..88c4b6fa --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml @@ -0,0 +1,10 @@ +@using EShopOnAbp.Localization +@using Microsoft.AspNetCore.Mvc.Localization +@inject IHtmlLocalizer L +@model EShopOnAbp.BasketService.BasketDto + +
+ + @L["Toolbar:Basket"] @Model.Items.Count + +
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebToolbarContributor.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebToolbarContributor.cs index cf1a59a0..03342e66 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebToolbarContributor.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebToolbarContributor.cs @@ -1,4 +1,5 @@ using System.Threading.Tasks; +using EShopOnAbp.PublicWeb.Components.Toolbar.Cart; using EShopOnAbp.PublicWeb.Components.Toolbar.LoginLink; using Microsoft.Extensions.DependencyInjection; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars; @@ -19,6 +20,8 @@ namespace EShopOnAbp.PublicWeb.Menus { context.Toolbar.Items.Add(new ToolbarItem(typeof(LoginLinkViewComponent))); } + + context.Toolbar.Items.Add(new ToolbarItem(typeof(CartWidgetViewComponent))); return Task.CompletedTask; } diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.css b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.css new file mode 100644 index 00000000..e69de29b diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js new file mode 100644 index 00000000..d3316681 --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js @@ -0,0 +1,32 @@ +(function (){ + var connection = new signalR.HubConnectionBuilder() + .withUrl("/signalr-hubs/cart") + .build(); + + connection.on("BasketProductUpdated", function (data) { + var widgetManager = $wrapper.data('abp-widget-manager'); + debugger; + $('#data-cart-count-id').text(data); + widgetManager.refresh(); + abp.notify.info('The product "' + data.productName + '" has been changed!', 'Your basket has been updated!'); + + // $('.basket-list') + // .closest('.abp-widget-wrapper') + // .each(function(){ + // var $wrapper = $(this); + // if ($wrapper.find('[data-product-id=' + data.productId + ']').length){ + // var widgetManager = new abp.WidgetManager({ + // wrapper: $wrapper + // }); + // widgetManager.refresh(); + // abp.notify.info('The product "' + data.productName + '" has been changed!', 'Your basket has been updated!'); + // } + // }); + }); + + connection.start().then(function () { + }).catch(function (err) { + return console.error(err.toString()); + }); + +})(); \ No newline at end of file From 7ebac77d11f6da67129960fdd971360416a37454 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 15:20:06 +0300 Subject: [PATCH 03/22] updated basket appservice with new method --- .../wwwroot/client-proxies/basket-proxy.js | 7 +++ .../IBasketAppService.cs | 4 +- .../BasketAppService.cs | 23 ++++++---- .../BasketServiceDomainModule.cs | 2 +- .../BasketServiceHttpApiClientModule.cs | 2 +- .../BasketClientProxy.Generated.cs | 8 ++++ .../ClientProxies/basket-generate-proxy.json | 45 +++++++++++++++++-- 7 files changed, 75 insertions(+), 16 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/client-proxies/basket-proxy.js b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/client-proxies/basket-proxy.js index c3877617..ec6cf88e 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/client-proxies/basket-proxy.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/client-proxies/basket-proxy.js @@ -18,6 +18,13 @@ }, ajaxParams)); }; + eShopOnAbp.basketService.basket.getByAnonymousUserId = function(id, ajaxParams) { + return abp.ajax($.extend(true, { + url: abp.appPath + 'api/basket/basket/' + id + '/by-anonymous-user-id', + type: 'GET' + }, ajaxParams)); + }; + eShopOnAbp.basketService.basket.addProduct = function(input, ajaxParams) { return abp.ajax($.extend(true, { url: abp.appPath + 'api/basket/basket/product', diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IBasketAppService.cs b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IBasketAppService.cs index 00266aa7..55a4ba0a 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IBasketAppService.cs +++ b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IBasketAppService.cs @@ -1,4 +1,5 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using Volo.Abp.Application.Services; namespace EShopOnAbp.BasketService; @@ -6,6 +7,7 @@ namespace EShopOnAbp.BasketService; public interface IBasketAppService : IApplicationService { Task GetAsync(); + Task GetByAnonymousUserIdAsync(Guid id); Task AddProductAsync(AddProductDto input); Task RemoveProductAsync(RemoveProductDto input); Task PurchaseAsync(); diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs b/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs index 76d77784..c7e06212 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs +++ b/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs @@ -10,7 +10,6 @@ using Volo.Abp.EventBus.Distributed; namespace EShopOnAbp.BasketService; -[Authorize] public class BasketAppService : BasketServiceAppService, IBasketAppService { private readonly IBasketRepository _basketRepository; @@ -26,13 +25,19 @@ public class BasketAppService : BasketServiceAppService, IBasketAppService _basketProductService = basketProductService; _distributedEventBus = distributedEventBus; } - + public async Task GetAsync() { var basket = await _basketRepository.GetAsync(CurrentUser.GetId()); return await GetBasketDtoAsync(basket); } + public async Task GetByAnonymousUserIdAsync(Guid id) + { + var basket = await _basketRepository.GetAsync(id); + return await GetBasketDtoAsync(basket); + } + public async Task AddProductAsync(AddProductDto input) { var basket = await _basketRepository.GetAsync(CurrentUser.GetId()); @@ -42,11 +47,11 @@ public class BasketAppService : BasketServiceAppService, IBasketAppService { throw new UserFriendlyException("There is not enough product in stock, sorry :("); } - + basket.AddProduct(product.Id); await _basketRepository.UpdateAsync(basket); - + return await GetBasketDtoAsync(basket); } @@ -54,11 +59,11 @@ public class BasketAppService : BasketServiceAppService, IBasketAppService { var basket = await _basketRepository.GetAsync(CurrentUser.GetId()); var product = await _basketProductService.GetAsync(input.ProductId); - + basket.RemoveProduct(product.Id, input.Count); - + await _basketRepository.UpdateAsync(basket); - + return await GetBasketDtoAsync(basket); } @@ -85,7 +90,7 @@ public class BasketAppService : BasketServiceAppService, IBasketAppService productDto = await _basketProductService.GetAsync(basketItem.ProductId); products[productDto.Id] = productDto; } - + //Removing the products if not available in the stock if (basketItem.Count > productDto.StockCount) { @@ -110,7 +115,7 @@ public class BasketAppService : BasketServiceAppService, IBasketAppService { await _basketRepository.UpdateAsync(basket); } - + return basketDto; } } \ No newline at end of file diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/BasketServiceDomainModule.cs b/services/basket/src/EShopOnAbp.BasketService.Domain/BasketServiceDomainModule.cs index e3992597..39230157 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Domain/BasketServiceDomainModule.cs +++ b/services/basket/src/EShopOnAbp.BasketService.Domain/BasketServiceDomainModule.cs @@ -11,7 +11,7 @@ namespace EShopOnAbp.BasketService typeof(AbpDddDomainModule), typeof(AbpCachingModule) )] - public class BasketServiceDomainModule : AbpModule + public class BasketServiceDomainModule : AbpModule { public override void ConfigureServices(ServiceConfigurationContext context) { diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/BasketServiceHttpApiClientModule.cs b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/BasketServiceHttpApiClientModule.cs index 36b13872..093c7352 100644 --- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/BasketServiceHttpApiClientModule.cs +++ b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/BasketServiceHttpApiClientModule.cs @@ -26,4 +26,4 @@ namespace EShopOnAbp.BasketService }); } } -} +} \ No newline at end of file diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/BasketClientProxy.Generated.cs b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/BasketClientProxy.Generated.cs index 014328ed..6a723592 100644 --- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/BasketClientProxy.Generated.cs +++ b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/BasketClientProxy.Generated.cs @@ -20,6 +20,14 @@ namespace EShopOnAbp.BasketService.ClientProxies return await RequestAsync(nameof(GetAsync)); } + public virtual async Task GetByAnonymousUserIdAsync(Guid id) + { + return await RequestAsync(nameof(GetByAnonymousUserIdAsync), new ClientProxyRequestTypeValue + { + { typeof(Guid), id } + }); + } + public virtual async Task AddProductAsync(AddProductDto input) { return await RequestAsync(nameof(AddProductAsync), new ClientProxyRequestTypeValue diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json index c6f742a4..0ff4ec2a 100644 --- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json +++ b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json @@ -35,7 +35,44 @@ "type": "EShopOnAbp.BasketService.BasketDto", "typeSimple": "EShopOnAbp.BasketService.BasketDto" }, - "allowAnonymous": false, + "allowAnonymous": null, + "implementFrom": "EShopOnAbp.BasketService.IBasketAppService" + }, + "GetByAnonymousUserIdAsyncById": { + "uniqueName": "GetByAnonymousUserIdAsyncById", + "name": "GetByAnonymousUserIdAsync", + "httpMethod": "GET", + "url": "api/basket/basket/{id}/by-anonymous-user-id", + "supportedVersions": [], + "parametersOnMethod": [ + { + "name": "id", + "typeAsString": "System.Guid, System.Private.CoreLib", + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null + } + ], + "parameters": [ + { + "nameOnMethod": "id", + "name": "id", + "jsonName": null, + "type": "System.Guid", + "typeSimple": "string", + "isOptional": false, + "defaultValue": null, + "constraintTypes": [], + "bindingSourceId": "Path", + "descriptorName": "" + } + ], + "returnValue": { + "type": "EShopOnAbp.BasketService.BasketDto", + "typeSimple": "EShopOnAbp.BasketService.BasketDto" + }, + "allowAnonymous": null, "implementFrom": "EShopOnAbp.BasketService.IBasketAppService" }, "AddProductAsyncByInput": { @@ -72,7 +109,7 @@ "type": "EShopOnAbp.BasketService.BasketDto", "typeSimple": "EShopOnAbp.BasketService.BasketDto" }, - "allowAnonymous": false, + "allowAnonymous": null, "implementFrom": "EShopOnAbp.BasketService.IBasketAppService" }, "RemoveProductAsyncByInput": { @@ -121,7 +158,7 @@ "type": "EShopOnAbp.BasketService.BasketDto", "typeSimple": "EShopOnAbp.BasketService.BasketDto" }, - "allowAnonymous": false, + "allowAnonymous": null, "implementFrom": "EShopOnAbp.BasketService.IBasketAppService" }, "PurchaseAsync": { @@ -136,7 +173,7 @@ "type": "System.Void", "typeSimple": "System.Void" }, - "allowAnonymous": false, + "allowAnonymous": null, "implementFrom": "EShopOnAbp.BasketService.IBasketAppService" } } From 95f482c76b2228000d339b4c0e1ce45f662f72bd Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 15:20:16 +0300 Subject: [PATCH 04/22] added cart-widget --- .../Cart/CartWidgetStyleContributor.cs | 12 +++++ .../Toolbar/Cart/CartWidgetViewComponent.cs | 47 +++++++++++++++++-- .../Components/Toolbar/Cart/Default.cshtml | 20 +++++--- .../src/EShopOnAbp.PublicWeb/Pages/index.js | 14 ++++-- .../wwwroot/components/cart/cart-widget.css | 4 ++ 5 files changed, 82 insertions(+), 15 deletions(-) create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetStyleContributor.cs diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetStyleContributor.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetStyleContributor.cs new file mode 100644 index 00000000..d0b42f47 --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetStyleContributor.cs @@ -0,0 +1,12 @@ +using System.Collections.Generic; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; + +namespace EShopOnAbp.PublicWeb.Components.Toolbar.Cart; + +public class CartWidgetStyleContributor : BundleContributor +{ + public override void ConfigureBundle(BundleConfigurationContext context) + { + context.Files.AddIfNotContains("/components/cart/cart-widget.css"); + } +} \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs index 5211dea0..17d54382 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs @@ -1,29 +1,68 @@ -using System.Threading.Tasks; +using System; +using System.Security.Claims; +using System.Threading.Tasks; using EShopOnAbp.BasketService; +using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; +using Volo.Abp.Guids; +using Volo.Abp.Security.Claims; +using Volo.Abp.Users; namespace EShopOnAbp.PublicWeb.Components.Toolbar.Cart; [Widget( AutoInitialize = true, RefreshUrl = "/Widgets/Cart", - StyleFiles = new[] {"/components/cart/cart-widget.css"}, + StyleTypes = new[] {typeof(CartWidgetStyleContributor)}, ScriptTypes = new[] {typeof(CartWidgetScriptContributor)} )] public class CartWidgetViewComponent : AbpViewComponent { private readonly IBasketAppService _basketAppService; + private readonly IGuidGenerator _guidGenerator; + private readonly ICurrentUser _currentUser; + private readonly IHttpContextAccessor _httpContextAccessor; - public CartWidgetViewComponent(IBasketAppService basketAppService) + protected HttpContext HttpContext => _httpContextAccessor.HttpContext; + protected const string AnonymousUserCookieName = "eshop_anonymousId"; + + public CartWidgetViewComponent( + IBasketAppService basketAppService, + ICurrentUser currentUser, + IGuidGenerator guidGenerator, + IHttpContextAccessor httpContextAccessor) { _basketAppService = basketAppService; + _currentUser = currentUser; + _httpContextAccessor = httpContextAccessor; + _guidGenerator = guidGenerator; } public async Task InvokeAsync() { - var basketDto = await _basketAppService.GetAsync(); + BasketDto basketDto = new BasketDto(); + try + { + if (!_currentUser.IsAuthenticated) + { + var anonymousUserId = _guidGenerator.Create(); + HttpContext.Response.Cookies.Append(AnonymousUserCookieName, anonymousUserId.ToString()); + basketDto = await _basketAppService.GetByAnonymousUserIdAsync(anonymousUserId); + } + else + { + //TODO: Merge with anonymously stored cart if exist + basketDto = await _basketAppService.GetAsync(); + } + } + catch (Exception e) + { + basketDto = null; + Console.WriteLine(e); + } + return View("~/Components/Toolbar/Cart/Default.cshtml", basketDto); } } \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml index 88c4b6fa..f4e72890 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml @@ -1,10 +1,16 @@ -@using EShopOnAbp.Localization +@using EShopOnAbp.BasketService.Localization @using Microsoft.AspNetCore.Mvc.Localization -@inject IHtmlLocalizer L +@inject IHtmlLocalizer L @model EShopOnAbp.BasketService.BasketDto - -
- - @L["Toolbar:Basket"] @Model.Items.Count +
+ @if (Model == null) + { + @L["Toolbar:BasketNotLoaded"] + } + else + { + + @L["Toolbar:Cart"] @Model.Items.Count -
+ } +
\ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js index c3bad1c6..24c02b0f 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js @@ -1,13 +1,19 @@ -(function(){ - $(function(){ +(function () { + //set anonymous user + let anonymousId = abp.utils.getCookieValue("eshop_anonymousId"); + if (anonymousId != null) { + console.info("Anonymous user set:" + anonymousId); + } + + $(function () { var basketWidget = new abp.WidgetManager('#BasketArea'); - $('.product-list-item').click(function(){ + $('.product-list-item').click(function () { var $this = $(this); var productId = $this.attr('data-product-id'); eShopOnAbp.basketService.basket.addProduct({ productId: productId - }).then(function(){ + }).then(function () { basketWidget.refresh(); abp.notify.success("Added product to your basket.", "Successfully added"); }); diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.css b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.css index e69de29b..083ca3ea 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.css +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.css @@ -0,0 +1,4 @@ +.cart-error { + vertical-align: -webkit-baseline-middle; + color: rgba(255, 255, 255, 0.75); +} \ No newline at end of file From 93df962044552a711befabbd6b89fdce91edb9a4 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 15:21:40 +0300 Subject: [PATCH 05/22] updated localization for basket --- .../Localization/BasketService/en.json | 4 +++- .../Localization/BasketService/tr.json | 4 +++- 2 files changed, 6 insertions(+), 2 deletions(-) diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/en.json b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/en.json index d2a6a983..d1b6949a 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/en.json +++ b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/en.json @@ -3,6 +3,8 @@ "texts": { "Menu:Home": "Home", "Welcome": "Welcome", - "LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io." + "LongWelcomeMessage": "Welcome to the application. This is a startup project based on the ABP framework. For more information, visit abp.io.", + "Toolbar:Cart": "My Cart", + "Toolbar:BasketNotLoaded": "Couldn't Load!" } } diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/tr.json b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/tr.json index 2cc911e4..60577366 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/tr.json +++ b/services/basket/src/EShopOnAbp.BasketService.Domain.Shared/Localization/BasketService/tr.json @@ -3,6 +3,8 @@ "texts": { "Menu:Home": "Ana sayfa", "Welcome": "Hoşgeldiniz", - "LongWelcomeMessage": "Uygulamaya hoşgeldiniz. Bu, ABP framework'ü üzerine bina edilmiş bir başlangıç projesidir. Daha fazla bilgi için abp.io adresini ziyaret edebilirsiniz." + "LongWelcomeMessage": "Uygulamaya hoşgeldiniz. Bu, ABP framework'ü üzerine bina edilmiş bir başlangıç projesidir. Daha fazla bilgi için abp.io adresini ziyaret edebilirsiniz.", + "Toolbar:Cart": "Sepetim", + "Toolbar:BasketNotLoaded": "Sepet Hatası!" } } \ No newline at end of file From a0546fb45f4b5a97117acf19771ce5a6e3bc4e23 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 15:59:55 +0300 Subject: [PATCH 06/22] basket service update for anonymous users --- .../BasketAppService.cs | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs b/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs index c7e06212..c404ccb6 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs +++ b/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs @@ -15,6 +15,7 @@ public class BasketAppService : BasketServiceAppService, IBasketAppService private readonly IBasketRepository _basketRepository; private readonly IBasketProductService _basketProductService; private readonly IDistributedEventBus _distributedEventBus; + private Guid _anonymousUserId { get; set; } public BasketAppService( IBasketRepository basketRepository, @@ -35,12 +36,15 @@ public class BasketAppService : BasketServiceAppService, IBasketAppService public async Task GetByAnonymousUserIdAsync(Guid id) { var basket = await _basketRepository.GetAsync(id); + _anonymousUserId = id; return await GetBasketDtoAsync(basket); } public async Task AddProductAsync(AddProductDto input) { - var basket = await _basketRepository.GetAsync(CurrentUser.GetId()); + Guid userId = CurrentUser.IsAuthenticated ? CurrentUser.GetId() : _anonymousUserId; + + var basket = await _basketRepository.GetAsync(userId); var product = await _basketProductService.GetAsync(input.ProductId); if (basket.GetProductCount(product.Id) >= product.StockCount) From 74296d283bcdf9a40a1678fd61c71036bebb2af0 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 16:00:03 +0300 Subject: [PATCH 07/22] updated cart widget --- .../Components/Basket/BasketWidgetViewComponent.cs | 4 ++-- .../Components/Toolbar/Cart/Default.cshtml | 8 ++++---- .../src/EShopOnAbp.PublicWeb/Pages/Index.cshtml | 2 +- .../src/EShopOnAbp.PublicWeb/Pages/Index.cshtml.cs | 2 +- .../src/EShopOnAbp.PublicWeb/Pages/index.js | 4 ++-- .../wwwroot/components/cart/cart-widget.js | 11 ++++++----- 6 files changed, 16 insertions(+), 15 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs index 71e36800..73ea746f 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs @@ -9,8 +9,8 @@ namespace EShopOnAbp.PublicWeb.Components.Basket; [Widget( AutoInitialize = true, RefreshUrl = "/Widgets/Basket", - StyleFiles = new[] { "/components/basket-widget.css" }, - ScriptTypes = new[] { typeof(BasketWidgetScriptContributor) } + StyleFiles = new[] {"/components/basket-widget.css"}, + ScriptTypes = new[] {typeof(BasketWidgetScriptContributor)} )] public class BasketWidgetViewComponent : AbpViewComponent { diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml index f4e72890..46be8b76 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml @@ -2,15 +2,15 @@ @using Microsoft.AspNetCore.Mvc.Localization @inject IHtmlLocalizer L @model EShopOnAbp.BasketService.BasketDto -
+ \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml index 7d32de7b..1d48ddb9 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml @@ -1,7 +1,7 @@ @page @model EShopOnAbp.PublicWeb.Pages.IndexModel @{ - const int productsColumnSize = 3; + const int productsColumnSize = 4; } @section styles{ diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml.cs index 9e02dd2c..6191dd43 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml.cs @@ -26,4 +26,4 @@ namespace EShopOnAbp.PublicWeb.Pages await HttpContext.ChallengeAsync("oidc"); } } -} +} \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js index 24c02b0f..5646757f 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js @@ -6,7 +6,7 @@ } $(function () { - var basketWidget = new abp.WidgetManager('#BasketArea'); + var cartWidget = new abp.WidgetManager('#shopping-cart'); $('.product-list-item').click(function () { var $this = $(this); @@ -14,7 +14,7 @@ eShopOnAbp.basketService.basket.addProduct({ productId: productId }).then(function () { - basketWidget.refresh(); + cartWidget.refresh(); abp.notify.success("Added product to your basket.", "Successfully added"); }); }); diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js index d3316681..3692d029 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js @@ -1,15 +1,16 @@ -(function (){ +(function () { + alert("working") var connection = new signalR.HubConnectionBuilder() - .withUrl("/signalr-hubs/cart") + .withUrl("/signalr-hubs/basket") .build(); - + connection.on("BasketProductUpdated", function (data) { - var widgetManager = $wrapper.data('abp-widget-manager'); debugger; + var widgetManager = $wrapper.data('abp-widget-manager'); $('#data-cart-count-id').text(data); widgetManager.refresh(); abp.notify.info('The product "' + data.productName + '" has been changed!', 'Your basket has been updated!'); - + // $('.basket-list') // .closest('.abp-widget-wrapper') // .each(function(){ From daf81bfa28136603a49606cffe7971c432b800eb Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 16:15:32 +0300 Subject: [PATCH 08/22] updated cart widget --- .../Components/Toolbar/Cart/Default.cshtml | 2 +- .../wwwroot/components/cart/cart-widget.js | 17 ++--------------- 2 files changed, 3 insertions(+), 16 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml index 46be8b76..74d306ec 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/Default.cshtml @@ -9,7 +9,7 @@ } else { - + @Model.Items.Count @L["Toolbar:Cart"] } diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js index 3692d029..a006ddde 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js @@ -1,28 +1,15 @@ (function () { - alert("working") var connection = new signalR.HubConnectionBuilder() .withUrl("/signalr-hubs/basket") .build(); connection.on("BasketProductUpdated", function (data) { - debugger; var widgetManager = $wrapper.data('abp-widget-manager'); + //todo:test + debugger; $('#data-cart-count-id').text(data); widgetManager.refresh(); abp.notify.info('The product "' + data.productName + '" has been changed!', 'Your basket has been updated!'); - - // $('.basket-list') - // .closest('.abp-widget-wrapper') - // .each(function(){ - // var $wrapper = $(this); - // if ($wrapper.find('[data-product-id=' + data.productId + ']').length){ - // var widgetManager = new abp.WidgetManager({ - // wrapper: $wrapper - // }); - // widgetManager.refresh(); - // abp.notify.info('The product "' + data.productName + '" has been changed!', 'Your basket has been updated!'); - // } - // }); }); connection.start().then(function () { From 8a87f558d470824b787bc247b31d03658d55e7bb Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 16:30:56 +0300 Subject: [PATCH 09/22] added basket page --- .../src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml | 14 ++++++++++++++ .../EShopOnAbp.PublicWeb/Pages/Basket.cshtml.cs | 11 +++++++++++ .../EShopOnAbp.PublicWeb/Pages/Catalog.cshtml.cs | 2 +- 3 files changed, 26 insertions(+), 1 deletion(-) create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml.cs diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml new file mode 100644 index 00000000..26f62c81 --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml @@ -0,0 +1,14 @@ +@page +@using EShopOnAbp.PublicWeb.Components.Basket +@model EShopOnAbp.PublicWeb.Pages.Basket + +@{ + +} + +
+

Your Basket

+
+ @await Component.InvokeAsync(typeof(BasketWidgetViewComponent)) +
+
\ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml.cs new file mode 100644 index 00000000..8de8b3c4 --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml.cs @@ -0,0 +1,11 @@ +using Microsoft.AspNetCore.Mvc.RazorPages; + +namespace EShopOnAbp.PublicWeb.Pages; + +public class Basket : PageModel +{ + public void OnGet() + { + + } +} \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Catalog.cshtml.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Catalog.cshtml.cs index e7874572..c762a0d5 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Catalog.cshtml.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Catalog.cshtml.cs @@ -14,7 +14,7 @@ public class Catalog : PageModel { _productAppService = productAppService; } - + public async Task OnGetAsync() { Products = (await _productAppService.GetListAsync()).Items; From ab5991222c268c13c02c1319d3f14140cb23dd9b Mon Sep 17 00:00:00 2001 From: enisn Date: Tue, 21 Dec 2021 16:34:45 +0300 Subject: [PATCH 10/22] Remove IHttpContextAccessor since it comes from base --- .../Components/Toolbar/Cart/CartWidgetViewComponent.cs | 6 +----- 1 file changed, 1 insertion(+), 5 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs index 17d54382..2a875f86 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs @@ -23,20 +23,16 @@ public class CartWidgetViewComponent : AbpViewComponent private readonly IBasketAppService _basketAppService; private readonly IGuidGenerator _guidGenerator; private readonly ICurrentUser _currentUser; - private readonly IHttpContextAccessor _httpContextAccessor; - protected HttpContext HttpContext => _httpContextAccessor.HttpContext; protected const string AnonymousUserCookieName = "eshop_anonymousId"; public CartWidgetViewComponent( IBasketAppService basketAppService, ICurrentUser currentUser, - IGuidGenerator guidGenerator, - IHttpContextAccessor httpContextAccessor) + IGuidGenerator guidGenerator,) { _basketAppService = basketAppService; _currentUser = currentUser; - _httpContextAccessor = httpContextAccessor; _guidGenerator = guidGenerator; } From f89bdc098b63d6bdab7f44dc461453f1d60ceb73 Mon Sep 17 00:00:00 2001 From: enisn Date: Tue, 21 Dec 2021 16:39:34 +0300 Subject: [PATCH 11/22] Update CartWidgetViewComponent.cs --- .../Components/Toolbar/Cart/CartWidgetViewComponent.cs | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs index 2a875f86..92fde505 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs @@ -29,7 +29,7 @@ public class CartWidgetViewComponent : AbpViewComponent public CartWidgetViewComponent( IBasketAppService basketAppService, ICurrentUser currentUser, - IGuidGenerator guidGenerator,) + IGuidGenerator guidGenerator) { _basketAppService = basketAppService; _currentUser = currentUser; From db3d078d0a00cdf2639a6a7f51fd693e207a2507 Mon Sep 17 00:00:00 2001 From: enisn Date: Tue, 21 Dec 2021 16:58:31 +0300 Subject: [PATCH 12/22] Fix Basket widget refresh issue --- .../Components/Toolbar/Cart/CartWidgetViewComponent.cs | 2 +- apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js | 7 +++++-- 2 files changed, 6 insertions(+), 3 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs index 92fde505..078bb8a3 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs @@ -14,7 +14,7 @@ namespace EShopOnAbp.PublicWeb.Components.Toolbar.Cart; [Widget( AutoInitialize = true, - RefreshUrl = "/Widgets/Cart", + RefreshUrl = "/Widgets/Basket", StyleTypes = new[] {typeof(CartWidgetStyleContributor)}, ScriptTypes = new[] {typeof(CartWidgetScriptContributor)} )] diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js index 5646757f..c7f92a38 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js @@ -5,8 +5,11 @@ console.info("Anonymous user set:" + anonymousId); } + var widgetManager = new abp.WidgetManager({ + wrapper: $($('.abp-widget-wrapper[data-widget-name="CartWidget"]')[0]) + }); + $(function () { - var cartWidget = new abp.WidgetManager('#shopping-cart'); $('.product-list-item').click(function () { var $this = $(this); @@ -14,7 +17,7 @@ eShopOnAbp.basketService.basket.addProduct({ productId: productId }).then(function () { - cartWidget.refresh(); + widgetManager.refresh(); abp.notify.success("Added product to your basket.", "Successfully added"); }); }); From 8d8c4c6de2213c5ce9fae21b62e0cb947bee4cf3 Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 16:59:33 +0300 Subject: [PATCH 13/22] updated basket widget --- .../Basket/BasketWidgetViewComponent.cs | 54 +++++++++++++++++-- .../EShopOnAbp.PublicWeb/CookieConstants.cs | 8 +++ .../EShopOnAbp.PublicWeb/Pages/Basket.cshtml | 2 +- 3 files changed, 60 insertions(+), 4 deletions(-) create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/CookieConstants.cs diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs index 73ea746f..fd249aca 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs @@ -1,8 +1,13 @@ -using System.Threading.Tasks; +using System; +using System.Threading.Tasks; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; using EShopOnAbp.BasketService; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; +using Volo.Abp.Guids; +using Volo.Abp.Users; namespace EShopOnAbp.PublicWeb.Components.Basket; @@ -15,15 +20,58 @@ namespace EShopOnAbp.PublicWeb.Components.Basket; public class BasketWidgetViewComponent : AbpViewComponent { private readonly IBasketAppService _basketAppService; + private readonly ICurrentUser _currentUser; + private readonly IGuidGenerator _guidGenerator; + private readonly ILogger _logger; - public BasketWidgetViewComponent(IBasketAppService basketAppService) + public BasketWidgetViewComponent( + IBasketAppService basketAppService, + ICurrentUser currentUser, + IGuidGenerator guidGenerator, ILogger logger) { _basketAppService = basketAppService; + _currentUser = currentUser; + _guidGenerator = guidGenerator; + _logger = logger; } public async Task InvokeAsync() { - var basketDto = await _basketAppService.GetAsync(); + BasketDto basketDto = new BasketDto(); + try + { + // Get anonymous user id from cookie + HttpContext.Request.Cookies.TryGetValue(CookieConstants.AnonymousUserCookieName, + out string anonymousUserId); + _logger.LogInformation($"========= Anonymous User Id from Cookie:{anonymousUserId} ========= "); + + // Generate new id for anonymous user + if (string.IsNullOrEmpty(anonymousUserId)) + { + anonymousUserId = _guidGenerator.Create().ToString(); + HttpContext.Response.Cookies.Append(CookieConstants.AnonymousUserCookieName, anonymousUserId); + _logger.LogInformation($"========= Generated new User Id:{anonymousUserId} ========= APPENDED TO COOKIE ====== "); + } + + if (!_currentUser.IsAuthenticated) + { + basketDto = await _basketAppService.GetByAnonymousUserIdAsync(Guid.Parse(anonymousUserId)); + _logger.LogInformation( + $"========= Get Basket for Anonymous UserId:{anonymousUserId} ========= APPENDED TO COOKIE ====== "); + _logger.LogInformation($"========= Basket Item Count:{basketDto.Items.Count} ========= "); + } + else + { + //TODO: Merge with anonymously stored cart if exist + basketDto = await _basketAppService.GetAsync(); + } + } + catch (Exception e) + { + basketDto = null; + Console.WriteLine(e); + } + return View("~/Components/Basket/Default.cshtml", basketDto); } } \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/CookieConstants.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/CookieConstants.cs new file mode 100644 index 00000000..1994218b --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/CookieConstants.cs @@ -0,0 +1,8 @@ +using System; + +namespace EShopOnAbp.PublicWeb; + +public static class CookieConstants +{ + public const string AnonymousUserCookieName = "eshop_anonymousId"; +} \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml index 26f62c81..8ad6e540 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml @@ -6,7 +6,7 @@ } -
+

Your Basket

@await Component.InvokeAsync(typeof(BasketWidgetViewComponent)) From 5d44eefdcc39a5f6e0edeb0367b078f81af9d33c Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Tue, 21 Dec 2021 17:03:03 +0300 Subject: [PATCH 14/22] fixes re-creation of anonymousUserId --- .../Basket/BasketWidgetViewComponent.cs | 1 - .../Toolbar/Cart/CartWidgetViewComponent.cs | 31 +++++++++++++------ 2 files changed, 22 insertions(+), 10 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs index fd249aca..3659494f 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs @@ -4,7 +4,6 @@ using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; using EShopOnAbp.BasketService; -using Microsoft.AspNetCore.Http; using Microsoft.Extensions.Logging; using Volo.Abp.Guids; using Volo.Abp.Users; diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs index 078bb8a3..838cafe4 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs @@ -1,13 +1,11 @@ using System; -using System.Security.Claims; using System.Threading.Tasks; using EShopOnAbp.BasketService; -using Microsoft.AspNetCore.Http; using Microsoft.AspNetCore.Mvc; +using Microsoft.Extensions.Logging; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; using Volo.Abp.Guids; -using Volo.Abp.Security.Claims; using Volo.Abp.Users; namespace EShopOnAbp.PublicWeb.Components.Toolbar.Cart; @@ -23,17 +21,18 @@ public class CartWidgetViewComponent : AbpViewComponent private readonly IBasketAppService _basketAppService; private readonly IGuidGenerator _guidGenerator; private readonly ICurrentUser _currentUser; - - protected const string AnonymousUserCookieName = "eshop_anonymousId"; + private readonly ILogger _logger; public CartWidgetViewComponent( IBasketAppService basketAppService, ICurrentUser currentUser, - IGuidGenerator guidGenerator) + IGuidGenerator guidGenerator, + ILogger logger) { _basketAppService = basketAppService; _currentUser = currentUser; _guidGenerator = guidGenerator; + _logger = logger; } public async Task InvokeAsync() @@ -41,11 +40,25 @@ public class CartWidgetViewComponent : AbpViewComponent BasketDto basketDto = new BasketDto(); try { + // Get anonymous user id from cookie + HttpContext.Request.Cookies.TryGetValue(CookieConstants.AnonymousUserCookieName, + out string anonymousUserId); + _logger.LogInformation($"========= Anonymous User Id from Cookie:{anonymousUserId} ========= "); + + // Generate new id for anonymous user + if (string.IsNullOrEmpty(anonymousUserId)) + { + anonymousUserId = _guidGenerator.Create().ToString(); + HttpContext.Response.Cookies.Append(CookieConstants.AnonymousUserCookieName, anonymousUserId); + _logger.LogInformation($"========= Generated new User Id:{anonymousUserId} ========= APPENDED TO COOKIE ====== "); + } + if (!_currentUser.IsAuthenticated) { - var anonymousUserId = _guidGenerator.Create(); - HttpContext.Response.Cookies.Append(AnonymousUserCookieName, anonymousUserId.ToString()); - basketDto = await _basketAppService.GetByAnonymousUserIdAsync(anonymousUserId); + basketDto = await _basketAppService.GetByAnonymousUserIdAsync(Guid.Parse(anonymousUserId)); + _logger.LogInformation( + $"========= Get Basket for Anonymous UserId:{anonymousUserId} ========= APPENDED TO COOKIE ====== "); + _logger.LogInformation($"========= Basket Item Count:{basketDto.Items.Count} ========= "); } else { From 4a806270aa815dfeaac90e506ae8f248897b6953 Mon Sep 17 00:00:00 2001 From: enisn Date: Tue, 21 Dec 2021 17:05:22 +0300 Subject: [PATCH 15/22] Add Cart widget endpoint --- .../Components/Toolbar/Cart/CartWidgetViewComponent.cs | 2 +- .../EShopOnAbp.PublicWeb/Controllers/WidgetsController.cs | 8 ++++++++ 2 files changed, 9 insertions(+), 1 deletion(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs index 838cafe4..b3b09e8d 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs @@ -12,7 +12,7 @@ namespace EShopOnAbp.PublicWeb.Components.Toolbar.Cart; [Widget( AutoInitialize = true, - RefreshUrl = "/Widgets/Basket", + RefreshUrl = "/Widgets/Cart", StyleTypes = new[] {typeof(CartWidgetStyleContributor)}, ScriptTypes = new[] {typeof(CartWidgetScriptContributor)} )] diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Controllers/WidgetsController.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Controllers/WidgetsController.cs index c3f1098c..f55a5dfd 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Controllers/WidgetsController.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Controllers/WidgetsController.cs @@ -1,4 +1,5 @@ using EShopOnAbp.PublicWeb.Components.Basket; +using EShopOnAbp.PublicWeb.Components.Toolbar.Cart; using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; @@ -13,4 +14,11 @@ public class WidgetsController : AbpController { return ViewComponent(typeof(BasketWidgetViewComponent)); } + + [HttpGet] + [Route("Cart")] + public IActionResult GetCartWidget() + { + return ViewComponent(typeof(CartWidgetViewComponent)); + } } \ No newline at end of file From ea660811b8313e37f1509dcb4c38ef383efe4eed Mon Sep 17 00:00:00 2001 From: enisn Date: Tue, 21 Dec 2021 17:43:23 +0300 Subject: [PATCH 16/22] Extract common code from ViewComponents --- .../Basket/UserBasketProvider.cs | 76 +++++++++++++++++++ .../Basket/BasketWidgetViewComponent.cs | 54 ++----------- .../Toolbar/Cart/CartWidgetViewComponent.cs | 56 ++------------ 3 files changed, 90 insertions(+), 96 deletions(-) create mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/Basket/UserBasketProvider.cs diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Basket/UserBasketProvider.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Basket/UserBasketProvider.cs new file mode 100644 index 00000000..2fd7e5de --- /dev/null +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Basket/UserBasketProvider.cs @@ -0,0 +1,76 @@ +using Castle.Core.Logging; +using EShopOnAbp.BasketService; +using Microsoft.AspNetCore.Http; +using Microsoft.Extensions.Logging; +using System; +using System.Collections.Generic; +using System.Linq; +using System.Text; +using System.Threading.Tasks; +using Volo.Abp.DependencyInjection; +using Volo.Abp.Guids; +using Volo.Abp.Users; + +namespace EShopOnAbp.PublicWeb.Basket +{ + public class UserBasketProvider : ITransientDependency + { + protected HttpContext HttpContext => httpContextAccessor.HttpContext; + + private readonly IHttpContextAccessor httpContextAccessor; + protected readonly ILogger logger; + protected readonly IGuidGenerator guidGenerator; + protected readonly IBasketAppService basketAppService; + protected readonly ICurrentUser currentUser; + + public UserBasketProvider( + IHttpContextAccessor httpContextAccessor, + ILogger logger, + IGuidGenerator guidGenerator, + IBasketAppService basketAppService, + ICurrentUser currentUser) + { + this.httpContextAccessor = httpContextAccessor; + this.logger = logger; + this.guidGenerator = guidGenerator; + this.basketAppService = basketAppService; + this.currentUser = currentUser; + } + + public virtual async Task GetBasketAsync() + { + try + { + // Get anonymous user id from cookie + HttpContext.Request.Cookies.TryGetValue(CookieConstants.AnonymousUserCookieName, + out string anonymousUserId); + logger.LogInformation($"========= Anonymous User Id from Cookie:{anonymousUserId} ========= "); + + // Generate new id for anonymous user + if (string.IsNullOrEmpty(anonymousUserId)) + { + anonymousUserId = guidGenerator.Create().ToString(); + HttpContext.Response.Cookies.Append(CookieConstants.AnonymousUserCookieName, anonymousUserId); + logger.LogInformation($"========= Generated new User Id:{anonymousUserId} ========= APPENDED TO COOKIE ====== "); + } + + if (!currentUser.IsAuthenticated) + { + logger.LogInformation( + $"========= Get Basket for Anonymous UserId:{anonymousUserId} ========= APPENDED TO COOKIE ====== "); + return await basketAppService.GetByAnonymousUserIdAsync(Guid.Parse(anonymousUserId)); + } + else + { + //TODO: Merge with anonymously stored cart if exist + return await basketAppService.GetAsync(); + } + } + catch (Exception ex) + { + logger.LogError(ex, ex.Message); + return null; + } + } + } +} diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs index 3659494f..621002ba 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs @@ -7,6 +7,7 @@ using EShopOnAbp.BasketService; using Microsoft.Extensions.Logging; using Volo.Abp.Guids; using Volo.Abp.Users; +using EShopOnAbp.PublicWeb.Basket; namespace EShopOnAbp.PublicWeb.Components.Basket; @@ -18,59 +19,18 @@ namespace EShopOnAbp.PublicWeb.Components.Basket; )] public class BasketWidgetViewComponent : AbpViewComponent { - private readonly IBasketAppService _basketAppService; - private readonly ICurrentUser _currentUser; - private readonly IGuidGenerator _guidGenerator; - private readonly ILogger _logger; + private readonly UserBasketProvider userBasketProvider; - public BasketWidgetViewComponent( - IBasketAppService basketAppService, - ICurrentUser currentUser, - IGuidGenerator guidGenerator, ILogger logger) + public BasketWidgetViewComponent(UserBasketProvider userBasketProvider) { - _basketAppService = basketAppService; - _currentUser = currentUser; - _guidGenerator = guidGenerator; - _logger = logger; + this.userBasketProvider = userBasketProvider; } public async Task InvokeAsync() { - BasketDto basketDto = new BasketDto(); - try - { - // Get anonymous user id from cookie - HttpContext.Request.Cookies.TryGetValue(CookieConstants.AnonymousUserCookieName, - out string anonymousUserId); - _logger.LogInformation($"========= Anonymous User Id from Cookie:{anonymousUserId} ========= "); - - // Generate new id for anonymous user - if (string.IsNullOrEmpty(anonymousUserId)) - { - anonymousUserId = _guidGenerator.Create().ToString(); - HttpContext.Response.Cookies.Append(CookieConstants.AnonymousUserCookieName, anonymousUserId); - _logger.LogInformation($"========= Generated new User Id:{anonymousUserId} ========= APPENDED TO COOKIE ====== "); - } - - if (!_currentUser.IsAuthenticated) - { - basketDto = await _basketAppService.GetByAnonymousUserIdAsync(Guid.Parse(anonymousUserId)); - _logger.LogInformation( - $"========= Get Basket for Anonymous UserId:{anonymousUserId} ========= APPENDED TO COOKIE ====== "); - _logger.LogInformation($"========= Basket Item Count:{basketDto.Items.Count} ========= "); - } - else - { - //TODO: Merge with anonymously stored cart if exist - basketDto = await _basketAppService.GetAsync(); - } - } - catch (Exception e) - { - basketDto = null; - Console.WriteLine(e); - } - return View("~/Components/Basket/Default.cshtml", basketDto); + return View( + "~/Components/Basket/Default.cshtml", + await userBasketProvider.GetBasketAsync()); } } \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs index b3b09e8d..ad7c1aea 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs @@ -1,6 +1,7 @@ using System; using System.Threading.Tasks; using EShopOnAbp.BasketService; +using EShopOnAbp.PublicWeb.Basket; using Microsoft.AspNetCore.Mvc; using Microsoft.Extensions.Logging; using Volo.Abp.AspNetCore.Mvc; @@ -18,60 +19,17 @@ namespace EShopOnAbp.PublicWeb.Components.Toolbar.Cart; )] public class CartWidgetViewComponent : AbpViewComponent { - private readonly IBasketAppService _basketAppService; - private readonly IGuidGenerator _guidGenerator; - private readonly ICurrentUser _currentUser; - private readonly ILogger _logger; + private readonly UserBasketProvider userBasketProvider; - public CartWidgetViewComponent( - IBasketAppService basketAppService, - ICurrentUser currentUser, - IGuidGenerator guidGenerator, - ILogger logger) + public CartWidgetViewComponent(UserBasketProvider userBasketProvider) { - _basketAppService = basketAppService; - _currentUser = currentUser; - _guidGenerator = guidGenerator; - _logger = logger; + this.userBasketProvider = userBasketProvider; } public async Task InvokeAsync() { - BasketDto basketDto = new BasketDto(); - try - { - // Get anonymous user id from cookie - HttpContext.Request.Cookies.TryGetValue(CookieConstants.AnonymousUserCookieName, - out string anonymousUserId); - _logger.LogInformation($"========= Anonymous User Id from Cookie:{anonymousUserId} ========= "); - - // Generate new id for anonymous user - if (string.IsNullOrEmpty(anonymousUserId)) - { - anonymousUserId = _guidGenerator.Create().ToString(); - HttpContext.Response.Cookies.Append(CookieConstants.AnonymousUserCookieName, anonymousUserId); - _logger.LogInformation($"========= Generated new User Id:{anonymousUserId} ========= APPENDED TO COOKIE ====== "); - } - - if (!_currentUser.IsAuthenticated) - { - basketDto = await _basketAppService.GetByAnonymousUserIdAsync(Guid.Parse(anonymousUserId)); - _logger.LogInformation( - $"========= Get Basket for Anonymous UserId:{anonymousUserId} ========= APPENDED TO COOKIE ====== "); - _logger.LogInformation($"========= Basket Item Count:{basketDto.Items.Count} ========= "); - } - else - { - //TODO: Merge with anonymously stored cart if exist - basketDto = await _basketAppService.GetAsync(); - } - } - catch (Exception e) - { - basketDto = null; - Console.WriteLine(e); - } - - return View("~/Components/Toolbar/Cart/Default.cshtml", basketDto); + return View( + "~/Components/Toolbar/Cart/Default.cshtml", + await userBasketProvider.GetBasketAsync()); } } \ No newline at end of file From 7d9fb038be88473ebbad88d982a2d2ba4fb5ef3d Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 22 Dec 2021 12:11:33 +0300 Subject: [PATCH 17/22] Add anonymousid to DTOs --- .../src/EShopOnAbp.PublicWeb/Pages/index.js | 3 ++- .../wwwroot/client-proxies/basket-proxy.js | 2 +- .../AddProductDto.cs | 4 +++- .../IHasAnonymousId.cs | 9 +++++++++ .../RemoveProductDto.cs | 4 +++- .../BasketAppService.cs | 8 ++++++-- .../ClientProxies/basket-generate-proxy.json | 12 ++++++++++++ 7 files changed, 36 insertions(+), 6 deletions(-) create mode 100644 services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IHasAnonymousId.cs diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js index c7f92a38..165df751 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js @@ -15,7 +15,8 @@ var $this = $(this); var productId = $this.attr('data-product-id'); eShopOnAbp.basketService.basket.addProduct({ - productId: productId + productId: productId, + anonymousId: anonymousId, }).then(function () { widgetManager.refresh(); abp.notify.success("Added product to your basket.", "Successfully added"); diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/client-proxies/basket-proxy.js b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/client-proxies/basket-proxy.js index ec6cf88e..de10ce04 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/client-proxies/basket-proxy.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/client-proxies/basket-proxy.js @@ -35,7 +35,7 @@ eShopOnAbp.basketService.basket.removeProduct = function(input, ajaxParams) { return abp.ajax($.extend(true, { - url: abp.appPath + 'api/basket/basket/product' + abp.utils.buildQueryString([{ name: 'productId', value: input.productId }, { name: 'count', value: input.count }]) + '', + url: abp.appPath + 'api/basket/basket/product' + abp.utils.buildQueryString([{ name: 'productId', value: input.productId }, { name: 'count', value: input.count }, { name: 'anonymousId', value: input.anonymousId }]) + '', type: 'DELETE' }, ajaxParams)); }; diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/AddProductDto.cs b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/AddProductDto.cs index 890bb338..f569c44e 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/AddProductDto.cs +++ b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/AddProductDto.cs @@ -3,10 +3,12 @@ using System.ComponentModel.DataAnnotations; namespace EShopOnAbp.BasketService; -public class AddProductDto +public class AddProductDto : IHasAnonymousId { public Guid ProductId { get; set; } [Range(1, int.MaxValue)] public int Count { get; set; } = 1; + + public Guid? AnonymousId { get; set; } } \ No newline at end of file diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IHasAnonymousId.cs b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IHasAnonymousId.cs new file mode 100644 index 00000000..64c27687 --- /dev/null +++ b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/IHasAnonymousId.cs @@ -0,0 +1,9 @@ +using System; + +namespace EShopOnAbp.BasketService +{ + public interface IHasAnonymousId + { + Guid? AnonymousId { get; } + } +} diff --git a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/RemoveProductDto.cs b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/RemoveProductDto.cs index b1b2ba2f..e8cf0a2f 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/RemoveProductDto.cs +++ b/services/basket/src/EShopOnAbp.BasketService.Application.Contracts/RemoveProductDto.cs @@ -2,9 +2,11 @@ using System; namespace EShopOnAbp.BasketService; -public class RemoveProductDto +public class RemoveProductDto : IHasAnonymousId { public Guid ProductId { get; set; } public int? Count { get; set; } + + public Guid? AnonymousId { get; set; } } \ No newline at end of file diff --git a/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs b/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs index c404ccb6..2aab9990 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs +++ b/services/basket/src/EShopOnAbp.BasketService.Application/BasketAppService.cs @@ -42,7 +42,9 @@ public class BasketAppService : BasketServiceAppService, IBasketAppService public async Task AddProductAsync(AddProductDto input) { - Guid userId = CurrentUser.IsAuthenticated ? CurrentUser.GetId() : _anonymousUserId; + Console.WriteLine("========================= AnonymousId: "+input.AnonymousId); + + Guid userId = CurrentUser.IsAuthenticated ? CurrentUser.GetId() : input.AnonymousId.GetValueOrDefault(); var basket = await _basketRepository.GetAsync(userId); var product = await _basketProductService.GetAsync(input.ProductId); @@ -61,7 +63,9 @@ public class BasketAppService : BasketServiceAppService, IBasketAppService public async Task RemoveProductAsync(RemoveProductDto input) { - var basket = await _basketRepository.GetAsync(CurrentUser.GetId()); + Guid userId = CurrentUser.IsAuthenticated ? CurrentUser.GetId() : input.AnonymousId.GetValueOrDefault(); + + var basket = await _basketRepository.GetAsync(userId); var product = await _basketProductService.GetAsync(input.ProductId); basket.RemoveProduct(product.Id, input.Count); diff --git a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json index 0ff4ec2a..34f02bdc 100644 --- a/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json +++ b/services/basket/src/EShopOnAbp.BasketService.HttpApi.Client/ClientProxies/basket-generate-proxy.json @@ -152,6 +152,18 @@ "constraintTypes": null, "bindingSourceId": "ModelBinding", "descriptorName": "input" + }, + { + "nameOnMethod": "input", + "name": "AnonymousId", + "jsonName": null, + "type": "System.Guid?", + "typeSimple": "string?", + "isOptional": false, + "defaultValue": null, + "constraintTypes": null, + "bindingSourceId": "ModelBinding", + "descriptorName": "input" } ], "returnValue": { From ec4b88c89675c4039974f1be97c5d96343b1eb43 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 22 Dec 2021 12:38:44 +0300 Subject: [PATCH 18/22] Fix widget refreshing issue --- apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js | 8 ++++---- 1 file changed, 4 insertions(+), 4 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js index 165df751..dcf084a6 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js @@ -5,10 +5,6 @@ console.info("Anonymous user set:" + anonymousId); } - var widgetManager = new abp.WidgetManager({ - wrapper: $($('.abp-widget-wrapper[data-widget-name="CartWidget"]')[0]) - }); - $(function () { $('.product-list-item').click(function () { @@ -18,6 +14,10 @@ productId: productId, anonymousId: anonymousId, }).then(function () { + + let widgetManager = new abp.WidgetManager({ + wrapper: $($('.abp-widget-wrapper[data-widget-name="CartWidget"]')[0]) + }); widgetManager.refresh(); abp.notify.success("Added product to your basket.", "Successfully added"); }); From d9f8813b30a483ff9ecf9eb3b14fc2060ac9f8bc Mon Sep 17 00:00:00 2001 From: Galip Tolga Erdem Date: Wed, 22 Dec 2021 12:43:54 +0300 Subject: [PATCH 19/22] updatd product list column sizes --- .../src/EShopOnAbp.PublicWeb/Pages/Index.cshtml | 12 +++--------- 1 file changed, 3 insertions(+), 9 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml index 1d48ddb9..c4468682 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml @@ -1,7 +1,7 @@ @page @model EShopOnAbp.PublicWeb.Pages.IndexModel @{ - const int productsColumnSize = 4; + const int productsColumnSize = 4; // TODO: update abp-column helper to plain html for proper row and columns css } @section styles{ @@ -13,7 +13,7 @@ }
-
+

Our Products

@for (int i = 0; i < Math.Ceiling(Model.Products.Count / (double)productsColumnSize); i++) @@ -21,7 +21,7 @@ @for (int j = 0; j < productsColumnSize; j++) { - + @if ((i * productsColumnSize) + j < Model.Products.Count) { var product = Model.Products[(i * productsColumnSize) + j]; @@ -53,10 +53,4 @@ }
- @*
*@ - @*

Your Basket

*@ - @*
*@ - @* @await Component.InvokeAsync(typeof(BasketWidgetViewComponent)) *@ - @*
*@ - @*
*@
\ No newline at end of file From b7af805b7470706d5d635f82543c0637d44645cd Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 22 Dec 2021 15:33:57 +0300 Subject: [PATCH 20/22] Update /Order page --- .../Basket/BasketWidgetViewComponent.cs | 9 ++--- .../Cart/CartWidgetScriptContributor.cs | 1 - .../Toolbar/Cart/CartWidgetViewComponent.cs | 9 ++--- .../EShopOnAbp.PublicWeb/Pages/Basket.cshtml | 11 ++++-- .../EShopOnAbp.PublicWeb/Pages/Index.cshtml | 6 +++- .../src/EShopOnAbp.PublicWeb/Pages/index.js | 8 ++--- .../wwwroot/components/basket-widget.js | 35 ++++++++++++------- .../wwwroot/components/cart/cart-widget.js | 20 ----------- 8 files changed, 44 insertions(+), 55 deletions(-) delete mode 100644 apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs index 621002ba..6f8ed944 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/BasketWidgetViewComponent.cs @@ -1,13 +1,8 @@ -using System; -using System.Threading.Tasks; +using EShopOnAbp.PublicWeb.Basket; using Microsoft.AspNetCore.Mvc; +using System.Threading.Tasks; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; -using EShopOnAbp.BasketService; -using Microsoft.Extensions.Logging; -using Volo.Abp.Guids; -using Volo.Abp.Users; -using EShopOnAbp.PublicWeb.Basket; namespace EShopOnAbp.PublicWeb.Components.Basket; diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetScriptContributor.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetScriptContributor.cs index b7027a15..a1066256 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetScriptContributor.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetScriptContributor.cs @@ -10,6 +10,5 @@ public class CartWidgetScriptContributor: BundleContributor { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.AddIfNotContains("/components/cart/cart-widget.js"); } } \ No newline at end of file diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs index ad7c1aea..ce214c76 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Toolbar/Cart/CartWidgetViewComponent.cs @@ -1,13 +1,8 @@ -using System; -using System.Threading.Tasks; -using EShopOnAbp.BasketService; -using EShopOnAbp.PublicWeb.Basket; +using EShopOnAbp.PublicWeb.Basket; using Microsoft.AspNetCore.Mvc; -using Microsoft.Extensions.Logging; +using System.Threading.Tasks; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; -using Volo.Abp.Guids; -using Volo.Abp.Users; namespace EShopOnAbp.PublicWeb.Components.Toolbar.Cart; diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml index 8ad6e540..e30d044d 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml @@ -1,13 +1,18 @@ @page +@using EShopOnAbp.Localization @using EShopOnAbp.PublicWeb.Components.Basket +@using Microsoft.Extensions.Localization @model EShopOnAbp.PublicWeb.Pages.Basket -@{ - +@section scripts { + + } +@inject IStringLocalizer L +
-

Your Basket

+

@L["YourBasket"]

@await Component.InvokeAsync(typeof(BasketWidgetViewComponent))
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml index c4468682..cd87d01c 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml @@ -1,5 +1,9 @@ @page +@using EShopOnAbp.Localization +@using Microsoft.Extensions.Localization @model EShopOnAbp.PublicWeb.Pages.IndexModel +@inject IStringLocalizer L + @{ const int productsColumnSize = 4; // TODO: update abp-column helper to plain html for proper row and columns css } @@ -38,7 +42,7 @@
@product.Name
- @product.Code - Stock count: @product.StockCount + @product.Code - @L["StockCount"]: @product.StockCount
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js index dcf084a6..9af51771 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/index.js @@ -15,10 +15,10 @@ anonymousId: anonymousId, }).then(function () { - let widgetManager = new abp.WidgetManager({ - wrapper: $($('.abp-widget-wrapper[data-widget-name="CartWidget"]')[0]) - }); - widgetManager.refresh(); + $('.abp-widget-wrapper[data-widget-name="CartWidget"]') + .data('abp-widget-manager') + .refresh(); + abp.notify.success("Added product to your basket.", "Successfully added"); }); }); diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/basket-widget.js b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/basket-widget.js index f709fc65..c71356ba 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/basket-widget.js +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/basket-widget.js @@ -1,29 +1,40 @@ -(function (){ - +(function () { + + let anonymousId = abp.utils.getCookieValue("eshop_anonymousId"); + + abp.widgets.BasketWidget = function ($wrapper) { var widgetManager = $wrapper.data('abp-widget-manager'); var init = function (filters) { $wrapper .find('.basket-item-remove') - .click(function(){ + .click(function () { var $this = $(this); var productId = $this.parent('.basket-list-item').attr('data-product-id'); eShopOnAbp.basketService.basket.removeProduct({ - productId: productId - }).then(function(){ + productId: productId, + anonymousId: anonymousId + }).then(function () { + widgetManager.refresh(); + + $('.abp-widget-wrapper[data-widget-name="CartWidget"]') + .data('abp-widget-manager') + .refresh(); + abp.notify.info("Removed the product from your basket.", "Removed basket item"); }); }); - + $wrapper .find('.basket-purchase-button') - .click(function(){ - eShopOnAbp.basketService.basket.purchase().then(function(){ + .click(function () { + eShopOnAbp.basketService.basket.purchase().then(function () { widgetManager.refresh(); + abp.notify.info("Thank you for the payment!", "Purchase completed!"); - }); + }); }); }; @@ -35,13 +46,13 @@ var connection = new signalR.HubConnectionBuilder() .withUrl("/signalr-hubs/basket") .build(); - + connection.on("BasketProductUpdated", function (data) { $('.basket-list') .closest('.abp-widget-wrapper') - .each(function(){ + .each(function () { var $wrapper = $(this); - if ($wrapper.find('[data-product-id=' + data.productId + ']').length){ + if ($wrapper.find('[data-product-id=' + data.productId + ']').length) { var widgetManager = new abp.WidgetManager({ wrapper: $wrapper }); diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js b/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js deleted file mode 100644 index a006ddde..00000000 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/wwwroot/components/cart/cart-widget.js +++ /dev/null @@ -1,20 +0,0 @@ -(function () { - var connection = new signalR.HubConnectionBuilder() - .withUrl("/signalr-hubs/basket") - .build(); - - connection.on("BasketProductUpdated", function (data) { - var widgetManager = $wrapper.data('abp-widget-manager'); - //todo:test - debugger; - $('#data-cart-count-id').text(data); - widgetManager.refresh(); - abp.notify.info('The product "' + data.productName + '" has been changed!', 'Your basket has been updated!'); - }); - - connection.start().then(function () { - }).catch(function (err) { - return console.error(err.toString()); - }); - -})(); \ No newline at end of file From 506751e5fd2ff1b797b426a638d66b4fafba7386 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 22 Dec 2021 15:52:24 +0300 Subject: [PATCH 21/22] Update resources --- .../Components/Basket/Default.cshtml | 13 ++++++++++--- .../src/EShopOnAbp.PublicWeb/Pages/Index.cshtml | 2 +- .../src/EShopOnAbp.BasketService.Domain/Basket.cs | 12 ++++++------ .../Localization/EShopOnAbp/en.json | 8 +++++++- .../Localization/EShopOnAbp/tr.json | 9 ++++++++- 5 files changed, 32 insertions(+), 12 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml index ef5edc9b..e0057a76 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Components/Basket/Default.cshtml @@ -1,4 +1,11 @@ + +@using EShopOnAbp.Localization +@using Microsoft.Extensions.Localization + @model EShopOnAbp.BasketService.BasketDto + +@inject IStringLocalizer L +
@if (!Model.Items.Any()) { @@ -26,15 +33,15 @@ (@("x" + item.Count)) } - $@item.TotalPrice.ToString("0.00") - +
}
- Total: $@Model.TotalPrice.ToString("0.00") + @L["Total"]: $@Model.TotalPrice.ToString("0.00")
- +
} diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml index cd87d01c..9589b904 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Index.cshtml @@ -18,7 +18,7 @@
-

Our Products

+

@L["OurProducts"]

@for (int i = 0; i < Math.Ceiling(Model.Products.Count / (double)productsColumnSize); i++) { diff --git a/services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs b/services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs index 61064707..30fd4abb 100644 --- a/services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs +++ b/services/basket/src/EShopOnAbp.BasketService.Domain/Basket.cs @@ -11,10 +11,10 @@ public class Basket : AggregateRoot private Basket() { - + } - - public Basket(Guid id) + + public Basket(Guid id) : base(id) { Items = new List(); @@ -37,20 +37,20 @@ public class Basket : AggregateRoot item.Count += count; } } - + public void RemoveProduct(Guid productId, int? count = null) { if (count is < 1) { throw new ArgumentOutOfRangeException(nameof(count), "Product count should be null, 1 or more!"); } - + var item = Items.FirstOrDefault(x => x.ProductId == productId); if (item == null) { return; } - + if (count == null || item.Count <= count) { Items.Remove(item); diff --git a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json index ab1b0396..44e7594e 100644 --- a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json +++ b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/en.json @@ -3,6 +3,12 @@ "texts": { "Menu:Home": "Home", "Login": "Login", - "Catalog": "Catalog" + "Catalog": "Catalog", + "YourBasket": "Your Basket", + "Purchase": "Purchase", + "Total": "Total", + "OurProducts": "Our Products", + "StockCount": "Stock Count", + "RemoveFromBasket": "Remove from basket" } } diff --git a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json index 8450b569..b803def2 100644 --- a/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json +++ b/shared/EShopOnAbp.Shared.Localization/Localization/EShopOnAbp/tr.json @@ -2,6 +2,13 @@ "culture": "tr", "texts": { "Menu:Home": "Ana Sayfa", - "Login": "Giriş" + "Login": "Giriş", + "Catalog": "Katalog", + "YourBasket": "Sepetiniz", + "Purchase": "Alışverişi tamamla", + "Total": "Toplam", + "OurProducts": "Ürünlerimiz", + "StockCount": "Stokta", + "RemoveFromBasket": "Sepetten kaldır" } } From 9518e10bcbc8af7959870e47a7ac6ae0e29ef3f2 Mon Sep 17 00:00:00 2001 From: enisn Date: Wed, 22 Dec 2021 15:58:38 +0300 Subject: [PATCH 22/22] Reorder toolbar items --- .../Menus/EShopOnAbpPublicWebToolbarContributor.cs | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebToolbarContributor.cs b/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebToolbarContributor.cs index 03342e66..21a9f84e 100644 --- a/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebToolbarContributor.cs +++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Menus/EShopOnAbpPublicWebToolbarContributor.cs @@ -16,12 +16,12 @@ namespace EShopOnAbp.PublicWeb.Menus return Task.CompletedTask; } + context.Toolbar.Items.Add(new ToolbarItem(typeof(CartWidgetViewComponent))); + if (!context.ServiceProvider.GetRequiredService().IsAuthenticated) { context.Toolbar.Items.Add(new ToolbarItem(typeof(LoginLinkViewComponent))); } - - context.Toolbar.Items.Add(new ToolbarItem(typeof(CartWidgetViewComponent))); return Task.CompletedTask; }