fix(templates): resolve issues of dashboard page of Boilerplate #8927 (…

…#8928)
bitfoundation · Oct 16, 2024 · 0f7bfe5 · 0f7bfe5
1 parent 32a278d
commit 0f7bfe5
Show file tree

Hide file tree

Showing 11 changed files with 19 additions and 211 deletions.
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json b/src/Templates/Boilerplate/Bit.Boilerplate/.template.config/template.json
@@ -389,9 +389,9 @@
                         "src/Shared/Controllers/Categories/**",
                         "src/Shared/Controllers/Products/**",
                         "src/Shared/Controllers/Dashboard/**",
-                        "src/Client/Boilerplate.Client.Core/Components/Pages/Categories/**",
-                        "src/Client/Boilerplate.Client.Core/Components/Pages/Dashboard/**",
-                        "src/Client/Boilerplate.Client.Core/Components/Pages/Products/**"
+                        "src/Client/Boilerplate.Client.Core/Components/Pages/Main/Categories/**",
+                        "src/Client/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/**",
+                        "src/Client/Boilerplate.Client.Core/Components/Pages/Main/Products/**"
                     ]
                 },
                 {
@@ -402,14 +402,14 @@
                         "src/Server/Boilerplate.Server.Api/Mappers/TodoMapper.cs",
                         "src/Server/Boilerplate.Server.Api/Models/Todo/**",
                         "src/Shared/Controllers/Todo/**",
-                        "src/Client/Boilerplate.Client.Core/Components/Pages/Todo/**"
+                        "src/Client/Boilerplate.Client.Core/Components/Pages/Main/Todo/**"
                     ]
                 },
                 {
                     "condition": "(offlineDb != true)",
                     "exclude": [
                         "src/Client/Boilerplate.Client.Core/Data/**",
-                        "src/Client/Boilerplate.Client.Core/Components/Pages/Offline/**"
+                        "src/Client/Boilerplate.Client.Core/Components/Pages/Main/Offline/**"
                     ]
                 },
                 {
@@ -488,7 +488,9 @@
                         "src/Tests/PageTests/**",
                         "src/Tests/TestInitializer.cs",
                         "src/Tests/Services/CulturedStringLocalizer.cs",
-                        "src/Tests/Services/FakeGoogleRecaptchaHttpClient.cs"
+                        "src/Tests/Services/FakeGoogleRecaptchaHttpClient.cs",
+                        "src/Tests/Services/EmailReaderService.cs",
+                        "src/Tests/Services/UserService.cs"
                     ]
                 },
                 {

diff --git a/...te/src/Client/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/DashboardPage.razor b/...te/src/Client/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/DashboardPage.razor
@@ -2,22 +2,19 @@
 @attribute [Route("{culture?}" + Urls.DashboardPage)]
 @inherits AppPageBase
 
-@if (isLoadingAssemblies)
-{
-    <BitRingLoading />
-}
-else
-{
-    <div class="page-container">
-        <OverallStatsWidget />
 
+<div class="page-container">
+    <OverallStatsWidget />
+    @if (isLoadingAssemblies)
+    {
+        <BitRingLoading />
+    }
+    else
+    {
         <div class="page-row">
             <ProductsCountPerCategoryWidget />
             <ProductsPercentageWidget />
         </div>
+    }
+</div>
 
-        <div class="page-row">
-            <ProductsSalesWidget />
-        </div>
-    </div>
-}
diff --git a/...src/Client/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/DashboardPage.razor.cs b/...src/Client/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/DashboardPage.razor.cs
@@ -20,12 +20,10 @@ protected async override Task OnInitAsync()
             if (AppPlatform.IsBrowser)
             {
                 await lazyAssemblyLoader.LoadAssembliesAsync([
-                    //#if (sample == "Admin" && offlineDb == false)
+                    //#if (offlineDb == false)
                     "System.Private.Xml.wasm", "System.Data.Common.wasm",
                     //#endif
-                    //#if (sample == "Admin")
                     "Newtonsoft.Json.wasm"]
-                    //#endif
                     );
             }
         }

diff --git a/.../Client/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/ProductsSalesWidget.razor b/.../Client/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/ProductsSalesWidget.razor
diff --git a/...ient/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/ProductsSalesWidget.razor.cs b/...ient/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/ProductsSalesWidget.razor.cs
diff --git a/...nt/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/ProductsSalesWidget.razor.scss b/...nt/Boilerplate.Client.Core/Components/Pages/Main/Dashboard/ProductsSalesWidget.razor.scss
diff --git a/...plates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/compilerconfig.json b/...plates/Boilerplate/Bit.Boilerplate/src/Client/Boilerplate.Client.Core/compilerconfig.json
@@ -252,12 +252,6 @@
         "minify": { "enabled": false },
         "options": { "sourceMap": false }
     },
-    {
-        "outputFile": "Components/Pages/Main/Dashboard/ProductsSalesWidget.razor.css",
-        "inputFile": "Components/Pages/Main/Dashboard/ProductsSalesWidget.razor.scss",
-        "minify": { "enabled": false },
-        "options": { "sourceMap": false }
-    },
     {
         "outputFile": "Components/Pages/Main/Products/AddOrEditProductModal.razor.css",
         "inputFile": "Components/Pages/Main/Products/AddOrEditProductModal.razor.scss",

diff --git a/...oilerplate/src/Server/Boilerplate.Server.Api/Controllers/Dashboard/DashboardController.cs b/...oilerplate/src/Server/Boilerplate.Server.Api/Controllers/Dashboard/DashboardController.cs
@@ -32,19 +32,6 @@ public IQueryable<ProductsCountPerCategoryResponseDto> GetProductsCountPerCatego
             });
     }
 
-    [HttpGet]
-    public IQueryable<ProductSaleStatResponseDto> GetProductsSalesStats()
-    {
-        Random rand = new Random();
-        return DbContext.Products.Include(p => p.Category)
-             .Select(p => new ProductSaleStatResponseDto()
-             {
-                 ProductName = p.Name,
-                 CategoryColor = p.Category!.Color,
-                 SaleAmount = rand.Next(1, 10) * p.Price
-             });
-    }
-
 
     [HttpGet]
     public async Task<List<ProductPercentagePerCategoryResponseDto>> GetProductsPercentagePerCategoryStats(CancellationToken cancellationToken)

diff --git a/...ates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Dashboard/IDashboardController.cs b/...ates/Boilerplate/Bit.Boilerplate/src/Shared/Controllers/Dashboard/IDashboardController.cs
@@ -11,9 +11,6 @@ public interface IDashboardController : IAppController
     [HttpGet]
     Task<List<ProductsCountPerCategoryResponseDto>> GetProductsCountPerCategoryStats(CancellationToken cancellationToken) => default!;
 
-    [HttpGet]
-    Task<List<ProductSaleStatResponseDto>> GetProductsSalesStats(CancellationToken cancellationToken) => default!;
-
     [HttpGet]
     Task<List<ProductPercentagePerCategoryResponseDto>> GetProductsPercentagePerCategoryStats(CancellationToken cancellationToken);
 }
diff --git a/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/AppJsonContext.cs b/src/Templates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/AppJsonContext.cs
@@ -30,7 +30,6 @@ namespace Boilerplate.Shared.Dtos;
 //#elif (sample == "Admin")
 [JsonSerializable(typeof(List<ProductsCountPerCategoryResponseDto>))]
 [JsonSerializable(typeof(OverallAnalyticsStatsDataResponseDto))]
-[JsonSerializable(typeof(List<ProductSaleStatResponseDto>))]
 [JsonSerializable(typeof(List<ProductPercentagePerCategoryResponseDto>))]
 [JsonSerializable(typeof(ProductDto))]
 [JsonSerializable(typeof(PagedResult<ProductDto>))]

diff --git a/...lates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Dashboard/ProductSaleStatResponseDto.cs b/...lates/Boilerplate/Bit.Boilerplate/src/Shared/Dtos/Dashboard/ProductSaleStatResponseDto.cs