neozhu · neozhu · Nov 12, 2023 · Oct 18, 2023 · Oct 18, 2023 · Oct 18, 2023
diff --git a/.gitignore b/.gitignore
@@ -356,4 +356,4 @@ MigrationBackup/
 
 
 **/Files/
-src/Blazor.Server.UI/appsettings.development.json
+src/Server.UI/appsettings.development.json
diff --git a/.template.config/template.json b/.template.config/template.json
@@ -36,7 +36,7 @@
         "*.nupkg",
         "launchSettings.json",
         "*.exe",
-        "src/Blazor.Server.UI/Files/**"
+        "src/Server.UI/Files/**"
       ]
     }
   ]

diff --git a/.vscode/launch.json b/.vscode/launch.json
@@ -10,9 +10,9 @@
             "request": "launch",
             "preLaunchTask": "build",
             // If you have changed target frameworks, make sure to update the program path.
-            "program": "${workspaceFolder}/src/Blazor.Server.UI/bin/Debug/net6.0/Blazor.Server.UI.dll",
+            "program": "${workspaceFolder}/src/Server.UI/bin/Debug/net6.0/CleanArchitecture.Blazor.Server.UI.dll",
             "args": [],
-            "cwd": "${workspaceFolder}/src/Blazor.Server.UI",
+            "cwd": "${workspaceFolder}/src/Server.UI",
             "stopAtEntry": false,
             // Enable launching a web browser when ASP.NET Core starts. For more information: https://aka.ms/VSCode-CS-LaunchJson-WebBrowser
             "serverReadyAction": {

diff --git a/.vscode/tasks.json b/.vscode/tasks.json
@@ -7,7 +7,7 @@
             "type": "process",
             "args": [
                 "build",
-                "${workspaceFolder}/src/Blazor.Server.UI/Blazor.Server.UI.csproj",
+                "${workspaceFolder}/src/Server.UI/Server.UI.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -19,7 +19,7 @@
             "type": "process",
             "args": [
                 "publish",
-                "${workspaceFolder}/src/Blazor.Server.UI/Blazor.Server.UI.csproj",
+                "${workspaceFolder}/src/Server.UI/Server.UI.csproj",
                 "/property:GenerateFullPaths=true",
                 "/consoleloggerparameters:NoSummary"
             ],
@@ -33,7 +33,7 @@
                 "watch",
                 "run",
                 "--project",
-                "${workspaceFolder}/src/Blazor.Server.UI/Blazor.Server.UI.csproj"
+                "${workspaceFolder}/src/Server.UI/Server.UI.csproj"
             ],
             "problemMatcher": "$msCompile"
         }

diff --git a/CleanArchitecture.Blazor.sln b/CleanArchitecture.Blazor.sln
@@ -22,8 +22,6 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Domain", "src\Domain\Domain
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Infrastructure", "src\Infrastructure\Infrastructure.csproj", "{D5A42BE7-D229-4746-9D2A-AC878F79DBED}"
 EndProject
-Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Blazor.Server.UI", "src\Blazor.Server.UI\Blazor.Server.UI.csproj", "{66AFF428-DE0D-4F7A-B5D4-B321DE267A15}"
-EndProject
 Project("{E53339B2-1760-4266-BCC7-CA923CBCF16C}") = "docker-compose", "docker-compose.dcproj", "{6BD2EC46-FA8F-44F3-AF33-903BBB347116}"
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Application.IntegrationTests", "tests\Application.IntegrationTests\Application.IntegrationTests.csproj", "{4AF55920-007C-411D-8AD3-6F9D2C722450}"
@@ -40,6 +38,10 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Migrators.PostgreSQL", "src
 EndProject
 Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Migrators.SqLite", "src\Migrators\Migrators.SqLite\Migrators.SqLite.csproj", "{469D68F1-379E-46A6-AAC3-CD1E4C0E7D77}"
 EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server.UI", "src\Server.UI\Server.UI.csproj", "{3E4AF4E5-02EE-4F26-9B6D-8723670172B3}"
+EndProject
+Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Server", "src\Server\Server.csproj", "{E5008BA6-6358-413C-A082-AF14115EF18B}"
+EndProject
 Global
 	GlobalSection(SolutionConfigurationPlatforms) = preSolution
 		Debug|Any CPU = Debug|Any CPU
@@ -58,10 +60,6 @@ Global
 		{D5A42BE7-D229-4746-9D2A-AC878F79DBED}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{D5A42BE7-D229-4746-9D2A-AC878F79DBED}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{D5A42BE7-D229-4746-9D2A-AC878F79DBED}.Release|Any CPU.Build.0 = Release|Any CPU
-		{66AFF428-DE0D-4F7A-B5D4-B321DE267A15}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
-		{66AFF428-DE0D-4F7A-B5D4-B321DE267A15}.Debug|Any CPU.Build.0 = Debug|Any CPU
-		{66AFF428-DE0D-4F7A-B5D4-B321DE267A15}.Release|Any CPU.ActiveCfg = Release|Any CPU
-		{66AFF428-DE0D-4F7A-B5D4-B321DE267A15}.Release|Any CPU.Build.0 = Release|Any CPU
 		{6BD2EC46-FA8F-44F3-AF33-903BBB347116}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
 		{6BD2EC46-FA8F-44F3-AF33-903BBB347116}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{6BD2EC46-FA8F-44F3-AF33-903BBB347116}.Release|Any CPU.ActiveCfg = Release|Any CPU
@@ -90,6 +88,14 @@ Global
 		{469D68F1-379E-46A6-AAC3-CD1E4C0E7D77}.Debug|Any CPU.Build.0 = Debug|Any CPU
 		{469D68F1-379E-46A6-AAC3-CD1E4C0E7D77}.Release|Any CPU.ActiveCfg = Release|Any CPU
 		{469D68F1-379E-46A6-AAC3-CD1E4C0E7D77}.Release|Any CPU.Build.0 = Release|Any CPU
+		{3E4AF4E5-02EE-4F26-9B6D-8723670172B3}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{3E4AF4E5-02EE-4F26-9B6D-8723670172B3}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{3E4AF4E5-02EE-4F26-9B6D-8723670172B3}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{3E4AF4E5-02EE-4F26-9B6D-8723670172B3}.Release|Any CPU.Build.0 = Release|Any CPU
+		{E5008BA6-6358-413C-A082-AF14115EF18B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+		{E5008BA6-6358-413C-A082-AF14115EF18B}.Debug|Any CPU.Build.0 = Debug|Any CPU
+		{E5008BA6-6358-413C-A082-AF14115EF18B}.Release|Any CPU.ActiveCfg = Release|Any CPU
+		{E5008BA6-6358-413C-A082-AF14115EF18B}.Release|Any CPU.Build.0 = Release|Any CPU
 	EndGlobalSection
 	GlobalSection(SolutionProperties) = preSolution
 		HideSolutionNode = FALSE
@@ -98,14 +104,15 @@ Global
 		{196FC2C6-2817-494B-AB9D-26F9DD33247A} = {21DC0B96-ED87-4130-BA8D-E8CF73903344}
 		{AAD8A88D-2BBE-4C6E-A4CA-02D9005BF3DF} = {21DC0B96-ED87-4130-BA8D-E8CF73903344}
 		{D5A42BE7-D229-4746-9D2A-AC878F79DBED} = {21DC0B96-ED87-4130-BA8D-E8CF73903344}
-		{66AFF428-DE0D-4F7A-B5D4-B321DE267A15} = {21DC0B96-ED87-4130-BA8D-E8CF73903344}
 		{4AF55920-007C-411D-8AD3-6F9D2C722450} = {E5DE00AF-3C91-41CE-B37C-2C46F97739F3}
 		{92C7B430-4830-4ECB-B195-7AA306F1ED21} = {E5DE00AF-3C91-41CE-B37C-2C46F97739F3}
 		{CA0BF3A4-392B-41AC-AAEF-C83A59913499} = {E5DE00AF-3C91-41CE-B37C-2C46F97739F3}
 		{5C45543E-B3FA-4C1F-9D7D-DA2E6654BD61} = {21DC0B96-ED87-4130-BA8D-E8CF73903344}
 		{910C5689-CC8A-4E5B-8894-B00515C90466} = {5C45543E-B3FA-4C1F-9D7D-DA2E6654BD61}
 		{08778353-0814-41BB-B49E-36BBA8D7751D} = {5C45543E-B3FA-4C1F-9D7D-DA2E6654BD61}
 		{469D68F1-379E-46A6-AAC3-CD1E4C0E7D77} = {5C45543E-B3FA-4C1F-9D7D-DA2E6654BD61}
+		{3E4AF4E5-02EE-4F26-9B6D-8723670172B3} = {21DC0B96-ED87-4130-BA8D-E8CF73903344}
+		{E5008BA6-6358-413C-A082-AF14115EF18B} = {21DC0B96-ED87-4130-BA8D-E8CF73903344}
 	EndGlobalSection
 	GlobalSection(ExtensibilityGlobals) = postSolution
 		SolutionGuid = {384CDE06-46A5-4FC5-AED4-7B23339EA56F}

diff --git a/README.md b/README.md
@@ -34,18 +34,18 @@ Blazor technology.
 
 ### How to select a specific Database?
 
-1. Open the `appsettings.json` file located in the src directory of the `Blazor.Server.UI` project.
+1. Open the `appsettings.json` file located in the src directory of the `Server.UI` project.
 2. Change the setting `DBProvider` to the desired provider name (See Supported Databases).
 3. Change the `ConnectionString` to a connection string, which works for your selected database provider.
 
 ## Docker compose https deployment
 
 - Create self-signed development certificates for the project
-    - cmd: `dotnet dev-certs https -ep $env:USERPROFILE\.aspnet\https\Blazor.Server.UI.pfx -p Password@123`
+    - cmd: `dotnet dev-certs https -ep $env:USERPROFILE\.aspnet\https\CleanArchitecture.Blazor.Server.UI.pfx -p Password@123`
     - cmd: `dotnet dev-certs https --trust`
 - Manage User secrets to save the password
     - cmd: `dotnet user-secrets init`
-    - cmd: `dotnet user-secrets -p Blazor.Server.UI.csproj set "Kestrel:Certificates:Development:Password" "Password@123"`
+    - cmd: `dotnet user-secrets -p Server.UI.csproj set "Kestrel:Certificates:Development:Password" "Password@123"`
 
 ## Code Generator Extension for visual studio.net 2022
 

diff --git a/docker-compose.dcproj b/docker-compose.dcproj
@@ -12,22 +12,11 @@
     <None Include="docker-compose.yml" />
     <None Include="docker-compose.override.yml" />
     <None Include=".dockerignore" />
-    <None Include="src\Blazor.Server.UI\Pages\Identity\Users\Users.razor.cs" />
-    <None Include="src\Blazor.Server.UI\Shared\UserLoginState.razor.cs" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove="launchSettings.json" />
-  </ItemGroup>
-  <ItemGroup>
-    <None Remove="launchSettings.json" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="launchSettings.json" />
   </ItemGroup>
   <ItemGroup>
     <None Remove="src\**" />
   </ItemGroup>
-  <ItemGroup>
-    <None Include="src\Blazor.Server.UI\Pages\Identity\Users\Profile.razor.cs" />
-  </ItemGroup>
 </Project>
diff --git a/docker-compose.yml b/docker-compose.yml
@@ -5,14 +5,14 @@ services:
     image: ${DOCKER_REGISTRY-}blazorserver
     build:
       context: .
-      dockerfile: src/Blazor.Server.UI/Dockerfile
+      dockerfile: src/Server.UI/Dockerfile
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - UseInMemoryDatabase=true
       - ConnectionStrings__DefaultConnection=Server=sqldb;Database=BlazorDashboardDb;User=sa;Password=Password@123;MultipleActiveResultSets=true
       - ASPNETCORE_URLS=https://+:443;http://+:80
       #- ASPNETCORE_Kestrel__Certificates__Default__Password=Password@123
-      #- ASPNETCORE_Kestrel__Certificates__Default__Path=/root/.aspnet/https/Blazor.Server.UI.pfx
+      #- ASPNETCORE_Kestrel__Certificates__Default__Path=/root/.aspnet/https/CleanArchitecture.Blazor.Server.UI.pfx
     volumes:
      - ${APPDATA}\microsoft\UserSecrets\:/root/.microsoft/usersecrets:ro
      - ~/.aspnet/https:/root/.aspnet/https:ro

diff --git a/src/Application/Application.csproj b/src/Application/Application.csproj
@@ -1,39 +1,29 @@
 <Project Sdk="Microsoft.NET.Sdk">
-  <PropertyGroup>
-    <TargetFramework>net7.0</TargetFramework>
-    <RootNamespace>CleanArchitecture.Blazor.Application</RootNamespace>
-    <AssemblyName>CleanArchitecture.Blazor.Application</AssemblyName>
-    <ImplicitUsings>enable</ImplicitUsings>
-      <Nullable>enable</Nullable>
-  </PropertyGroup>
-  <ItemGroup>
-      <PackageReference Include="Ardalis.Specification" Version="7.0.0" />
-      <PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="7.0.0" />
-      <PackageReference Include="ClosedXML" Version="0.102.1" />
-      <PackageReference Include="jcamp.FluentEmail.Core" Version="3.2.0" />
-      <PackageReference Include="jcamp.FluentEmail.MailKit" Version="3.2.0" />
-      <PackageReference Include="jcamp.FluentEmail.Razor" Version="3.2.0" />
-      <PackageReference Include="MailKit" Version="4.2.0" />
-    <PackageReference Include="AutoMapper" Version="12.0.1" />
-    <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
-    <PackageReference Include="FluentValidation" Version="11.7.1" />
-    <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.7.1" />
-      <PackageReference Include="Fluxor.Blazor.Web" Version="5.9.1" />
-      <PackageReference Include="Fluxor.Blazor.Web.ReduxDevTools" Version="5.9.1" />
-    <PackageReference Include="LazyCache" Version="2.4.0" />
-    <PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
-    <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.12" />
-    <PackageReference Include="Microsoft.AspNetCore.SignalR.Client" Version="7.0.12" />
-    <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.1" />
-    <PackageReference Include="Microsoft.Extensions.Configuration.Binder" Version="7.0.4" />
-    <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.12" />
-    <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
-    <PackageReference Include="Hangfire.Core" Version="1.8.5" />
-  </ItemGroup>
-  <ItemGroup>
-    <ProjectReference Include="..\Domain\Domain.csproj" />
-  </ItemGroup>
-  <ItemGroup>
-    <Folder Include="Common\Specification\" />
-  </ItemGroup>
+    <PropertyGroup>
+        <TargetFramework>net7.0</TargetFramework>
+        <RootNamespace>CleanArchitecture.Blazor.Application</RootNamespace>
+        <AssemblyName>CleanArchitecture.Blazor.Application</AssemblyName>
+        <ImplicitUsings>enable</ImplicitUsings>
+        <Nullable>enable</Nullable>
+    </PropertyGroup>
+    <ItemGroup>
+        <PackageReference Include="Ardalis.Specification" Version="7.0.0" />
+        <PackageReference Include="Ardalis.Specification.EntityFrameworkCore" Version="7.0.0" />
+        <PackageReference Include="ClosedXML" Version="0.102.1" />
+        <PackageReference Include="jcamp.FluentEmail.Core" Version="3.2.0" />
+        <PackageReference Include="AutoMapper" Version="12.0.1" />
+        <PackageReference Include="AutoMapper.Extensions.Microsoft.DependencyInjection" Version="12.0.1" />
+        <PackageReference Include="FluentValidation" Version="11.8.0" />
+        <PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="11.8.0" />
+        <PackageReference Include="LazyCache" Version="2.4.0" />
+        <PackageReference Include="LazyCache.AspNetCore" Version="2.4.0" />
+        <PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="7.0.13" />
+        <PackageReference Include="Microsoft.Data.SqlClient" Version="5.1.2" />
+        <PackageReference Include="Microsoft.Extensions.Localization.Abstractions" Version="7.0.13" />
+        <PackageReference Include="System.Linq.Dynamic.Core" Version="1.3.5" />
+        <PackageReference Include="Hangfire.Core" Version="1.8.6" />
+    </ItemGroup>
+    <ItemGroup>
+        <ProjectReference Include="..\Domain\Domain.csproj" />
+    </ItemGroup>
 </Project>
diff --git a/src/Application/Common/Behaviours/ValidationBehaviour.cs b/src/Application/Common/Behaviours/ValidationBehaviour.cs
diff --git a/src/Application/Common/Extensions/QueryableExtensions.cs b/src/Application/Common/Extensions/QueryableExtensions.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 using Ardalis.Specification.EntityFrameworkCore;
-using CleanArchitecture.Blazor.Domain.Common;
+using CleanArchitecture.Blazor.Domain.Common.Entities;
 
 namespace CleanArchitecture.Blazor.Application.Common.Extensions;
 

diff --git a/src/Application/Common/Extensions/ValidationExtensions.cs b/src/Application/Common/Extensions/ValidationExtensions.cs
@@ -0,0 +1,26 @@
+using FluentValidation.Results;
+
+namespace CleanArchitecture.Blazor.Application.Common.Extensions;
+public static class ValidationExtensions
+{
+    public static async Task<List<ValidationFailure>> ValidateAsync<TRequest>(this IEnumerable<IValidator<TRequest>> validators, ValidationContext<TRequest> validationContext, CancellationToken cancellationToken = default)
+    {
+        if (!validators.Any()) return new List<ValidationFailure>();
+
+        var validationResults = await Task.WhenAll(
+            validators.Select(v => v.ValidateAsync(validationContext, cancellationToken)));
+
+        return validationResults
+            .SelectMany(r => r.Errors)
+            .Where(f => f != null)
+            .ToList();
+    }
+
+    public static Dictionary<string, string[]> ToDictionary(this List<ValidationFailure>? failures)
+    {
+        return failures != null && failures.Any()
+            ? failures.GroupBy(e => e.PropertyName, e => e.ErrorMessage)
+                .ToDictionary(g => g.Key, g => g.ToArray())
+            : new Dictionary<string, string[]>();
+    }
+}
diff --git a/src/Application/Common/Helper/ConstantStringLocalizer.cs b/src/Application/Common/Helper/ConstantStringLocalizer.cs
diff --git a/src/Application/Common/Helper/ValidationHelper.cs b/src/Application/Common/Helper/ValidationHelper.cs
diff --git a/src/Application/Common/Interfaces/IApplicationDbContext.cs b/src/Application/Common/Interfaces/IApplicationDbContext.cs
@@ -2,7 +2,7 @@
 // The .NET Foundation licenses this file to you under the MIT license.
 
 
-using CleanArchitecture.Blazor.Domain.Entities.Logger;
+using CleanArchitecture.Blazor.Domain.Entities;
 using Microsoft.EntityFrameworkCore.ChangeTracking;
 
 namespace CleanArchitecture.Blazor.Application.Common.Interfaces;

diff --git a/src/Application/Common/Interfaces/IApplicationHubWrapper.cs b/src/Application/Common/Interfaces/IApplicationHubWrapper.cs
@@ -0,0 +1,8 @@
+namespace CleanArchitecture.Blazor.Application.Common.Interfaces;
+
+// TODO: can be improved or removed using MediatR?
+public interface IApplicationHubWrapper
+{
+    Task JobStarted(string message);
+    Task JobCompleted(string message);
+}
diff --git a/src/Application/Common/Interfaces/IApplicationSettings.cs b/src/Application/Common/Interfaces/IApplicationSettings.cs
@@ -0,0 +1,19 @@
+namespace CleanArchitecture.Blazor.Application.Common.Interfaces;
+public interface IApplicationSettings
+{
+    /// <summary>
+    ///     Current application version
+    /// </summary>
+    string Version { get; }
+
+    /// <summary>
+    ///     Application framework
+    /// </summary>
+
+    string App { get; }
+
+    /// <summary>
+    ///     The application name / title
+    /// </summary>
+    string AppName { get; }
+}
Original file line number	Diff line number	Diff line change
Expand Up		@@ -356,4 +356,4 @@ MigrationBackup/


		**/Files/
		src/Blazor.Server.UI/appsettings.development.json
		src/Server.UI/appsettings.development.json