From a95434046c78245bd93fa4621572baa24b1a67be Mon Sep 17 00:00:00 2001
From: Galip Tolga Erdem <galiperdem@gmail.com>
Date: Fri, 24 Dec 2021 11:23:06 +0300
Subject: [PATCH] Updated basket page layout

---
 .../Components/Basket/Default.cshtml          | 61 +++++++++++--------
 .../EShopOnAbp.PublicWeb/Pages/Basket.cshtml  |  7 ++-
 2 files changed, 40 insertions(+), 28 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 e0057a76..05bbe1da 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,3 @@
-
 @using EShopOnAbp.Localization
 @using Microsoft.Extensions.Localization
 
@@ -10,38 +9,50 @@
     @if (!Model.Items.Any())
     {
         <div class="basket-list">
-            <p class="text-center"><strong><em>Your basket is empty. Click to a product to add it!</em></strong></p>
+            <p class="text-center">
+                <strong>
+                    <em>Your basket is empty. Click to a product to add it!</em>
+                </strong>
+            </p>
         </div>
     }
     else
     {
-        <div class="basket-list">
-            @foreach (var item in Model.Items)
-            {
-                <div class="basket-list-item" data-product-id="@item.ProductId">
-                    @if (!item.ImageName.IsNullOrEmpty())
-                    {
-                        <img src="/product-images/@item.ImageName"/>
-                    }
-                    else
+        <div class="row">
+            <div class="col-lg-10">
+                <div class="basket-list">
+                    @foreach (var item in Model.Items)
                     {
-                        <img src="/product-images/noimage.jpg"/>
+                        <div class="basket-list-item" data-product-id="@item.ProductId">
+                            @if (!item.ImageName.IsNullOrEmpty())
+                            {
+                                <img src="/product-images/@item.ImageName"/>
+                            }
+                            else
+                            {
+                                <img src="/product-images/noimage.jpg"/>
+                            }
+                            @item.ProductName
+                            @if (item.Count > 1)
+                            {
+                                <text> (@("x" + item.Count))</text>
+                            }
+                            - $@item.TotalPrice.ToString("0.00")
+                            <i class="fa fa-remove basket-item-remove" title="@L["RemoveFromBasket"]"></i>
+                        </div>
                     }
-                    @item.ProductName
-                    @if (item.Count > 1)
-                    {
-                        <text> (@("x" + item.Count))</text>
-                    }
-                    - $@item.TotalPrice.ToString("0.00")
-                    <i class="fa fa-remove basket-item-remove" title="@L["RemoveFromBasket"]"></i>
+                    <hr/>
+                    <div class="basket-total-area">
+                        @L["Total"]: $@Model.TotalPrice.ToString("0.00")
+                    </div>
                 </div>
-            }
-            <hr/>
-            <div class="basket-total-area">
-                @L["Total"]: $@Model.TotalPrice.ToString("0.00")
             </div>
-            <div>
-                <abp-button class="basket-purchase-button" text="@L["Purchase"]" button-type="Primary" />
+            <div class="col-lg-2">
+                <div class="row"><h4>Total Selected (@Model.Items.Count)</h4></div>
+                <div class="row"><h3>$@Model.TotalPrice.ToString("0.00")</h3></div>
+                <div class="row">
+                    <abp-button size="Large" class="basket-purchase-button" text="@L["Purchase"]" button-type="Primary"/>
+                </div>
             </div>
         </div>
     }
diff --git a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml
index e30d044d..4545fae1 100644
--- a/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml
+++ b/apps/public-web/src/EShopOnAbp.PublicWeb/Pages/Basket.cshtml
@@ -5,15 +5,16 @@
 @model EShopOnAbp.PublicWeb.Pages.Basket
 
 @section scripts {
-    <abp-script src="/client-proxies/basket-proxy.js" />
-    <abp-script src="/Pages/index.js" />
+    <abp-script src="/client-proxies/basket-proxy.js"/>
+    <abp-script src="/Pages/index.js"/>
 }
 
 @inject IStringLocalizer<EShopOnAbpResource> L
 
-<div class="col-lg-12">
+<div class="row">
     <h3 class="pt-5 pb-4 text-center">@L["YourBasket"]</h3>
     <div id="BasketArea">
         @await Component.InvokeAsync(typeof(BasketWidgetViewComponent))
     </div>
+
 </div>
\ No newline at end of file