diff --git a/Netina.AdminPanel.PWA/Dialogs/DiscountActionDialogBox.razor.cs b/Netina.AdminPanel.PWA/Dialogs/DiscountActionDialogBox.razor.cs index 249973b..7515bd7 100644 --- a/Netina.AdminPanel.PWA/Dialogs/DiscountActionDialogBox.razor.cs +++ b/Netina.AdminPanel.PWA/Dialogs/DiscountActionDialogBox.razor.cs @@ -311,9 +311,9 @@ public class DiscountActionDialogBoxViewModel : BaseViewModel if (token == null) throw new Exception("Token is null"); if (product.IsNullOrEmpty()) - response = await _restWrapper.ProductRestApi.ReadAll(0,null,null,null); + response = await _restWrapper.ProductRestApi.ReadAll(0,null,null,null,token); else - response = await _restWrapper.ProductRestApi.ReadAll(product); + response = await _restWrapper.ProductRestApi.ReadAll(product,token); _products = response.Products; return _products; } diff --git a/Netina.AdminPanel.PWA/Netina.AdminPanel.PWA.csproj b/Netina.AdminPanel.PWA/Netina.AdminPanel.PWA.csproj index 9889480..f993cdd 100644 --- a/Netina.AdminPanel.PWA/Netina.AdminPanel.PWA.csproj +++ b/Netina.AdminPanel.PWA/Netina.AdminPanel.PWA.csproj @@ -5,8 +5,8 @@ enable enable service-worker-assets.js - 1.1.10.15 - 1.1.10.15 + 1.3.12.16 + 1.3.12.16 $(MSBuildProjectName) diff --git a/Netina.AdminPanel.PWA/Pages/Personalization/ManageNavMenuPage.razor.cs b/Netina.AdminPanel.PWA/Pages/Personalization/ManageNavMenuPage.razor.cs index afea339..fb1009b 100644 --- a/Netina.AdminPanel.PWA/Pages/Personalization/ManageNavMenuPage.razor.cs +++ b/Netina.AdminPanel.PWA/Pages/Personalization/ManageNavMenuPage.razor.cs @@ -133,7 +133,7 @@ public class ManageNavMenuPageViewModel : BaseViewModel var token = await _userUtility.GetBearerTokenAsync(); if (token == null) throw new Exception("Token is null"); - var response = await _restWrapper.ProductRestApi.ReadAll(0,product,null,null); + var response = await _restWrapper.ProductRestApi.ReadAll(0,product,null,null,token); var categories = response.Products; if (product.IsNullOrEmpty()) return categories; diff --git a/Netina.AdminPanel.PWA/Pages/ProductsPage.razor b/Netina.AdminPanel.PWA/Pages/ProductsPage.razor index dcc6b98..2bc5f92 100644 --- a/Netina.AdminPanel.PWA/Pages/ProductsPage.razor +++ b/Netina.AdminPanel.PWA/Pages/ProductsPage.razor @@ -45,9 +45,10 @@ - @@ -87,9 +88,10 @@ - diff --git a/Netina.AdminPanel.PWA/Pages/ProductsPage.razor.cs b/Netina.AdminPanel.PWA/Pages/ProductsPage.razor.cs index ebd8e1e..3ceee08 100644 --- a/Netina.AdminPanel.PWA/Pages/ProductsPage.razor.cs +++ b/Netina.AdminPanel.PWA/Pages/ProductsPage.razor.cs @@ -38,7 +38,7 @@ public class ProductsPageViewModel( IsProcessing = true; PageDto.Clear(); var search = Search.IsNullOrEmpty() ? null : Search; - var dto = await restWrapper.ProductRestApi.ReadAll(CurrentPage, search, SelectedCategory?.Id, IsEnable); + var dto = await restWrapper.ProductRestApi.ReadAll(CurrentPage, search, SelectedCategory?.Id, IsEnable,token); dto.Products.ForEach(d => PageDto.Add(d)); if (PageDto.Count % 20 == 0) PageCount = CurrentPage + 2; @@ -158,11 +158,10 @@ public class ProductsPageViewModel( } } - public async Task SearchChanged(string search) + public async Task SearchChanged() { - if (search.IsNullOrEmpty() && !Search.IsNullOrEmpty()) + if (Search!=null && !Search.IsNullOrEmpty()) await InitializeAsync(); - Search = search; } diff --git a/Netina.AdminPanel.PWA/Services/RestServices/IProductRestApi.cs b/Netina.AdminPanel.PWA/Services/RestServices/IProductRestApi.cs index 4f40eaf..fb16565 100644 --- a/Netina.AdminPanel.PWA/Services/RestServices/IProductRestApi.cs +++ b/Netina.AdminPanel.PWA/Services/RestServices/IProductRestApi.cs @@ -13,10 +13,10 @@ public interface IProductRestApi Task ReadOne(Guid productId); [Get("")] - Task ReadAll([Query] string productName); + Task ReadAll([Query] string productName, [Header("Authorization")] string authorization); [Get("")] - Task ReadAll([Query] int page, [Query] string? productName, [Query] Guid? categoryId, [Query] bool? isActive); + Task ReadAll([Query] int page, [Query] string? productName, [Query] Guid? categoryId, [Query] bool? isActive, [Header("Authorization")] string authorization); [Get("")] Task ReadAll([Query] string productName, [Query] Guid categoryId, [Header("Authorization")] string authorization); diff --git a/Netina.AdminPanel.PWA/wwwroot/css/app.min.css b/Netina.AdminPanel.PWA/wwwroot/css/app.min.css index b702594..ca6cd92 100644 --- a/Netina.AdminPanel.PWA/wwwroot/css/app.min.css +++ b/Netina.AdminPanel.PWA/wwwroot/css/app.min.css @@ -1096,10 +1096,6 @@ input:checked + .toggle-bg { margin-left: 1rem; margin-right: 1rem; } -.mx-5 { - margin-left: 1.25rem; - margin-right: 1.25rem; -} .mx-auto { margin-left: auto; margin-right: auto;