From e86aa9966e6a61266507132b52a62eb08f9ec1ea Mon Sep 17 00:00:00 2001
From: "Amir.H Khademi" <avvampier@gmail.com>
Date: Sat, 9 Mar 2024 22:01:39 +0330
Subject: [PATCH] add vesion 0.17.20.30

---
 .../Dialogs/ProductActionDialogBox.razor      |  2 +-
 NetinaShop.AdminPanel.PWA/Models/Address.cs   |  6 +-
 .../NetinaShop.AdminPanel.PWA.csproj          |  4 +-
 .../Pages/OrdersPage.razor                    | 51 +++++++++++---
 NetinaShop.AdminPanel.PWA/Program.cs          |  8 +--
 .../wwwroot/css/app.min.css                   |  4 ++
 .../wwwroot/css/app.output.css                | 66 +++++++------------
 7 files changed, 77 insertions(+), 64 deletions(-)

diff --git a/NetinaShop.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor b/NetinaShop.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor
index fa75cfa..4a455a1 100644
--- a/NetinaShop.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor
+++ b/NetinaShop.AdminPanel.PWA/Dialogs/ProductActionDialogBox.razor
@@ -274,7 +274,7 @@
                 <BaseButtonUi class="w-64 rounded-md" IsProcessing="@ViewModel.IsProcessing"
                               Icon="@Icons.Material.Outlined.Check"
                               Variant="Variant.Filled" Color="Color.Success"
-                              Content="ثبت ویرایش" OnClickCallback="ViewModel.SubmitEditAsync" />
+                              Content="ثبت ویرایش" OnClickCallback="async()=>await ViewModel.SubmitEditAsync()" />
             }
             else
             {
diff --git a/NetinaShop.AdminPanel.PWA/Models/Address.cs b/NetinaShop.AdminPanel.PWA/Models/Address.cs
index 828f544..e070c12 100644
--- a/NetinaShop.AdminPanel.PWA/Models/Address.cs
+++ b/NetinaShop.AdminPanel.PWA/Models/Address.cs
@@ -3,10 +3,10 @@
 public static class Address
 {
 #if DEBUG
-    public static string BaseAddress = "http://localhost:32770/api";
-    //public static string BaseAddress = "https://api.vesmook.com/api";
+    //public static string BaseAddress = "http://localhost:32770/api";
+    public static string BaseAddress = "https://api.vesmeh.com/api";
 #else
-    public static string BaseAddress = "https://api.vesmook.com/api";
+    public static string BaseAddress = "https://api.vesmeh.com/api";
 #endif
     public static string AuthController = $"{BaseAddress}/auth";
     public static string UserController = $"{BaseAddress}/user";
diff --git a/NetinaShop.AdminPanel.PWA/NetinaShop.AdminPanel.PWA.csproj b/NetinaShop.AdminPanel.PWA/NetinaShop.AdminPanel.PWA.csproj
index 92a1487..ca8cdbb 100644
--- a/NetinaShop.AdminPanel.PWA/NetinaShop.AdminPanel.PWA.csproj
+++ b/NetinaShop.AdminPanel.PWA/NetinaShop.AdminPanel.PWA.csproj
@@ -5,8 +5,8 @@
     <Nullable>enable</Nullable>
     <ImplicitUsings>enable</ImplicitUsings>
     <ServiceWorkerAssetsManifest>service-worker-assets.js</ServiceWorkerAssetsManifest>
-    <AssemblyVersion>0.17.19.26</AssemblyVersion>
-    <FileVersion>0.17.19.26</FileVersion>
+    <AssemblyVersion>0.17.20.30</AssemblyVersion>
+    <FileVersion>0.17.20.30</FileVersion>
     <AssemblyName>$(MSBuildProjectName)</AssemblyName>
   </PropertyGroup>
 
diff --git a/NetinaShop.AdminPanel.PWA/Pages/OrdersPage.razor b/NetinaShop.AdminPanel.PWA/Pages/OrdersPage.razor
index cc8e52e..adf4f52 100644
--- a/NetinaShop.AdminPanel.PWA/Pages/OrdersPage.razor
+++ b/NetinaShop.AdminPanel.PWA/Pages/OrdersPage.razor
@@ -41,7 +41,7 @@
     </MudGrid>
     <MudGrid>
         <MudItem xs="12">
-            
+
             <MudPaper>
                 <MudDataGrid FixedFooter="true" FixedHeader="true" Striped="true"
                              T="OrderSDto" Items="@ViewModel.MainOrders" CurrentPage="@ViewModel.MainGridCurrentPage"
@@ -50,10 +50,10 @@
 
                     <ToolBarContent>
                         @* <MudTextField T="string" Placeholder="جست جو بر اساس کد پیگیری" Adornment="Adornment.Start" Immediate="true"
-                                      Clearable="true"
-                                      ValueChanged="@ViewModel.SearchChanged"
-                                      AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" class="my-auto"
-                                      OnAdornmentClick="@ViewModel.SearchAsync"></MudTextField> *@
+                        Clearable="true"
+                        ValueChanged="@ViewModel.SearchChanged"
+                        AdornmentIcon="@Icons.Material.Filled.Search" IconSize="Size.Medium" class="my-auto"
+                        OnAdornmentClick="@ViewModel.SearchAsync"></MudTextField> *@
                     </ToolBarContent>
                     <Columns>
                         <PropertyColumn Title="کد سفارش" Property="arg => arg.FactorCode" />
@@ -71,7 +71,7 @@
                         </TemplateColumn>
 
                         <TemplateColumn T="OrderSDto" Title="مبلغ سفارش ">
-                            
+
                             <CellTemplate>
                                 <p>@context.Item.TotalPrice.ToString("N0") ریالــ</p>
                             </CellTemplate>
@@ -79,10 +79,41 @@
                         <TemplateColumn T="OrderSDto" Title="وضعیت سفارش">
 
                             <CellTemplate>
-                                <p>@context.Item.OrderStatus.ToDisplay()</p>
+                                @switch (context.Item.OrderStatus)
+                                {
+                                    case OrderStatus.OrderBag:
+                                        <MudChip Variant="Variant.Text" class="-my-4" Color="Color.Warning">@context.Item.OrderStatus.ToDisplay()</MudChip>
+                                        break;
+                                    case OrderStatus.Submitted:
+                                        <MudChip Variant="Variant.Text" class="-my-4" Color="Color.Warning">@context.Item.OrderStatus.ToDisplay()</MudChip>
+                                        break;
+
+                                    case OrderStatus.Paid:
+                                        <MudChip Variant="Variant.Filled" class="-my-4" Color="Color.Info" >@context.Item.OrderStatus.ToDisplay()</MudChip>
+                                        break;
+                                    case OrderStatus.Processing:
+                                        <MudChip Variant="Variant.Filled" class="-my-4" Color="Color.Info">@context.Item.OrderStatus.ToDisplay()</MudChip>
+                                        break;
+                                        
+                                    case OrderStatus.Delivered:
+                                        <MudChip Variant="Variant.Text" class="-my-4" Color="Color.Success">@context.Item.OrderStatus.ToDisplay()</MudChip>
+                                        break;
+                                        
+                                    case OrderStatus.Done:
+                                        <MudChip Variant="Variant.Text" class="-my-4" Color="Color.Success">@context.Item.OrderStatus.ToDisplay()</MudChip>
+                                        break;
+                                        
+                                    case OrderStatus.Canceled:
+                                        <MudChip Variant="Variant.Text" class="-my-4" Color="Color.Error">@context.Item.OrderStatus.ToDisplay()</MudChip>
+                                        break;
+
+                                    default:
+                                        <MudChip Variant="Variant.Text" class="-my-4" Color="Color.Warning">@context.Item.OrderStatus.ToDisplay()</MudChip>
+                                        break;
+                                }
                             </CellTemplate>
                         </TemplateColumn>
-                        
+
                         <TemplateColumn CellClass="d-flex justify-end">
                             <CellTemplate>
                                 <MudStack Row="true">
@@ -90,7 +121,7 @@
                                                    Size="@Size.Small"
                                                    Variant="@Variant.Outlined"
                                                    Color="@Color.Info"
-                                                   OnClick="async () => await ViewModel.ShowClicked(context.Item)"/>
+                                                   OnClick="async () => await ViewModel.ShowClicked(context.Item)" />
                                 </MudStack>
                             </CellTemplate>
                         </TemplateColumn>
@@ -99,7 +130,7 @@
                         <MudStack Row="true" class="w-full">
 
                             <MudPagination Rectangular="true" Variant="Variant.Filled" Count="@ViewModel.MainGridPageCount"
-                                           SelectedChanged="@ViewModel.ChangePageAsync" class="my-4 mx-auto"/>
+                                           SelectedChanged="@ViewModel.ChangePageAsync" class="my-4 mx-auto" />
                         </MudStack>
 
                     </PagerContent>
diff --git a/NetinaShop.AdminPanel.PWA/Program.cs b/NetinaShop.AdminPanel.PWA/Program.cs
index 4899134..1cc5f09 100644
--- a/NetinaShop.AdminPanel.PWA/Program.cs
+++ b/NetinaShop.AdminPanel.PWA/Program.cs
@@ -1,15 +1,10 @@
 using Append.Blazor.Printing;
-using Blazored.LocalStorage;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Components.Web;
 using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
-using MudBlazor;
 using MudBlazor.Services;
 using NetinaShop.AdminPanel.PWA;
-using NetinaShop.AdminPanel.PWA.Extensions;
 using NetinaShop.AdminPanel.PWA.Services;
-using NetinaShop.AdminPanel.PWA.Services.RestServices;
-using NetinaShop.AdminPanel.PWA.Utilities;
 using Toolbelt.Blazor.Extensions.DependencyInjection;
 
 var builder = WebAssemblyHostBuilder.CreateDefault(args);
@@ -19,8 +14,7 @@ builder.Services.AddCascadingAuthenticationState();
 builder.Services.AddOptions();
 builder.Services.AddAuthorizationCore();
 builder.Services.AddApiAuthorization();
-builder.Services.AddScoped<AuthenticationStateProvider,
-    CustomAuthenticationStateProvider>();
+builder.Services.AddScoped<AuthenticationStateProvider, CustomAuthenticationStateProvider>();
 builder.Services.AddMudServices(config =>
 {
     config.SnackbarConfiguration.VisibleStateDuration = 3500;
diff --git a/NetinaShop.AdminPanel.PWA/wwwroot/css/app.min.css b/NetinaShop.AdminPanel.PWA/wwwroot/css/app.min.css
index 8cbe524..ce2720d 100644
--- a/NetinaShop.AdminPanel.PWA/wwwroot/css/app.min.css
+++ b/NetinaShop.AdminPanel.PWA/wwwroot/css/app.min.css
@@ -1060,6 +1060,10 @@ input:checked + .toggle-bg {
 .m-2 {
   margin: 0.5rem;
 }
+.-my-4 {
+  margin-top: -1rem;
+  margin-bottom: -1rem;
+}
 .mx-1 {
   margin-left: 0.25rem;
   margin-right: 0.25rem;
diff --git a/NetinaShop.AdminPanel.PWA/wwwroot/css/app.output.css b/NetinaShop.AdminPanel.PWA/wwwroot/css/app.output.css
index 42a93db..e3073a8 100644
--- a/NetinaShop.AdminPanel.PWA/wwwroot/css/app.output.css
+++ b/NetinaShop.AdminPanel.PWA/wwwroot/css/app.output.css
@@ -1135,6 +1135,11 @@ input:checked + .toggle-bg {
   margin: 0.5rem;
 }
 
+.-my-4 {
+  margin-top: -1rem;
+  margin-bottom: -1rem;
+}
+
 .mx-1 {
   margin-left: 0.25rem;
   margin-right: 0.25rem;
@@ -1190,6 +1195,10 @@ input:checked + .toggle-bg {
   margin-bottom: auto;
 }
 
+.-mb-3 {
+  margin-bottom: -0.75rem;
+}
+
 .-ml-4 {
   margin-left: -1rem;
 }
@@ -1298,10 +1307,6 @@ input:checked + .toggle-bg {
   margin-top: 2rem;
 }
 
-.-mb-3 {
-  margin-bottom: -0.75rem;
-}
-
 .line-clamp-1 {
   overflow: hidden;
   display: -webkit-box;
@@ -1361,6 +1366,10 @@ input:checked + .toggle-bg {
   height: 1rem;
 }
 
+.h-40 {
+  height: 10rem;
+}
+
 .h-5 {
   height: 1.25rem;
 }
@@ -1406,10 +1415,6 @@ input:checked + .toggle-bg {
   height: 100vh;
 }
 
-.h-40 {
-  height: 10rem;
-}
-
 .\!max-h-\[80vh\] {
   max-height: 80vh !important;
 }
@@ -1458,6 +1463,10 @@ input:checked + .toggle-bg {
   width: 1rem;
 }
 
+.w-40 {
+  width: 10rem;
+}
+
 .w-5 {
   width: 1.25rem;
 }
@@ -1491,10 +1500,6 @@ input:checked + .toggle-bg {
   width: 100vw;
 }
 
-.w-40 {
-  width: 10rem;
-}
-
 .flex-1 {
   flex: 1 1 0%;
 }
@@ -1932,11 +1937,6 @@ input:checked + .toggle-bg {
   padding-bottom: 2rem;
 }
 
-.py-5 {
-  padding-top: 1.25rem;
-  padding-bottom: 1.25rem;
-}
-
 .pt-2 {
   padding-top: 0.5rem;
 }
@@ -1945,14 +1945,6 @@ input:checked + .toggle-bg {
   padding-top: 1rem;
 }
 
-.pl-8 {
-  padding-left: 2rem;
-}
-
-.pr-8 {
-  padding-right: 2rem;
-}
-
 .pt-8 {
   padding-top: 2rem;
 }
@@ -2482,6 +2474,10 @@ code {
 }
 
 @media (min-width: 1024px) {
+  .lg\:h-60 {
+    height: 15rem;
+  }
+
   .lg\:h-96 {
     height: 24rem;
   }
@@ -2490,14 +2486,6 @@ code {
     height: 38rem;
   }
 
-  .lg\:h-80 {
-    height: 20rem;
-  }
-
-  .lg\:h-60 {
-    height: 15rem;
-  }
-
   .lg\:max-h-\[25rem\] {
     max-height: 25rem;
   }
@@ -2506,6 +2494,10 @@ code {
     max-height: 35rem;
   }
 
+  .lg\:w-60 {
+    width: 15rem;
+  }
+
   .lg\:w-96 {
     width: 24rem;
   }
@@ -2514,14 +2506,6 @@ code {
     width: 38rem;
   }
 
-  .lg\:w-80 {
-    width: 20rem;
-  }
-
-  .lg\:w-60 {
-    width: 15rem;
-  }
-
   .lg\:p-8 {
     padding: 2rem;
   }