-
-
-
+
+
+
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyProjectNameHostModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyProjectNameHostModule.cs
index 65b09d8f09..b8522fb170 100644
--- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyProjectNameHostModule.cs
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyProjectNameHostModule.cs
@@ -6,11 +6,13 @@ using Microsoft.OpenApi.Models;
using MyCompanyName.MyProjectName.Data;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName;
+using MyCompanyName.MyProjectName.Components;
using MyCompanyName.MyProjectName.MultiTenancy;
using OpenIddict.Validation.AspNetCore;
using Volo.Abp;
using Volo.Abp.Account;
using Volo.Abp.Account.Web;
+using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp;
using Volo.Abp.AspNetCore.MultiTenancy;
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.AspNetCore.Mvc.Localization;
@@ -148,6 +150,10 @@ public class MyProjectNameHostModule : AbpModule
context.Services.Replace(ServiceDescriptor.Singleton
());
}
+ // Add services to the container.
+ context.Services.AddRazorComponents()
+ .AddInteractiveWebAssemblyComponents();
+
ConfigureAuthentication(context);
ConfigureBundles();
ConfigureMultiTenancy();
@@ -335,6 +341,7 @@ public class MyProjectNameHostModule : AbpModule
app.UseUnitOfWork();
app.UseDynamicClaims();
+ app.UseAntiforgery();
app.UseAuthorization();
app.UseSwagger();
@@ -349,11 +356,11 @@ public class MyProjectNameHostModule : AbpModule
app.UseAuditing();
app.UseAbpSerilogEnrichers();
- app.UseConfiguredEndpoints();
-
- if (app is WebApplication webApp)
+ app.UseConfiguredEndpoints(builder =>
{
- webApp.MapFallbackToFile("index.html");
- }
+ builder.MapRazorComponents()
+ .AddInteractiveWebAssemblyRenderMode()
+ .AddAdditionalAssemblies(WebAppAdditionalAssembliesHelper.GetAssemblies());
+ });
}
}
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Services/MyProjectNameAppService.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Services/MyProjectNameAppService.cs
new file mode 100644
index 0000000000..c211c514ac
--- /dev/null
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/Services/MyProjectNameAppService.cs
@@ -0,0 +1,13 @@
+using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.Application.Services;
+
+namespace MyCompanyName.MyProjectName.Services;
+
+/* Inherit your application services from this class. */
+public abstract class MyProjectNameAppService : ApplicationService
+{
+ protected MyProjectNameAppService()
+ {
+ LocalizationResource = typeof(MyProjectNameResource);
+ }
+}
\ No newline at end of file
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Services/MyProjectNameAppService.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Services/MyProjectNameAppService.cs
new file mode 100644
index 0000000000..c211c514ac
--- /dev/null
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/Services/MyProjectNameAppService.cs
@@ -0,0 +1,13 @@
+using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.Application.Services;
+
+namespace MyCompanyName.MyProjectName.Services;
+
+/* Inherit your application services from this class. */
+public abstract class MyProjectNameAppService : ApplicationService
+{
+ protected MyProjectNameAppService()
+ {
+ LocalizationResource = typeof(MyProjectNameResource);
+ }
+}
\ No newline at end of file
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png
index 621596bb5c..9734a07a4d 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-dark.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-dark.png
index e4bfe818c8..a3bbe82224 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-dark.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-dark.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-light-thumbnail.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-light-thumbnail.png
index 886c960864..ca3918481a 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-light-thumbnail.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-light-thumbnail.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-light.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-light.png
index 6ebd97e2b2..761fb4443d 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-light.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/wwwroot/images/logo/leptonx/logo-light.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Services/MyProjectNameAppService.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Services/MyProjectNameAppService.cs
new file mode 100644
index 0000000000..c211c514ac
--- /dev/null
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/Services/MyProjectNameAppService.cs
@@ -0,0 +1,13 @@
+using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.Application.Services;
+
+namespace MyCompanyName.MyProjectName.Services;
+
+/* Inherit your application services from this class. */
+public abstract class MyProjectNameAppService : ApplicationService
+{
+ protected MyProjectNameAppService()
+ {
+ LocalizationResource = typeof(MyProjectNameResource);
+ }
+}
\ No newline at end of file
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png
index 621596bb5c..9734a07a4d 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-dark.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-dark.png
index e4bfe818c8..a3bbe82224 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-dark.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-dark.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-light-thumbnail.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-light-thumbnail.png
index 886c960864..ca3918481a 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-light-thumbnail.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-light-thumbnail.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-light.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-light.png
index 6ebd97e2b2..761fb4443d 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-light.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/wwwroot/images/logo/leptonx/logo-light.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/Services/MyProjectNameAppService.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/Services/MyProjectNameAppService.cs
new file mode 100644
index 0000000000..c211c514ac
--- /dev/null
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/Services/MyProjectNameAppService.cs
@@ -0,0 +1,13 @@
+using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.Application.Services;
+
+namespace MyCompanyName.MyProjectName.Services;
+
+/* Inherit your application services from this class. */
+public abstract class MyProjectNameAppService : ApplicationService
+{
+ protected MyProjectNameAppService()
+ {
+ LocalizationResource = typeof(MyProjectNameResource);
+ }
+}
\ No newline at end of file
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png
index 621596bb5c..9734a07a4d 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-dark.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-dark.png
index e4bfe818c8..a3bbe82224 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-dark.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-dark.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-light-thumbnail.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-light-thumbnail.png
index 886c960864..ca3918481a 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-light-thumbnail.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-light-thumbnail.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-light.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-light.png
index 6ebd97e2b2..761fb4443d 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-light.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/wwwroot/images/logo/leptonx/logo-light.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Services/MyProjectNameAppService.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Services/MyProjectNameAppService.cs
new file mode 100644
index 0000000000..c211c514ac
--- /dev/null
+++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/Services/MyProjectNameAppService.cs
@@ -0,0 +1,13 @@
+using MyCompanyName.MyProjectName.Localization;
+using Volo.Abp.Application.Services;
+
+namespace MyCompanyName.MyProjectName.Services;
+
+/* Inherit your application services from this class. */
+public abstract class MyProjectNameAppService : ApplicationService
+{
+ protected MyProjectNameAppService()
+ {
+ LocalizationResource = typeof(MyProjectNameResource);
+ }
+}
\ No newline at end of file
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png
index 621596bb5c..9734a07a4d 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-dark.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-dark.png
index e4bfe818c8..a3bbe82224 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-dark.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-dark.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-light-thumbnail.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-light-thumbnail.png
index 886c960864..ca3918481a 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-light-thumbnail.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-light-thumbnail.png differ
diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-light.png b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-light.png
index 6ebd97e2b2..761fb4443d 100644
Binary files a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-light.png and b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/wwwroot/images/logo/leptonx/logo-light.png differ
diff --git a/templates/app/angular/src/assets/images/logo/logo-light-thumbnail.png b/templates/app/angular/src/assets/images/logo/logo-light-thumbnail.png
index 886c960864..ca3918481a 100644
Binary files a/templates/app/angular/src/assets/images/logo/logo-light-thumbnail.png and b/templates/app/angular/src/assets/images/logo/logo-light-thumbnail.png differ
diff --git a/templates/app/angular/src/assets/images/logo/logo-light.png b/templates/app/angular/src/assets/images/logo/logo-light.png
index 6ebd97e2b2..761fb4443d 100644
Binary files a/templates/app/angular/src/assets/images/logo/logo-light.png and b/templates/app/angular/src/assets/images/logo/logo-light.png differ
diff --git a/templates/app/aspnet-core/MyCompanyName.MyProjectName.sln b/templates/app/aspnet-core/MyCompanyName.MyProjectName.sln
index fe15314225..bc9c9cb850 100644
--- a/templates/app/aspnet-core/MyCompanyName.MyProjectName.sln
+++ b/templates/app/aspnet-core/MyCompanyName.MyProjectName.sln
@@ -55,6 +55,16 @@ Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName
EndProject
Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.Server.Tiered", "src\MyCompanyName.MyProjectName.Blazor.Server.Tiered\MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj", "{C9F40C93-3DD0-4D6E-B98E-45A6F50FACDA}"
EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.Client", "src\MyCompanyName.MyProjectName.Blazor.Client\MyCompanyName.MyProjectName.Blazor.Client.csproj", "{188A64AD-A1A7-4F95-85D1-C935594611B7}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.WebApp", "src\MyCompanyName.MyProjectName.Blazor.WebApp\MyCompanyName.MyProjectName.Blazor.WebApp.csproj", "{14882ABF-1EEF-430C-8E72-812B3EE810C4}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.WebApp.Client", "src\MyCompanyName.MyProjectName.Blazor.WebApp.Client\MyCompanyName.MyProjectName.Blazor.WebApp.Client.csproj", "{648460F4-3ECC-4751-9D87-EE25D0B8B2BF}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.WebApp.Tiered", "src\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.csproj", "{8A3E5E20-F162-4321-8AD5-23DD7B2B0E74}"
+EndProject
+Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client", "src\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client\MyCompanyName.MyProjectName.Blazor.WebApp.Tiered.Client.csproj", "{834C6A10-7562-427C-8771-B0588C35873D}"
+EndProject
Global
GlobalSection(SolutionConfigurationPlatforms) = preSolution
Debug|Any CPU = Debug|Any CPU
@@ -157,6 +167,26 @@ Global
{C9F40C93-3DD0-4D6E-B98E-45A6F50FACDA}.Debug|Any CPU.Build.0 = Debug|Any CPU
{C9F40C93-3DD0-4D6E-B98E-45A6F50FACDA}.Release|Any CPU.ActiveCfg = Release|Any CPU
{C9F40C93-3DD0-4D6E-B98E-45A6F50FACDA}.Release|Any CPU.Build.0 = Release|Any CPU
+ {188A64AD-A1A7-4F95-85D1-C935594611B7}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {188A64AD-A1A7-4F95-85D1-C935594611B7}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {188A64AD-A1A7-4F95-85D1-C935594611B7}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {188A64AD-A1A7-4F95-85D1-C935594611B7}.Release|Any CPU.Build.0 = Release|Any CPU
+ {14882ABF-1EEF-430C-8E72-812B3EE810C4}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {14882ABF-1EEF-430C-8E72-812B3EE810C4}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {14882ABF-1EEF-430C-8E72-812B3EE810C4}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {14882ABF-1EEF-430C-8E72-812B3EE810C4}.Release|Any CPU.Build.0 = Release|Any CPU
+ {648460F4-3ECC-4751-9D87-EE25D0B8B2BF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {648460F4-3ECC-4751-9D87-EE25D0B8B2BF}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {648460F4-3ECC-4751-9D87-EE25D0B8B2BF}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {648460F4-3ECC-4751-9D87-EE25D0B8B2BF}.Release|Any CPU.Build.0 = Release|Any CPU
+ {8A3E5E20-F162-4321-8AD5-23DD7B2B0E74}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {8A3E5E20-F162-4321-8AD5-23DD7B2B0E74}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {8A3E5E20-F162-4321-8AD5-23DD7B2B0E74}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {8A3E5E20-F162-4321-8AD5-23DD7B2B0E74}.Release|Any CPU.Build.0 = Release|Any CPU
+ {834C6A10-7562-427C-8771-B0588C35873D}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
+ {834C6A10-7562-427C-8771-B0588C35873D}.Debug|Any CPU.Build.0 = Debug|Any CPU
+ {834C6A10-7562-427C-8771-B0588C35873D}.Release|Any CPU.ActiveCfg = Release|Any CPU
+ {834C6A10-7562-427C-8771-B0588C35873D}.Release|Any CPU.Build.0 = Release|Any CPU
EndGlobalSection
GlobalSection(SolutionProperties) = preSolution
HideSolutionNode = FALSE
@@ -186,6 +216,11 @@ Global
{27B2DDC7-8B75-4322-A312-25419C15D9D8} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
{16F0BF4E-7D73-4278-8D9A-7CDE37105C6B} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
{C9F40C93-3DD0-4D6E-B98E-45A6F50FACDA} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+ {188A64AD-A1A7-4F95-85D1-C935594611B7} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+ {14882ABF-1EEF-430C-8E72-812B3EE810C4} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+ {648460F4-3ECC-4751-9D87-EE25D0B8B2BF} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+ {8A3E5E20-F162-4321-8AD5-23DD7B2B0E74} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
+ {834C6A10-7562-427C-8771-B0588C35873D} = {CA9AC87F-097E-4F15-8393-4BC07735A5B0}
EndGlobalSection
GlobalSection(ExtensibilityGlobals) = postSolution
SolutionGuid = {28315BFD-90E7-4E14-A2EA-F3D23AF4126F}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png
index 621596bb5c..9734a07a4d 100644
Binary files a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png and b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-dark-thumbnail.png differ
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-dark.png b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-dark.png
index e4bfe818c8..a3bbe82224 100644
Binary files a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-dark.png and b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-dark.png differ
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-light-thumbnail.png b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-light-thumbnail.png
index 886c960864..ca3918481a 100644
Binary files a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-light-thumbnail.png and b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-light-thumbnail.png differ
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-light.png b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-light.png
index 6ebd97e2b2..761fb4443d 100644
Binary files a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-light.png and b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/wwwroot/images/logo/leptonx/logo-light.png differ
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Menus/MyProjectNameMenuContributor.cs
similarity index 88%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Menus/MyProjectNameMenuContributor.cs
index de1bab4325..049bb0f679 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenuContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Menus/MyProjectNameMenuContributor.cs
@@ -1,7 +1,6 @@
using System;
using System.Threading.Tasks;
using Microsoft.Extensions.Configuration;
-using Microsoft.Extensions.DependencyInjection;
using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.MultiTenancy;
using Volo.Abp.Account.Localization;
@@ -10,9 +9,8 @@ using Volo.Abp.Identity.Blazor;
using Volo.Abp.SettingManagement.Blazor.Menus;
using Volo.Abp.TenantManagement.Blazor.Navigation;
using Volo.Abp.UI.Navigation;
-using Volo.Abp.Users;
-namespace MyCompanyName.MyProjectName.Blazor.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.Client.Menus;
public class MyProjectNameMenuContributor : IMenuContributor
{
@@ -48,7 +46,7 @@ public class MyProjectNameMenuContributor : IMenuContributor
icon: "fas fa-home"
)
);
-
+
var administration = context.Menu.GetAdministration();
if (MultiTenancyConsts.IsEnabled)
@@ -70,12 +68,10 @@ public class MyProjectNameMenuContributor : IMenuContributor
{
var accountStringLocalizer = context.GetLocalizer();
- var authServerUrl = _configuration["AuthServer:Authority"] ?? "";
-
context.Menu.AddItem(new ApplicationMenuItem(
"Account.Manage",
accountStringLocalizer["MyAccount"],
- $"{authServerUrl.EnsureEndsWith('/')}Account/Manage?returnUrl={_configuration["App:SelfUrl"]}",
+ $"Account/Manage",
icon: "fa fa-cog",
order: 1000,
null).RequireAuthenticated());
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenus.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Menus/MyProjectNameMenus.cs
similarity index 73%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenus.cs
rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Menus/MyProjectNameMenus.cs
index 89cf3424a9..3abb86d76a 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Menus/MyProjectNameMenus.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Menus/MyProjectNameMenus.cs
@@ -1,4 +1,4 @@
-namespace MyCompanyName.MyProjectName.Blazor.Menus;
+namespace MyCompanyName.MyProjectName.Blazor.Client.Menus;
public class MyProjectNameMenus
{
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj
new file mode 100644
index 0000000000..561d40337f
--- /dev/null
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyCompanyName.MyProjectName.Blazor.Client.csproj
@@ -0,0 +1,50 @@
+
+
+
+
+
+ net8.0
+ enable
+ true
+
+ service-worker-assets.js
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
+
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorAutoMapperProfile.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorAutoMapperProfile.cs
similarity index 80%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorAutoMapperProfile.cs
rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorAutoMapperProfile.cs
index 9ca9e14d04..9e5092bfe7 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorAutoMapperProfile.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorAutoMapperProfile.cs
@@ -1,6 +1,6 @@
using AutoMapper;
-namespace MyCompanyName.MyProjectName.Blazor;
+namespace MyCompanyName.MyProjectName.Blazor.Client;
public class MyProjectNameBlazorAutoMapperProfile : Profile
{
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorClientModule.cs
similarity index 85%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorClientModule.cs
index 5d955fd6c1..035c9ef835 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBlazorClientModule.cs
@@ -5,21 +5,19 @@ using Blazorise.Icons.FontAwesome;
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
-using MyCompanyName.MyProjectName.Blazor.Menus;
+using MyCompanyName.MyProjectName.Blazor.Client.Menus;
using OpenIddict.Abstractions;
-using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme;
-using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite;
using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
+using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme;
using Volo.Abp.Autofac.WebAssembly;
using Volo.Abp.AutoMapper;
-using Volo.Abp.Modularity;
-using Volo.Abp.UI.Navigation;
using Volo.Abp.Identity.Blazor.WebAssembly;
-using Volo.Abp.Security.Claims;
+using Volo.Abp.Modularity;
using Volo.Abp.SettingManagement.Blazor.WebAssembly;
using Volo.Abp.TenantManagement.Blazor.WebAssembly;
+using Volo.Abp.UI.Navigation;
-namespace MyCompanyName.MyProjectName.Blazor;
+namespace MyCompanyName.MyProjectName.Blazor.Client;
[DependsOn(
typeof(AbpAutofacWebAssemblyModule),
@@ -29,7 +27,7 @@ namespace MyCompanyName.MyProjectName.Blazor;
typeof(AbpTenantManagementBlazorWebAssemblyModule),
typeof(AbpSettingManagementBlazorWebAssemblyModule)
)]
-public class MyProjectNameBlazorModule : AbpModule
+public class MyProjectNameBlazorClientModule : AbpModule
{
public override void ConfigureServices(ServiceConfigurationContext context)
{
@@ -40,7 +38,6 @@ public class MyProjectNameBlazorModule : AbpModule
ConfigureHttpClient(context, environment);
ConfigureBlazorise(context);
ConfigureRouter(context);
- ConfigureUI(builder);
ConfigureMenu(context);
ConfigureAutoMapper(context);
}
@@ -49,7 +46,7 @@ public class MyProjectNameBlazorModule : AbpModule
{
Configure(options =>
{
- options.AppAssembly = typeof(MyProjectNameBlazorModule).Assembly;
+ options.AppAssembly = typeof(MyProjectNameBlazorClientModule).Assembly;
});
}
@@ -83,12 +80,6 @@ public class MyProjectNameBlazorModule : AbpModule
});
}
- private static void ConfigureUI(WebAssemblyHostBuilder builder)
- {
- builder.RootComponents.Add("#ApplicationContainer");
-
- }
-
private static void ConfigureHttpClient(ServiceConfigurationContext context, IWebAssemblyHostEnvironment environment)
{
context.Services.AddTransient(sp => new HttpClient
@@ -101,7 +92,7 @@ public class MyProjectNameBlazorModule : AbpModule
{
Configure(options =>
{
- options.AddMaps();
+ options.AddMaps();
});
}
}
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBrandingProvider.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBrandingProvider.cs
similarity index 81%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBrandingProvider.cs
rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBrandingProvider.cs
index cb2a796562..3773a9b7e1 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBrandingProvider.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBrandingProvider.cs
@@ -1,7 +1,7 @@
using Volo.Abp.DependencyInjection;
using Volo.Abp.Ui.Branding;
-namespace MyCompanyName.MyProjectName.Blazor;
+namespace MyCompanyName.MyProjectName.Blazor.Client;
[Dependency(ReplaceServices = true)]
public class MyProjectNameBrandingProvider : DefaultBrandingProvider
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributor.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBundleContributor.cs
similarity index 88%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributor.cs
rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBundleContributor.cs
index e1db0aa325..8ed6208237 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBundleContributor.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameBundleContributor.cs
@@ -1,6 +1,6 @@
using Volo.Abp.Bundling;
-namespace MyCompanyName.MyProjectName.Blazor;
+namespace MyCompanyName.MyProjectName.Blazor.Client;
/* Add your global styles/scripts here.
* See https://docs.abp.io/en/abp/latest/UI/Blazor/Global-Scripts-Styles to learn how to use it
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameComponentBase.cs b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameComponentBase.cs
similarity index 84%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameComponentBase.cs
rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameComponentBase.cs
index 918030409d..b17830aeb2 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameComponentBase.cs
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/MyProjectNameComponentBase.cs
@@ -1,7 +1,7 @@
using MyCompanyName.MyProjectName.Localization;
using Volo.Abp.AspNetCore.Components;
-namespace MyCompanyName.MyProjectName.Blazor;
+namespace MyCompanyName.MyProjectName.Blazor.Client;
public abstract class MyProjectNameComponentBase : AbpComponentBase
{
diff --git a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Pages/Index.razor
similarity index 99%
rename from templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
rename to templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Pages/Index.razor
index 3cd56e9cac..fe84321fb7 100644
--- a/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/Index.razor
+++ b/templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Client/Pages/Index.razor
@@ -1,7 +1,6 @@
@page "/"
@using Volo.Abp.MultiTenancy
@inherits MyProjectNameComponentBase
-@inject AuthenticationStateProvider AuthenticationStateProvider