From 74296d283bcdf9a40a1678fd61c71036bebb2af0 Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Tue, 21 Dec 2021 16:00:03 +0300
Subject: [PATCH] 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<BasketServiceResource> L
 @model EShopOnAbp.BasketService.BasketDto
-<div class="nav-link">
+<div id="shopping-cart" class="nav-link">
     @if (Model == null)
     {
         <span class="cart-error" style="vertical-align: -webkit-baseline-middle;color: white">@L["Toolbar:BasketNotLoaded"] </span>
     }
     else
     {
-        <abp-button button-type="Secondary">
-            @L["Toolbar:Cart"] <span abp-badge="Info" data-cart-count>@Model.Items.Count</span>
-        </abp-button>
+        <a class="btn" role="button" href="~/Basket">
+            <span abp-badge="Info" data-cart-count>@Model.Items.Count</span> @L["Toolbar:Cart"] 
+        </a>
     }
 </div>
\ 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(){