Merge pull request #12938 from abpframework/EngincanV/leptonx-lite

Allow to use LeptonX lite as the UI theme

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/CliService.cs

@@ -49,10 +49,10 @@ public class CliService : ITransientDependency
         var commandLineArgs = CommandLineArgumentParser.Parse(args);
 
 #if !DEBUG
-            if (!commandLineArgs.Options.ContainsKey("skip-cli-version-check"))
-            {
-                await CheckCliVersionAsync();
-            }
+        if (!commandLineArgs.Options.ContainsKey("skip-cli-version-check"))
+        {
+            await CheckCliVersionAsync();
+        }
 #endif
         try
         {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/NewCommand.cs

@@ -33,8 +33,9 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien
         ICmdHelper cmdHelper,
         IInstallLibsService installLibsService,
         AngularPwaSupportAdder angularPwaSupportAdder,
-        InitialMigrationCreator ınitialMigrationCreator)
-    : base(connectionStringProvider, solutionPackageVersionFinder, cmdHelper, installLibsService, angularPwaSupportAdder, ınitialMigrationCreator)
+        InitialMigrationCreator initialMigrationCreator,
+        ThemePackageAdder themePackageAdder)
+    : base(connectionStringProvider, solutionPackageVersionFinder, cmdHelper, installLibsService, angularPwaSupportAdder, initialMigrationCreator, themePackageAdder)
     {
         TemplateProjectBuilder = templateProjectBuilder;
         TemplateInfoProvider = templateInfoProvider;
@@ -79,6 +80,7 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien
 
         Logger.LogInformation($"'{projectName}' has been successfully created to '{projectArgs.OutputFolder}'");
 
+        ConfigureNpmPackagesForTheme(projectArgs);
         RunGraphBuildForMicroserviceServiceTemplate(projectArgs);
         await CreateInitialMigrationsAsync(projectArgs);
         await RunInstallLibsForWebTemplateAsync(projectArgs);
@@ -109,6 +111,7 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien
         sb.AppendLine("-csf|--create-solution-folder               (default: true)");
         sb.AppendLine("-cs|--connection-string <connection-string> (your database connection string)");
         sb.AppendLine("--dbms <database-management-system>         (your database management system)");
+        sb.AppendLine("--theme <theme-name>                        (if supported by the template. default: leptonx-lite)");
         sb.AppendLine("--tiered                                    (if supported by the template)");
         sb.AppendLine("--no-ui                                     (if supported by the template)");
         sb.AppendLine("--no-random-port                            (Use template's default ports)");
@@ -132,6 +135,7 @@ public class NewCommand : ProjectCreationCommandBase, IConsoleCommand, ITransien
         sb.AppendLine("  abp new Acme.BookStore -csf false");
         sb.AppendLine("  abp new Acme.BookStore --local-framework-ref --abp-path \"D:\\github\\abp\"");
         sb.AppendLine("  abp new Acme.BookStore --dbms mysql");
+        sb.AppendLine("  abp new Acme.BookStore --theme basic");
         sb.AppendLine("  abp new Acme.BookStore --connection-string \"Server=myServerName\\myInstanceName;Database=myDatabase;User Id=myUsername;Password=myPassword\"");
         sb.AppendLine("");
         sb.AppendLine("See the documentation for more info: https://docs.abp.io/en/abp/latest/CLI");

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Commands/ProjectCreationCommandBase.cs

@@ -6,6 +6,7 @@ using ICSharpCode.SharpZipLib.Core;
 using ICSharpCode.SharpZipLib.Zip;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Logging.Abstractions;
+using NuGet.Versioning;
 using NUglify.Helpers;
 using Volo.Abp.Cli.ProjectModification;
 using Volo.Abp.Cli.Args;
@@ -30,13 +31,16 @@ public abstract class ProjectCreationCommandBase
     public InitialMigrationCreator InitialMigrationCreator { get; }
     public ILogger<NewCommand> Logger { get; set; }
 
+    public ThemePackageAdder ThemePackageAdder { get; }
+
     public ProjectCreationCommandBase(
         ConnectionStringProvider connectionStringProvider,
         SolutionPackageVersionFinder solutionPackageVersionFinder,
         ICmdHelper cmdHelper,
         IInstallLibsService installLibsService,
         AngularPwaSupportAdder angularPwaSupportAdder,
-        InitialMigrationCreator initialMigrationCreator)
+        InitialMigrationCreator initialMigrationCreator,
+        ThemePackageAdder themePackageAdder)
     {
         ConnectionStringProvider = connectionStringProvider;
         SolutionPackageVersionFinder = solutionPackageVersionFinder;
@@ -44,6 +48,7 @@ public abstract class ProjectCreationCommandBase
         InstallLibsService = installLibsService;
         AngularPwaSupportAdder = angularPwaSupportAdder;
         InitialMigrationCreator = initialMigrationCreator;
+        ThemePackageAdder = themePackageAdder;
 
         Logger = NullLogger<NewCommand>.Instance;
     }
@@ -93,6 +98,12 @@ public abstract class ProjectCreationCommandBase
             Logger.LogInformation("UI Framework: " + uiFramework);
         }
 
+        var theme = uiFramework == UiFramework.None ? (Theme?)null : GetTheme(commandLineArgs);
+        if (theme.HasValue)
+        {
+            Logger.LogInformation("Theme: " + theme);
+        }
+
         var publicWebSite = uiFramework != UiFramework.None && commandLineArgs.Options.ContainsKey(Options.PublicWebSite.Long);
         if (publicWebSite)
         {
@@ -134,7 +145,6 @@ public abstract class ProjectCreationCommandBase
         if (MicroserviceServiceTemplateBase.IsMicroserviceServiceTemplate(template))
         {
             var slnFile = Directory.GetFiles(outputFolderRoot, "*.sln").FirstOrDefault();
-
             if (slnFile == null)
             {
                 throw new CliUsageException("This command should be run inside a folder that contains a microservice solution!");
@@ -184,7 +194,8 @@ public abstract class ProjectCreationCommandBase
             templateSource,
             commandLineArgs.Options,
             connectionString,
-            pwa
+            pwa,
+            theme
         );
     }
 
@@ -460,6 +471,54 @@ public abstract class ProjectCreationCommandBase
         }
     }
 
+    protected virtual Theme GetTheme(CommandLineArgs commandLineArgs)
+    {
+        var optionValue = commandLineArgs.Options.GetOrNull(Options.Theme.Long);
+        switch (optionValue)
+        {
+            case null:
+            case "leptonx-lite":
+                return Theme.LeptonXLite;
+            case "basic":
+                return Theme.Basic;
+            default:
+                throw new CliUsageException("The option you provided for Theme is invalid!");
+        }
+    }
+
+    protected void ConfigureNpmPackagesForTheme(ProjectBuildArgs projectArgs)
+    {
+        if (!projectArgs.Theme.HasValue)
+        {
+            return;
+        }
+
+        switch (projectArgs.Theme)
+        {
+            case Theme.Basic:
+                ConfigureNpmPackagesForBasicTheme(projectArgs);
+                break;
+        }
+    }
+
+    private void ConfigureNpmPackagesForBasicTheme(ProjectBuildArgs projectArgs)
+    {
+        if (projectArgs.UiFramework is not UiFramework.None or UiFramework.Angular)
+        {
+            ThemePackageAdder.AddNpmPackage(projectArgs.OutputFolder, "@abp/aspnetcore.mvc.ui.theme.basic", projectArgs.Version);
+        }
+
+        if (projectArgs.UiFramework is UiFramework.BlazorServer)
+        {
+            ThemePackageAdder.AddNpmPackage(projectArgs.OutputFolder, "@abp/aspnetcore.components.server.basictheme", projectArgs.Version);
+        }
+
+        if (projectArgs.UiFramework is UiFramework.Angular)
+        {
+            ThemePackageAdder.AddAngularPackage(projectArgs.OutputFolder, "@abp/ng.theme.basic", projectArgs.Version);
+        }
+    }
+
     public static class Options
     {
         public static class Template
@@ -551,5 +610,10 @@ public abstract class ProjectCreationCommandBase
         {
             public const string Short = "pwa";
         }
+        
+        public static class Theme
+        {
+            public const string Long = "theme";
+        }
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/LIbs/InstallLibsService.cs

@@ -25,18 +25,17 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency
         Path.Combine("obj", "debug")
     };
 
-    public ICmdHelper CmdHelper { get; }
+    public NpmHelper NpmHelper { get; }
     public const string LibsDirectory = "./wwwroot/libs";
 
     public ILogger<InstallLibsService> Logger { get; set; }
 
     private readonly IJsonSerializer _jsonSerializer;
 
-    public InstallLibsService(IJsonSerializer jsonSerializer, ICmdHelper cmdHelper)
+    public InstallLibsService(IJsonSerializer jsonSerializer, NpmHelper npmHelper)
     {
-        CmdHelper = cmdHelper;
+        NpmHelper = npmHelper;
         _jsonSerializer = jsonSerializer;
-        Logger = NullLogger<InstallLibsService>.Instance;
     }
 
     public async Task InstallLibsAsync(string directory)
@@ -48,13 +47,13 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency
             return;
         }
 
-        if (!IsNpmInstalled())
+        if (!NpmHelper.IsNpmInstalled())
         {
             Logger.LogWarning("NPM is not installed, visit https://nodejs.org/en/download/ and install NPM");
             return;
         }
 
-        if (!IsYarnAvailable())
+        if (!NpmHelper.IsYarnAvailable())
         {
             Logger.LogWarning("YARN is not installed, which may cause package inconsistency, please use YARN instead of NPM. visit https://classic.yarnpkg.com/lang/en/docs/install/ and install YARN");
         }
@@ -72,26 +71,33 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency
             // angular
             if (projectPath.EndsWith("angular.json"))
             {
-                if (IsYarnAvailable())
+                if (NpmHelper.IsYarnAvailable())
                 {
-                    RunYarn(projectDirectory);
+                    NpmHelper.RunYarn(projectDirectory);
                 }
                 else
                 {
-                    RunNpmInstall(projectDirectory);
+                    NpmHelper.RunNpmInstall(projectDirectory);
                 }
             }
 
             // MVC or BLAZOR SERVER
             if (projectPath.EndsWith(".csproj"))
             {
-                if (IsYarnAvailable())
+                var packageJsonFilePath = Path.Combine(Path.GetDirectoryName(projectPath), "package.json");
+
+                if (!File.Exists(packageJsonFilePath))
+                {
+                    continue;
+                }
+
+                if (NpmHelper.IsYarnAvailable())
                 {
-                    RunYarn(projectDirectory);
+                    NpmHelper.RunYarn(projectDirectory);
                 }
                 else
                 {
-                    RunNpmInstall(projectDirectory);
+                    NpmHelper.RunNpmInstall(projectDirectory);
                 }
 
                 await CleanAndCopyResources(projectDirectory);
@@ -243,31 +249,4 @@ public class InstallLibsService : IInstallLibsService, ITransientDependency
 
         return pattern;
     }
-
-    private void RunNpmInstall(string directory)
-    {
-        Logger.LogInformation($"Running npm install on {directory}");
-        CmdHelper.RunCmd($"npm install", directory);
-    }
-
-    private void RunYarn(string directory)
-    {
-        Logger.LogInformation($"Running Yarn on {directory}");
-        CmdHelper.RunCmd($"yarn", directory);
-    }
-
-    private bool IsNpmInstalled()
-    {
-        var output = CmdHelper.RunCmdAndGetOutput("npm -v").Trim();
-        return SemanticVersion.TryParse(output, out _);
-    }
-
-    private bool IsYarnAvailable()
-    {
-        var output = CmdHelper.RunCmdAndGetOutput("yarn -v").Trim();
-        if (!SemanticVersion.TryParse(output, out var version)){
-            return false;
-        }
-        return version > SemanticVersion.Parse("1.20.0");
-    }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/ChangeThemeStep.cs

@@ -0,0 +1,623 @@
+using System.Collections.Generic;
+using System.Linq;
+
+namespace Volo.Abp.Cli.ProjectBuilding.Building.Steps;
+
+public class ChangeThemeStep : ProjectBuildPipelineStep
+{
+    public override void Execute(ProjectBuildContext context)
+    {
+        if (!context.BuildArgs.Theme.HasValue)
+        {
+            return;
+        }
+
+        switch (context.BuildArgs.Theme)
+        {
+            case Theme.Basic:
+                ChangeToBasicTheme(context);
+                break;
+        }
+    }
+
+    protected void ChangeToBasicTheme(ProjectBuildContext context)
+    {
+        #region MyCompanyName.MyProjectName.Web
+
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+            "AbpAspNetCoreMvcUiLeptonXLiteThemeModule",
+            "AbpAspNetCoreMvcUiBasicThemeModule"
+        );
+
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling",
+            "LeptonXLiteThemeBundles.Styles.Global",
+            "BasicThemeBundles.Styles.Global"
+        );
+
+        #endregion
+        
+        #region MyCompanyName.MyProjectName.HttpApi.Host
+
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyCompanyName.MyProjectName.HttpApi.Host.csproj",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+            "AbpAspNetCoreMvcUiLeptonXLiteThemeModule",
+            "AbpAspNetCoreMvcUiBasicThemeModule"
+        );
+
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.Host/MyProjectNameHttpApiHostModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling",
+            "LeptonXLiteThemeBundles.Styles.Global",
+            "BasicThemeBundles.Styles.Global"
+        );
+
+        #endregion
+        
+        #region MyCompanyName.MyProjectName.Blazor
+        
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj",
+            "Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj"
+            );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme",
+            "Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme",
+            "AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule",
+            "AbpAspNetCoreComponentsWebAssemblyBasicThemeModule"
+        );
+
+        ChangeNamespace(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite",
+            "Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic"
+        );
+        
+        #endregion
+
+        #region MyCompanyName.MyProjectName.Blazor.Server
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj"
+            );
+
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme",
+            "Volo.Abp.AspNetCore.Components.Server.BasicTheme",
+            "AbpAspNetCoreComponentsServerLeptonXLiteThemeModule",
+            "AbpAspNetCoreComponentsServerBasicThemeModule"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+            "AbpAspNetCoreMvcUiLeptonXLiteThemeModule",
+            "AbpAspNetCoreMvcUiBasicThemeModule"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling",
+            "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling",
+            "LeptonXLiteThemeBundles.Styles.Global",
+            "BasicThemeBundles.Styles.Global"
+            );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling",
+            "BlazorLeptonXLiteThemeBundles.Styles.Global",
+            "BlazorBasicThemeBundles.Styles.Global"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/_Host.cshtml",
+            "Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite",
+            "Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic",
+            "BlazorLeptonXLiteThemeBundles.Styles.Global",
+            "BlazorBasicThemeBundles.Styles.Global"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/Pages/_Host.cshtml",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling",
+            "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling",
+            "BlazorLeptonXLiteThemeBundles.Scripts.Global",
+            "BlazorBasicThemeBundles.Scripts.Global"
+        );
+        
+        #endregion
+        
+        #region MyCompanyName.MyProjectName.Blazor.Server.Tiered
+
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj"
+        );
+
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme",
+            "Volo.Abp.AspNetCore.Components.Server.BasicTheme",
+            "AbpAspNetCoreComponentsServerLeptonXLiteThemeModule",
+            "AbpAspNetCoreComponentsServerBasicThemeModule"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+            "AbpAspNetCoreMvcUiLeptonXLiteThemeModule",
+            "AbpAspNetCoreMvcUiBasicThemeModule"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling",
+            "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling",
+            "LeptonXLiteThemeBundles.Styles.Global",
+            "BasicThemeBundles.Styles.Global"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling",
+            "BlazorLeptonXLiteThemeBundles.Styles.Global",
+            "BlazorBasicThemeBundles.Styles.Global"
+        );
+        
+                
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/_Host.cshtml",
+            "Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite",
+            "Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic",
+            "BlazorLeptonXLiteThemeBundles.Styles.Global",
+            "BlazorBasicThemeBundles.Styles.Global"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/_Host.cshtml",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling",
+            "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling",
+            "BlazorLeptonXLiteThemeBundles.Scripts.Global",
+            "BlazorBasicThemeBundles.Scripts.Global"
+        );
+        
+        #endregion
+        
+        #region MyCompanyName.MyProjectName.AuthServer
+
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+            "AbpAspNetCoreMvcUiLeptonXLiteThemeModule",
+            "AbpAspNetCoreMvcUiBasicThemeModule"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling",
+            "LeptonXLiteThemeBundles.Styles.Global",
+            "BasicThemeBundles.Styles.Global"
+        );
+        
+        #endregion
+        
+        #region MyCompanyName.MyProjectName.Web.Mvc
+        
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc/MyCompanyName.MyProjectName.Web.Mvc.csproj",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj"
+            );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc/MyProjectNameWebModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+            "AbpAspNetCoreMvcUiLeptonXLiteThemeModule",
+            "AbpAspNetCoreMvcUiBasicThemeModule"
+        );
+
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc/MyProjectNameWebModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling",
+            "LeptonXLiteThemeBundles.Styles.Global",
+            "BasicThemeBundles.Styles.Global"
+        );
+        
+        #endregion
+        
+        #region MyCompanyName.MyProjectName.Web.Mvc.Mongo
+
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc.Mongo/MyCompanyName.MyProjectName.Web.Mvc.Mongo.csproj",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            @"..\..\..\..\..\modules\basic-theme\\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc.Mongo/MyProjectNameWebModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+            "AbpAspNetCoreMvcUiLeptonXLiteThemeModule",
+            "AbpAspNetCoreMvcUiBasicThemeModule"
+        );
+
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Mvc.Mongo/MyProjectNameWebModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling",
+            "LeptonXLiteThemeBundles.Styles.Global",
+            "BasicThemeBundles.Styles.Global"
+        );
+        
+        #endregion
+        
+        #region MyCompanyName.MyProjectName.Blazor.Server - (app-nolayers)
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme",
+            "Volo.Abp.AspNetCore.Components.Server.BasicTheme",
+            "AbpAspNetCoreComponentsServerLeptonXLiteThemeModule",
+            "AbpAspNetCoreComponentsServerBasicThemeModule"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+            "AbpAspNetCoreMvcUiLeptonXLiteThemeModule",
+            "AbpAspNetCoreMvcUiBasicThemeModule"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling",
+            "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling",
+            "LeptonXLiteThemeBundles.Styles.Global",
+            "BasicThemeBundles.Styles.Global"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling",
+            "BlazorLeptonXLiteThemeBundles.Styles.Global",
+            "BlazorBasicThemeBundles.Styles.Global"
+        );
+        
+        #endregion
+        
+        #region MyCompanyName.MyProjectName.Blazor.Server.Mongo
+
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj"
+        );
+        
+        ReplacePackageReferenceWithProjectReference(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            @"..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme",
+            "Volo.Abp.AspNetCore.Components.Server.BasicTheme",
+            "AbpAspNetCoreComponentsServerLeptonXLiteThemeModule",
+            "AbpAspNetCoreComponentsServerBasicThemeModule"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic",
+            "AbpAspNetCoreMvcUiLeptonXLiteThemeModule",
+            "AbpAspNetCoreMvcUiBasicThemeModule"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs",
+            "Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling",
+            "Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling",
+            "LeptonXLiteThemeBundles.Styles.Global",
+            "BasicThemeBundles.Styles.Global"
+        );
+        
+        ChangeNamespaceAndKeyword(
+            context,
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling",
+            "Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling",
+            "BlazorLeptonXLiteThemeBundles.Styles.Global",
+            "BlazorBasicThemeBundles.Styles.Global"
+        );
+        
+        #endregion
+
+        #region Angular
+
+        ReplaceImportPackage(
+            context, 
+            "/angular/src/app/app.module.ts",
+            "@abp/ng.theme.lepton-x", 
+            "@abp/ng.theme.basic"
+        );
+
+        RemoveLinesByStatement(
+            context,
+            "/angular/src/app/app.module.ts",
+        "SideMenuLayoutModule"
+        );
+
+        ReplaceMethodNames(
+            context,
+            "/angular/src/app/app.module.ts",
+            "ThemeLeptonXModule",
+            "ThemeBasicModule"
+        );
+
+        #endregion
+    }
+    
+    protected void ReplacePackageReferenceWithProjectReference(        
+        ProjectBuildContext context, 
+        string targetProjectFilePath,
+        string packageReference,
+        string projectReference)
+    {
+        var file = context.FindFile(targetProjectFilePath);
+        if (file == null)
+        {
+            return;
+        }
+      
+        file.NormalizeLineEndings();
+        
+        var lines = file.GetLines();
+        var lineIndex = lines.FindIndex(line => line.Contains("PackageReference") && line.Contains(packageReference));
+        if (lineIndex == -1)
+        {
+            return;
+        }
+        
+        lines[lineIndex] = lines[lineIndex].Replace(lines[lineIndex], $"\t<ProjectReference Include=\"{projectReference}\" />");
+        file.SetLines(lines);
+    }
+
+    protected void ChangeNamespaceAndKeyword(
+        ProjectBuildContext context,
+        string targetModuleFilePath,
+        string oldNamespace,
+        string newNamespace,
+        string oldKeyword,
+        string newKeyword)
+    {
+        var file = context.FindFile(targetModuleFilePath);
+
+        if (file == null)
+        {
+            return;
+        }
+
+        file.NormalizeLineEndings();
+
+        var lines = file.GetLines();
+
+        for (var i = 0; i < lines.Length; i++)
+        {
+            if (lines[i].Contains($"using {oldNamespace}"))
+            {
+                lines[i] = $"using {newNamespace};";
+            }
+            else if (lines[i].Contains(oldKeyword))
+            {
+                lines[i] = lines[i].Replace(oldKeyword, newKeyword);
+            }
+        }
+
+        file.SetLines(lines);
+    }
+
+    protected void ChangeNamespace(
+        ProjectBuildContext context,
+        string targetModuleFilePath,
+        string oldNamespace,
+        string newNamespace)
+    {
+        var file = context.FindFile(targetModuleFilePath);
+
+        if (file == null)
+        {
+            return;
+        }
+
+        file.NormalizeLineEndings();
+
+        var lines = file.GetLines();
+        for (var i = 0; i < lines.Length; i++)
+        {
+            if (lines[i].Contains($"using {oldNamespace};"))
+            {
+                lines[i] = $"using {newNamespace};";
+            }
+        }
+
+        file.SetLines(lines);
+    }
+
+    protected void ReplaceImportPackage(
+        ProjectBuildContext context,
+        string filePath,
+        string oldImportPackage,
+        string newImportPackage)
+    {
+        var file = context.FindFile(filePath);
+
+        if (file == null)
+        {
+            return;
+        }
+
+        file.NormalizeLineEndings();
+        var lines = file.GetLines();
+        var lineIndex = lines.FindIndex(line => line.Contains($"from '{oldImportPackage}'"));
+        if (lineIndex == -1)
+        {
+            return;
+        }
+        
+        lines[lineIndex] = lines[lineIndex].Replace(oldImportPackage, newImportPackage);
+        file.SetLines(lines);
+    }
+
+    protected void RemoveLinesByStatement(
+        ProjectBuildContext context,        
+        string filePath,
+        string statement)
+    {
+        var file = context.FindFile(filePath);
+
+        if (file == null)
+        {
+            return;
+        }
+
+        file.NormalizeLineEndings();
+        
+        var lines = file.GetLines();
+        for (var i = 0; i < lines.Length; i++)
+        {
+            if (lines[i].Contains(statement))
+            {
+                lines[i] = null;
+            }
+        }
+
+        file.SetLines(lines.Where(x => x != null));
+    }
+
+    protected void ReplaceMethodNames(
+        ProjectBuildContext context,        
+        string filePath,
+        string oldMethodName,
+        string newMethodName)
+    {
+        var file = context.FindFile(filePath);
+
+        if (file == null)
+        {
+            return;
+        }
+
+        file.NormalizeLineEndings();
+        
+        var lines = file.GetLines();
+        for (var i = 0; i < lines.Length; i++)
+        {
+            if (lines[i].Contains(oldMethodName))
+            {
+                lines[i] = lines[i].Replace(oldMethodName, newMethodName);
+            }
+        }
+        
+        file.SetLines(lines);
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Steps/TemplateCodeDeleteStep.cs

@@ -15,7 +15,9 @@ public class TemplateCodeDeleteStep : ProjectBuildPipelineStep
                 file.Name.EndsWith(".gitignore") ||
                 file.Name.EndsWith(".yml") ||
                 file.Name.EndsWith(".ps1") ||
-                file.Name.EndsWith(".html"))
+                file.Name.EndsWith(".html") || 
+                file.Name.EndsWith(".ts") ||
+                file.Name.EndsWith(".scss"))
             {
                 file.RemoveTemplateCode(context.Symbols);
                 file.RemoveTemplateCodeMarkers();

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Building/Theme.cs

@@ -0,0 +1,7 @@
+namespace Volo.Abp.Cli.ProjectBuilding.Building;
+
+public enum Theme
+{
+    LeptonXLite = 0,
+    Basic = 1    
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Files/FileEntryExtensions.cs

@@ -120,7 +120,7 @@ public static class FileEntryExtensions
                     }
                 }
 
-                if (lines[i+1].Contains("<TEMPLATE-REMOVE"))
+                if ((i + 1 < lines.Length) && (lines[i + 1].Contains("<TEMPLATE-REMOVE")))
                 {
                     continue;
                 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/ProjectBuildArgs.cs

@@ -42,6 +42,8 @@ public class ProjectBuildArgs
 
     public bool Pwa { get; set; }
 
+    public Theme? Theme { get; set; }
+
     [NotNull]
     public Dictionary<string, string> ExtraProperties { get; set; }
 
@@ -60,7 +62,8 @@ public class ProjectBuildArgs
         [CanBeNull] string templateSource = null,
         Dictionary<string, string> extraProperties = null,
         [CanBeNull] string connectionString = null,
-        bool pwa = false)
+        bool pwa = false,
+        Theme? theme = null)
     {
         SolutionName = Check.NotNull(solutionName, nameof(solutionName));
         TemplateName = templateName;
@@ -77,5 +80,6 @@ public class ProjectBuildArgs
         ExtraProperties = extraProperties ?? new Dictionary<string, string>();
         ConnectionString = connectionString;
         Pwa = pwa;
+        Theme = theme;
     }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppNoLayersTemplateBase.cs

@@ -87,6 +87,7 @@ public abstract class AppNoLayersTemplateBase : AppTemplateBase
         UpdateNuGetConfig(context, steps);
         ChangeConnectionString(context, steps);
         ConfigureDockerFiles(context, steps);
+        ConfigureTheme(context, steps);
 
         if (context.BuildArgs.UiFramework != UiFramework.Angular)
         {

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectBuilding/Templates/App/AppTemplateBase.cs

@@ -33,6 +33,7 @@ public abstract class AppTemplateBase : TemplateInfo
         RemoveMigrations(context, steps);
         ConfigureTieredArchitecture(context, steps);
         ConfigurePublicWebSite(context, steps);
+        ConfigureTheme(context, steps);
         RemoveUnnecessaryPorts(context, steps);
         RandomizeSslPorts(context, steps);
         RandomizeStringEncryption(context, steps);
@@ -176,6 +177,65 @@ public abstract class AppTemplateBase : TemplateInfo
         }
     }
 
+    protected void ConfigureTheme(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
+    {
+        if (!context.BuildArgs.Theme.HasValue)
+        {
+            return;
+        }
+        
+        if (context.BuildArgs.Theme != Theme.LeptonXLite)
+        {
+            steps.Add(new ChangeThemeStep());
+            RemoveLeptonXThemePackagesFromPackageJsonFiles(steps);
+        }
+    }
+
+    private void RemoveLeptonXThemePackagesFromPackageJsonFiles(List<ProjectBuildPipelineStep> steps)
+    {
+        var packageJsonFilePaths = new List<string>() 
+        {
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json",
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json",
+            "/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json",
+            "/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json",
+            "/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json",
+            "/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json",
+            "/aspnet-core/MyCompanyName.MyProjectName.Host/package.json",
+            "/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json",
+        };
+
+        var blazorServerPackageJsonFilePaths = new List<string>() 
+        {
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json",
+            "/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json",
+            "/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json",
+            "/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json"
+        };
+
+        var angularPackageJsonFilePaths = new List<string>() 
+        {
+            "/angular/package.json"
+        };
+
+        foreach (var packageJsonFilePath in packageJsonFilePaths)
+        {
+            steps.Add(new RemoveDependencyFromPackageJsonFileStep(packageJsonFilePath, "@abp/aspnetcore.mvc.ui.theme.leptonxlite"));
+        }
+
+        foreach (var blazorServerPackageJsonFilePath in blazorServerPackageJsonFilePaths)
+        {
+            steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, "@abp/aspnetcore.mvc.ui.theme.leptonxlite"));
+            steps.Add(new RemoveDependencyFromPackageJsonFileStep(blazorServerPackageJsonFilePath, "@abp/aspnetcore.components.server.leptonxlitetheme"));
+        }
+
+        foreach (var angularPackageJsonFilePath in angularPackageJsonFilePaths)
+        {
+            steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, "@abp/ng.theme.lepton-x"));
+            steps.Add(new RemoveDependencyFromPackageJsonFileStep(angularPackageJsonFilePath, "bootstrap-icons"));
+        }
+    }
+
     protected void ConfigurePublicWebSite(ProjectBuildContext context, List<ProjectBuildPipelineStep> steps)
     {
         if (!context.BuildArgs.PublicWebSite)

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/NpmGlobalPackagesChecker.cs

@@ -7,34 +7,22 @@ namespace Volo.Abp.Cli.ProjectModification;
 
 public class NpmGlobalPackagesChecker : ITransientDependency
 {
-    public ICmdHelper CmdHelper { get; }
+    public NpmHelper NpmHelper { get; }
     public ILogger<NpmGlobalPackagesChecker> Logger { get; set; }
 
-    public NpmGlobalPackagesChecker(ICmdHelper cmdHelper)
+    public NpmGlobalPackagesChecker(NpmHelper npmHelper)
     {
-        CmdHelper = cmdHelper;
+        NpmHelper = npmHelper;
         Logger = NullLogger<NpmGlobalPackagesChecker>.Instance;
     }
 
     public void Check()
     {
-        var installedNpmPackages = GetInstalledNpmPackages();
+        var installedNpmPackages = NpmHelper.GetInstalledNpmPackages();
 
         if (!installedNpmPackages.Contains(" yarn@"))
         {
-            InstallYarn();
+            NpmHelper.InstallYarn();
         }
     }
-
-    protected virtual string GetInstalledNpmPackages()
-    {
-        Logger.LogInformation("Checking installed npm global packages...");
-        return CmdHelper.RunCmdAndGetOutput("npm list -g --depth 0 --silent", out int exitCode);
-    }
-
-    protected virtual void InstallYarn()
-    {
-        Logger.LogInformation("Installing yarn...");
-        CmdHelper.RunCmd("npm install yarn -g");
-    }
 }

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/ProjectModification/ThemePackageAdder.cs

@@ -0,0 +1,61 @@
+using System;
+using System.Collections.Generic;
+using System.IO;
+using System.Linq;
+using NuGet.Versioning;
+using Volo.Abp.Cli.Utils;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.ProjectModification;
+
+public class ThemePackageAdder : ITransientDependency
+{
+    protected NpmHelper NpmHelper { get; }
+    protected PackageJsonFileFinder PackageJsonFileFinder { get; }
+
+    public ThemePackageAdder(NpmHelper npmHelper, PackageJsonFileFinder packageJsonFileFinder)
+    {
+        NpmHelper = npmHelper;
+        PackageJsonFileFinder = packageJsonFileFinder;
+    }
+
+    public void AddNpmPackage(string rootDirectory, string package, string version)
+    {
+        var packageJsonFilePaths = PackageJsonFileFinder.Find(rootDirectory)
+            .Where(x => !File.Exists(x.RemovePostFix("package.json") + "angular.json"))
+            .ToList();
+
+        AddPackage(packageJsonFilePaths, package, version);
+    }
+
+    public void AddAngularPackage(string rootDirectory, string package, string version)
+    {
+        var angularPackageJsonFilePaths = PackageJsonFileFinder.Find(rootDirectory)
+            .Where(x => File.Exists(x.RemovePostFix("package.json") + "angular.json"))
+            .ToList();
+
+        AddPackage(angularPackageJsonFilePaths, package, version);
+    }
+
+    private void AddPackage(List<string> packageJsonFilePaths, string package, string version)
+    {
+        if (!packageJsonFilePaths.Any() || string.IsNullOrWhiteSpace(package))
+        {
+            return;
+        }
+
+        var yarnAvailable = NpmHelper.IsYarnAvailable();
+        foreach (var packageJsonFilePath in packageJsonFilePaths)
+        {
+            var directory = Path.GetDirectoryName(packageJsonFilePath).EnsureEndsWith(Path.DirectorySeparatorChar);
+            if (yarnAvailable)
+            {
+                NpmHelper.YarnAddPackage(package, version, directory);
+            }
+            else
+            {
+                NpmHelper.NpmInstallPackage(package, version, directory);
+            }
+        }
+    }
+}

framework/src/Volo.Abp.Cli.Core/Volo/Abp/Cli/Utils/NpmHelper.cs

@@ -0,0 +1,69 @@
+using Microsoft.Extensions.Logging;
+using Microsoft.Extensions.Logging.Abstractions;
+using NuGet.Versioning;
+using Volo.Abp.DependencyInjection;
+
+namespace Volo.Abp.Cli.Utils;
+
+public class NpmHelper : ITransientDependency
+{
+    protected ICmdHelper CmdHelper { get; }
+    public ILogger<NpmHelper> Logger { get; set; }
+
+    public NpmHelper(ICmdHelper cmdHelper)
+    {
+        CmdHelper = cmdHelper;
+        Logger = NullLogger<NpmHelper>.Instance;
+    }
+
+    public bool IsNpmInstalled()
+    {
+        var output = CmdHelper.RunCmdAndGetOutput("npm -v").Trim();
+        return SemanticVersion.TryParse(output, out _);
+    }
+
+    public bool IsYarnAvailable()
+    {
+        var output = CmdHelper.RunCmdAndGetOutput("yarn -v").Trim();
+        if (!SemanticVersion.TryParse(output, out var version)){
+            return false;
+        }
+        return version > SemanticVersion.Parse("1.20.0");
+    }
+
+    public void RunNpmInstall(string directory)
+    {
+        Logger.LogInformation($"Running npm install on {directory}");
+        CmdHelper.RunCmd($"npm install", directory);
+    }
+
+    public void RunYarn(string directory)
+    {
+        Logger.LogInformation($"Running Yarn on {directory}");
+        CmdHelper.RunCmd($"yarn", directory);
+    }
+
+    public void NpmInstallPackage(string package, string version, string directory)
+    {
+        var packageVersion = !string.IsNullOrWhiteSpace(version) ? $"@{version}" : string.Empty;
+        CmdHelper.RunCmd("npm install " + package + packageVersion, workingDirectory: directory);
+    }
+
+    public void YarnAddPackage(string package, string version, string directory)
+    {
+        var packageVersion = !string.IsNullOrWhiteSpace(version) ? $"@{version}" : string.Empty;
+        CmdHelper.RunCmd("yarn add " + package + packageVersion, workingDirectory: directory);
+    }
+
+    public string GetInstalledNpmPackages()
+    {
+        Logger.LogInformation("Checking installed npm global packages...");
+        return CmdHelper.RunCmdAndGetOutput("npm list -g --depth 0 --silent", out int exitCode);
+    }
+
+    public void InstallYarn()
+    {
+        Logger.LogInformation("Installing yarn...");
+        CmdHelper.RunCmd("npm install yarn -g");
+    }
+}

framework/src/Volo.Abp.Cli/Volo/Abp/Cli/Program.cs

@@ -20,11 +20,11 @@ public class Program
             .MinimumLevel.Override("System.Net.Http.HttpClient", LogEventLevel.Warning)
             .MinimumLevel.Override("Volo.Abp.IdentityModel", LogEventLevel.Information)
 #if DEBUG
-                .MinimumLevel.Override("Volo.Abp.Cli", LogEventLevel.Debug)
+            .MinimumLevel.Override("Volo.Abp.Cli", LogEventLevel.Debug)
 #else
-                .MinimumLevel.Override("Volo.Abp.Cli", LogEventLevel.Information)
+            .MinimumLevel.Override("Volo.Abp.Cli", LogEventLevel.Information)
 #endif
-                .Enrich.FromLogContext()
+            .Enrich.FromLogContext()
             .WriteTo.File(Path.Combine(CliPaths.Log, "abp-cli-logs.txt"))
             .WriteTo.Console()
             .CreateLogger();

templates/app-nolayers/angular/angular.json

@@ -65,6 +65,7 @@
                 "inject": true,
                 "bundleName": "bootstrap-ltr.min"
               },
+              "node_modules/bootstrap-icons/font/bootstrap-icons.css",
               "src/styles.scss"
             ],
             "scripts": []

templates/app-nolayers/angular/package.json

@@ -18,8 +18,8 @@
     "@abp/ng.identity": "~5.3.0",
     "@abp/ng.setting-management": "~5.3.0",
     "@abp/ng.tenant-management": "~5.3.0",
-    "@abp/ng.theme.basic": "~5.3.0",
     "@abp/ng.theme.shared": "~5.3.0",
+    "@abp/ng.theme.lepton-x": "~1.0.0-beta.2",
     "@angular/animations": "~13.1.1",
     "@angular/common": "~13.1.1",
     "@angular/compiler": "~13.1.1",
@@ -31,6 +31,7 @@
     "@angular/router": "~13.1.1",
     "rxjs": "~6.6.0",
     "tslib": "^2.1.0",
+    "bootstrap-icons": "~1.8.3",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {

templates/app-nolayers/angular/src/app/app.module.ts

@@ -4,7 +4,8 @@ import { registerLocale } from '@abp/ng.core/locale';
 import { IdentityConfigModule } from '@abp/ng.identity/config';
 import { SettingManagementConfigModule } from '@abp/ng.setting-management/config';
 import { TenantManagementConfigModule } from '@abp/ng.tenant-management/config';
-import { ThemeBasicModule } from '@abp/ng.theme.basic';
+import { ThemeLeptonXModule } from '@abp/ng.theme.lepton-x';
+import { SideMenuLayoutModule } from '@abp/ng.theme.lepton-x/layouts';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
@@ -28,7 +29,8 @@ import { APP_ROUTE_PROVIDER } from './route.provider';
     IdentityConfigModule.forRoot(),
     TenantManagementConfigModule.forRoot(),
     SettingManagementConfigModule.forRoot(),
-    ThemeBasicModule.forRoot(),
+    ThemeLeptonXModule.forRoot(),
+    SideMenuLayoutModule.forRoot(),
   ],
   declarations: [AppComponent],
   providers: [APP_ROUTE_PROVIDER],

templates/app-nolayers/angular/src/app/home/home-routing.module.ts

@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { HomeComponent } from './home.component';
-import { ApplicationLayoutComponent } from '@abp/ng.theme.basic';
 
 const routes: Routes = [{ path: '', component: HomeComponent }];
 

templates/app-nolayers/angular/src/styles.scss

@@ -24,3 +24,9 @@
     transform: translate(-50%, -50%);
   }
 }
+
+:root {
+  --lpx-logo: url('/assets/images/logo.png');
+  --lpx-logo-icon: url('/assets/images/logo-icon.png');
+  --lpx-brand: #edae53;
+} 

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj

@@ -12,6 +12,11 @@
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
@@ -68,11 +73,6 @@
     <ProjectReference Include="..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.MongoDB\Volo.Abp.AuditLogging.MongoDB.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
   </ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs

@@ -8,14 +8,14 @@ using MyCompanyName.MyProjectName.Menus;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
+using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.MongoDB;
 using Volo.Abp.Autofac;
@@ -59,8 +59,8 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAutoMapperModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
+    typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
 
     // Account module packages
     typeof(AbpAccountApplicationModule),
@@ -166,7 +166,7 @@ public class MyProjectNameModule : AbpModule
         {
             // MVC UI
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");
@@ -175,7 +175,7 @@ public class MyProjectNameModule : AbpModule
 
             //BLAZOR UI
             options.StyleBundles.Configure(
-                BlazorBasicThemeBundles.Styles.Global,
+                BlazorLeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/blazor-global-styles.css");

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Pages/_Host.cshtml

@@ -1,8 +1,8 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Pages
 @using System.Globalization
-@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
+@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
+@using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
 @using Volo.Abp.Localization
 @{
     Layout = null;
@@ -17,9 +17,10 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
 
-    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" />
+    <abp-style-bundle name="@BlazorLeptonXLiteThemeBundles.Styles.Global"/>
 </head>
 <body class="abp-application-layout bg-light @rtl">
+
     <component type="typeof(App)" render-mode="Server" />
 
     <div id="blazor-error-ui">
@@ -33,6 +34,6 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    <abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
+    <abp-script-bundle name="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
 </body>
 </html>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/package.json

@@ -3,7 +3,7 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0",
-    "@abp/aspnetcore.components.server.basictheme": "^5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0",
+    "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0"
   }
 }

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj

@@ -12,6 +12,11 @@
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
@@ -69,11 +74,6 @@
     <ProjectReference Include="..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.EntityFrameworkCore\Volo.Abp.AuditLogging.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
   </ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs

@@ -8,14 +8,14 @@ using MyCompanyName.MyProjectName.Menus;
 using Volo.Abp;
 using Volo.Abp.Account;
 using Volo.Abp.Account.Web;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
+using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
 using Volo.Abp.Autofac;
@@ -60,9 +60,9 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpEntityFrameworkCoreSqlServerModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-    typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
-
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
+    typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
+    
     // Account module packages
     typeof(AbpAccountApplicationModule),
     typeof(AbpAccountHttpApiModule),
@@ -167,7 +167,7 @@ public class MyProjectNameModule : AbpModule
         {
             // MVC UI
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");
@@ -176,7 +176,7 @@ public class MyProjectNameModule : AbpModule
 
             //BLAZOR UI
             options.StyleBundles.Configure(
-                BlazorBasicThemeBundles.Styles.Global,
+                BlazorLeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/blazor-global-styles.css");

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml

@@ -1,8 +1,8 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Pages
 @using System.Globalization
-@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
+@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
+@using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
 @using Volo.Abp.Localization
 @{
     Layout = null;
@@ -17,9 +17,10 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
 
-    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" />
+    <abp-style-bundle name="@BlazorLeptonXLiteThemeBundles.Styles.Global"/>
 </head>
 <body class="abp-application-layout bg-light @rtl">
+
     <component type="typeof(App)" render-mode="Server" />
 
     <div id="blazor-error-ui">
@@ -33,6 +34,6 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    <abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
+    <abp-script-bundle name="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
 </body>
 </html>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/package.json

@@ -3,7 +3,7 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0",
-    "@abp/aspnetcore.components.server.basictheme": "^5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0",
+    "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0"
   }
 }

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyCompanyName.MyProjectName.Host.Mongo.csproj

@@ -64,7 +64,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/MyProjectNameModule.cs

@@ -11,8 +11,8 @@ using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.MongoDB;
@@ -51,7 +51,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAspNetCoreMultiTenancyModule),
     typeof(AbpAutofacModule),
     typeof(AbpAutoMapperModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
 
@@ -144,7 +144,7 @@ public class MyProjectNameModule : AbpModule
         Configure<AbpBundlingOptions>(options =>
         {
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle => { bundle.AddFiles("/global-styles.css"); }
             );
         });

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host.Mongo/package.json

@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0"
   }
 }

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyCompanyName.MyProjectName.Host.csproj

@@ -65,7 +65,7 @@
   </ItemGroup>
 
   <ItemGroup>
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
   </ItemGroup>
 
   <ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/MyProjectNameModule.cs

@@ -11,8 +11,8 @@ using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
@@ -53,7 +53,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAutofacModule),
     typeof(AbpAutoMapperModule),
     typeof(AbpEntityFrameworkCoreSqlServerModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
 
@@ -146,7 +146,7 @@ public class MyProjectNameModule : AbpModule
         Configure<AbpBundlingOptions>(options =>
         {
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle => { bundle.AddFiles("/global-styles.css"); }
             );
         });

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Host/package.json

@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0"
   }
 }

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyCompanyName.MyProjectName.Mvc.Mongo.csproj

@@ -10,6 +10,10 @@
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
@@ -66,10 +70,6 @@
     <ProjectReference Include="..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.MongoDB\Volo.Abp.AuditLogging.MongoDB.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
   </ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/MyProjectNameModule.cs

@@ -9,8 +9,8 @@ using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.MongoDB;
@@ -55,8 +55,8 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAutoMapperModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
-
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
+    
     // Account module packages
     typeof(AbpAccountApplicationModule),
     typeof(AbpAccountHttpApiModule),
@@ -165,7 +165,7 @@ public class MyProjectNameModule : AbpModule
         Configure<AbpBundlingOptions>(options =>
         {
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc.Mongo/package.json

@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0"
   }
 }

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyCompanyName.MyProjectName.Mvc.csproj

@@ -10,6 +10,10 @@
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc\Volo.Abp.AspNetCore.Mvc.csproj" />
@@ -67,10 +71,6 @@
     <ProjectReference Include="..\..\..\..\modules\audit-logging\src\Volo.Abp.AuditLogging.EntityFrameworkCore\Volo.Abp.AuditLogging.EntityFrameworkCore.csproj" />
   </ItemGroup>
 
-  <ItemGroup>
-    <ProjectReference Include="..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
-  </ItemGroup>
-
   <ItemGroup>
     <PackageReference Include="Microsoft.Extensions.FileProviders.Embedded" Version="6.0.5" />
   </ItemGroup>

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/MyProjectNameModule.cs

@@ -9,8 +9,8 @@ using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.AuditLogging.EntityFrameworkCore;
@@ -56,7 +56,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpEntityFrameworkCoreSqlServerModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
 
     // Account module packages
     typeof(AbpAccountApplicationModule),
@@ -167,7 +167,7 @@ public class MyProjectNameModule : AbpModule
         Configure<AbpBundlingOptions>(options =>
         {
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");

templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Mvc/package.json

@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "~5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "~1.0.0"
   }
 }

templates/app/angular/angular.json

@@ -65,6 +65,7 @@
                 "inject": true,
                 "bundleName": "bootstrap-ltr.min"
               },
+              "node_modules/bootstrap-icons/font/bootstrap-icons.css",
               "src/styles.scss"
             ],
             "scripts": []

templates/app/angular/package.json

@@ -18,8 +18,8 @@
     "@abp/ng.identity": "~5.3.0",
     "@abp/ng.setting-management": "~5.3.0",
     "@abp/ng.tenant-management": "~5.3.0",
-    "@abp/ng.theme.basic": "~5.3.0",
     "@abp/ng.theme.shared": "~5.3.0",
+    "@abp/ng.theme.lepton-x": "~1.0.0-beta.2",
     "@angular/animations": "~13.3.3",
     "@angular/common": "~13.3.3",
     "@angular/compiler": "~13.3.3",
@@ -31,6 +31,7 @@
     "@angular/router": "~13.3.3",
     "rxjs": "~6.6.0",
     "tslib": "^2.1.0",
+    "bootstrap-icons": "~1.8.3",
     "zone.js": "~0.11.4"
   },
   "devDependencies": {

templates/app/angular/src/app/app.module.ts

@@ -4,7 +4,8 @@ import { registerLocale } from '@abp/ng.core/locale';
 import { IdentityConfigModule } from '@abp/ng.identity/config';
 import { SettingManagementConfigModule } from '@abp/ng.setting-management/config';
 import { TenantManagementConfigModule } from '@abp/ng.tenant-management/config';
-import { ThemeBasicModule } from '@abp/ng.theme.basic';
+import { ThemeLeptonXModule } from '@abp/ng.theme.lepton-x';
+import { SideMenuLayoutModule } from '@abp/ng.theme.lepton-x/layouts';
 import { ThemeSharedModule } from '@abp/ng.theme.shared';
 import { NgModule } from '@angular/core';
 import { BrowserModule } from '@angular/platform-browser';
@@ -28,7 +29,8 @@ import { APP_ROUTE_PROVIDER } from './route.provider';
     IdentityConfigModule.forRoot(),
     TenantManagementConfigModule.forRoot(),
     SettingManagementConfigModule.forRoot(),
-    ThemeBasicModule.forRoot(),
+    ThemeLeptonXModule.forRoot(),
+    SideMenuLayoutModule.forRoot(),
   ],
   declarations: [AppComponent],
   providers: [APP_ROUTE_PROVIDER],

templates/app/angular/src/app/home/home-routing.module.ts

@@ -1,7 +1,6 @@
 import { NgModule } from '@angular/core';
 import { Routes, RouterModule } from '@angular/router';
 import { HomeComponent } from './home.component';
-import { ApplicationLayoutComponent } from '@abp/ng.theme.basic';
 
 const routes: Routes = [{ path: '', component: HomeComponent }];
 

templates/app/angular/src/styles.scss

@@ -24,3 +24,9 @@
     transform: translate(-50%, -50%);
   }
 }
+    
+:root {
+  --lpx-logo: url('/assets/images/logo.png');
+  --lpx-logo-icon: url('/assets/images/logo-icon.png');
+  --lpx-brand: #edae53;
+} 

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyCompanyName.MyProjectName.AuthServer.csproj

@@ -35,11 +35,14 @@
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Caching.StackExchangeRedis\Volo.Abp.Caching.StackExchangeRedis.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Web.OpenIddict\Volo.Abp.Account.Web.OpenIddict.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Application\Volo.Abp.Account.Application.csproj" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/MyProjectNameAuthServerModule.cs

@@ -17,8 +17,8 @@ using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Auditing;
@@ -40,7 +40,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAccountWebOpenIddictModule),
     typeof(AbpAccountApplicationModule),
     typeof(AbpAccountHttpApiModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(MyProjectNameEntityFrameworkCoreModule),
     typeof(AbpAspNetCoreSerilogModule)
     )]
@@ -97,7 +97,7 @@ public class MyProjectNameAuthServerModule : AbpModule
         Configure<AbpBundlingOptions>(options =>
         {
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");
@@ -120,7 +120,6 @@ public class MyProjectNameAuthServerModule : AbpModule
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBasicThemeModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAccountWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAccountWebOpenIddictModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}account{0}src{0}Volo.Abp.Account.Web.OpenIddict", Path.DirectorySeparatorChar)));
                 //</TEMPLATE-REMOVE>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.AuthServer/package.json

@@ -3,6 +3,6 @@
   "name": "my-app-authserver",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0"
   }
 }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyCompanyName.MyProjectName.Blazor.Server.Tiered.csproj

@@ -19,6 +19,11 @@
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="1.0.0-beta.2" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi.Client\MyCompanyName.MyProjectName.HttpApi.Client.csproj" />
@@ -26,11 +31,9 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.Client\Volo.Abp.AspNetCore.Mvc.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.OpenIdConnect\Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.IdentityModel.Web\Volo.Abp.Http.Client.IdentityModel.Web.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.Server\Volo.Abp.Identity.Blazor.Server.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.Server\Volo.Abp.TenantManagement.Blazor.Server.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\setting-management\src\Volo.Abp.SettingManagement.Blazor.Server\Volo.Abp.SettingManagement.Blazor.Server.csproj" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/MyProjectNameBlazorModule.cs

@@ -1,4 +1,4 @@
-using System;
+using System;
 using System.IO;
 using System.Net.Http;
 using Blazorise.Bootstrap5;
@@ -17,8 +17,10 @@ using MyCompanyName.MyProjectName.MultiTenancy;
 using StackExchange.Redis;
 using Volo.Abp;
 using Volo.Abp.AspNetCore.Authentication.OpenIdConnect;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
+using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
+using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Mvc.Client;
 using Volo.Abp.AspNetCore.Mvc.Localization;
@@ -26,8 +28,6 @@ using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
 using Volo.Abp.AspNetCore.Serilog;
@@ -56,11 +56,11 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered;
     typeof(AbpAspNetCoreMvcClientModule),
     typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule),
     typeof(AbpHttpClientIdentityModelWebModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
+    typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(AbpAutofacModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
-    typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
     typeof(AbpIdentityBlazorServerModule),
     typeof(AbpTenantManagementBlazorServerModule),
     typeof(AbpSettingManagementBlazorServerModule)
@@ -120,23 +120,23 @@ public class MyProjectNameBlazorModule : AbpModule
     {
         Configure<AbpBundlingOptions>(options =>
         {
-                // MVC UI
-                options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+            // MVC UI
+            options.StyleBundles.Configure(
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");
                 }
             );
 
-                //BLAZOR UI
-                options.StyleBundles.Configure(
-                BlazorBasicThemeBundles.Styles.Global,
+            //BLAZOR UI
+            options.StyleBundles.Configure(
+                BlazorLeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/blazor-global-styles.css");
-                        //You can remove the following line if you don't use Blazor CSS isolation for components
-                        bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.Tiered.styles.css");
+                    //You can remove the following line if you don't use Blazor CSS isolation for components
+                    bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.Tiered.styles.css");
                 }
             );
         });
@@ -186,19 +186,18 @@ public class MyProjectNameBlazorModule : AbpModule
         {
             Configure<AbpVirtualFileSystemOptions>(options =>
             {
-                    //<TEMPLATE-REMOVE>
-                    options.FileSets.ReplaceEmbeddedByPhysical<AbpUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar)));
+                //<TEMPLATE-REMOVE>
+                options.FileSets.ReplaceEmbeddedByPhysical<AbpUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBasicThemeModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiMultiTenancyModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy", Path.DirectorySeparatorChar)));
-                    //options.FileSets.ReplaceEmbeddedByPhysical<AbpPermissionManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar)));
-                    //options.FileSets.ReplaceEmbeddedByPhysical<AbpFeatureManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar)));
-                    //options.FileSets.ReplaceEmbeddedByPhysical<AbpIdentityWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar)));
-                    //options.FileSets.ReplaceEmbeddedByPhysical<AbpTenantManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}tenant-management{0}src{0}Volo.Abp.TenantManagement.Web", Path.DirectorySeparatorChar)));
-                    //</TEMPLATE-REMOVE>
-                    options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared"));
+                //options.FileSets.ReplaceEmbeddedByPhysical<AbpPermissionManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar)));
+                //options.FileSets.ReplaceEmbeddedByPhysical<AbpFeatureManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar)));
+                //options.FileSets.ReplaceEmbeddedByPhysical<AbpIdentityWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar)));
+                //options.FileSets.ReplaceEmbeddedByPhysical<AbpTenantManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}tenant-management{0}src{0}Volo.Abp.TenantManagement.Web", Path.DirectorySeparatorChar)));
+                //</TEMPLATE-REMOVE>
+                options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameDomainSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Domain.Shared"));
                 options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameApplicationContractsModule>(Path.Combine(hostingEnvironment.ContentRootPath, $"..{Path.DirectorySeparatorChar}MyCompanyName.MyProjectName.Application.Contracts"));
                 options.FileSets.ReplaceEmbeddedByPhysical<MyProjectNameBlazorModule>(hostingEnvironment.ContentRootPath);
             });

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/Pages/_Host.cshtml

@@ -1,8 +1,8 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered.Pages
 @using System.Globalization
-@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
+@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
+@using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
 @using Volo.Abp.Localization
 @{
     Layout = null;
@@ -17,9 +17,10 @@
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
     
-    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" />
+    <abp-style-bundle name="@BlazorLeptonXLiteThemeBundles.Styles.Global"/>
 </head>
 <body class="abp-application-layout bg-light @rtl">
+
     <component type="typeof(App)" render-mode="Server" />
 
     <div id="blazor-error-ui">
@@ -33,6 +34,6 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    <abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
+    <abp-script-bundle name="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
 </body>
 </html>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server.Tiered/package.json

@@ -3,7 +3,7 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0",
-    "@abp/aspnetcore.components.server.basictheme": "^5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0",
+    "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0"
   }
 }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj

@@ -18,16 +18,19 @@
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="1.0.0-beta.2" />
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.Server.BasicTheme\Volo.Abp.AspNetCore.Components.Server.BasicTheme.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Web.OpenIddict\Volo.Abp.Account.Web.OpenIddict.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\identity\src\Volo.Abp.Identity.Blazor.Server\Volo.Abp.Identity.Blazor.Server.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\tenant-management\src\Volo.Abp.TenantManagement.Blazor.Server\Volo.Abp.TenantManagement.Blazor.Server.csproj" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorModule.cs

@@ -13,8 +13,10 @@ using MyCompanyName.MyProjectName.Localization;
 using MyCompanyName.MyProjectName.MultiTenancy;
 using Volo.Abp;
 using Volo.Abp.Account.Web;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
-using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
+using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
+using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.Localization;
@@ -22,8 +24,6 @@ using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Autofac;
@@ -45,12 +45,12 @@ namespace MyCompanyName.MyProjectName.Blazor.Server;
     typeof(MyProjectNameApplicationModule),
     typeof(MyProjectNameEntityFrameworkCoreModule),
     typeof(MyProjectNameHttpApiModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
     typeof(AbpAutofacModule),
     typeof(AbpSwashbuckleModule),
     typeof(AbpAspNetCoreSerilogModule),
     typeof(AbpAccountWebOpenIddictModule),
-    typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
+    typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(AbpIdentityBlazorServerModule),
     typeof(AbpTenantManagementBlazorServerModule),
     typeof(AbpSettingManagementBlazorServerModule)
@@ -114,7 +114,7 @@ public class MyProjectNameBlazorModule : AbpModule
         {
             // MVC UI
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");
@@ -123,7 +123,7 @@ public class MyProjectNameBlazorModule : AbpModule
 
             //BLAZOR UI
             options.StyleBundles.Configure(
-                BlazorBasicThemeBundles.Styles.Global,
+                BlazorLeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/blazor-global-styles.css");
@@ -145,7 +145,6 @@ public class MyProjectNameBlazorModule : AbpModule
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBasicThemeModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiMultiTenancyModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy", Path.DirectorySeparatorChar)));
                 //options.FileSets.ReplaceEmbeddedByPhysical<AbpPermissionManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar)));
                 //options.FileSets.ReplaceEmbeddedByPhysical<AbpFeatureManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar)));

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/Pages/_Host.cshtml

@@ -1,8 +1,8 @@
 @page "/"
 @namespace MyCompanyName.MyProjectName.Blazor.Server.Pages
 @using System.Globalization
-@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
-@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
+@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
+@using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
 @using Volo.Abp.Localization
 @{
     Layout = null;
@@ -16,10 +16,11 @@
     <meta name="viewport" content="width=device-width, initial-scale=1.0" />
     <title>MyCompanyName.MyProjectName.Blazor.Server</title>
     <base href="~/" />
-
-    <abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global" />
+    
+    <abp-style-bundle name="@BlazorLeptonXLiteThemeBundles.Styles.Global" />
 </head>
 <body class="abp-application-layout bg-light @rtl">
+
     <component type="typeof(App)" render-mode="Server" />
 
     <div id="blazor-error-ui">
@@ -33,6 +34,6 @@
         <a class="dismiss">🗙</a>
     </div>
 
-    <abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
+    <abp-script-bundle name="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
 </body>
 </html>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/package.json

@@ -3,7 +3,7 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0",
-    "@abp/aspnetcore.components.server.basictheme": "^5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0",
+    "@abp/aspnetcore.components.server.leptonxlitetheme": "^1.0.0"
   }
 }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj

@@ -16,10 +16,13 @@
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.5" />
     <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.5" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac.WebAssembly\Volo.Abp.Autofac.WebAssembly.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj" />
   </ItemGroup>
 
   <ItemGroup>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs

@@ -8,13 +8,13 @@ using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using MyCompanyName.MyProjectName.Blazor.Menus;
 using OpenIddict.Abstractions;
-using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic;
+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.Autofac.WebAssembly;
 using Volo.Abp.AutoMapper;
 using Volo.Abp.Modularity;
 using Volo.Abp.UI.Navigation;
-using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme;
 using Volo.Abp.Identity.Blazor.WebAssembly;
 using Volo.Abp.Security.Claims;
 using Volo.Abp.SettingManagement.Blazor.WebAssembly;
@@ -25,7 +25,7 @@ namespace MyCompanyName.MyProjectName.Blazor;
 [DependsOn(
     typeof(AbpAutofacWebAssemblyModule),
     typeof(MyProjectNameHttpApiClientModule),
-    typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule),
+    typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule),
     typeof(AbpIdentityBlazorWebAssemblyModule),
     typeof(AbpTenantManagementBlazorWebAssemblyModule),
     typeof(AbpSettingManagementBlazorWebAssemblyModule)
@@ -87,6 +87,7 @@ public class MyProjectNameBlazorModule : AbpModule
     private static void ConfigureUI(WebAssemblyHostBuilder builder)
     {
         builder.RootComponents.Add<App>("#ApplicationContainer");
+
     }
 
     private static void ConfigureHttpClient(ServiceConfigurationContext context, IWebAssemblyHostEnvironment environment)

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/wwwroot/index.html

@@ -8,7 +8,7 @@
     <base href="/" />
 
     <!--ABP:Styles-->
-    <link href="global.css?_v=637880399804275650" rel="stylesheet"/>
+    <link href="global.css?_v=637914207932246555" rel="stylesheet"/>
     <link href="main.css" rel="stylesheet"/>
     <!--/ABP:Styles-->
     <link href="MyCompanyName.MyProjectName.Blazor.styles.css" rel="stylesheet"/>
@@ -29,7 +29,7 @@
     </div>
 
     <!--ABP:Scripts-->
-    <script src="global.js?_v=637880399805903225"></script>
+    <script src="global.js?_v=637914207934176103"></script>
     <!--/ABP:Scripts-->
 
     <!-- <TEMPLATE-REMOVE IF-NOT='PWA'> -->

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyCompanyName.MyProjectName.HttpApi.HostWithIds.csproj

@@ -14,11 +14,14 @@
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
     <ProjectReference Include="..\..\..\..\..\modules\account\src\Volo.Abp.Account.Web.OpenIddict\Volo.Abp.Account.Web.OpenIddict.csproj" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/MyProjectNameHttpApiHostModule.cs

@@ -9,7 +9,8 @@ using Microsoft.Extensions.DependencyInjection;
 using Microsoft.Extensions.Hosting;
 using MyCompanyName.MyProjectName.EntityFrameworkCore;
 using MyCompanyName.MyProjectName.MultiTenancy;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Microsoft.OpenApi.Models;
 using Volo.Abp;
 using Volo.Abp.Account;
@@ -17,7 +18,6 @@ using Volo.Abp.Account.Web;
 using Volo.Abp.AspNetCore.MultiTenancy;
 using Volo.Abp.AspNetCore.Mvc;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Autofac;
@@ -35,7 +35,7 @@ namespace MyCompanyName.MyProjectName;
     typeof(AbpAspNetCoreMultiTenancyModule),
     typeof(MyProjectNameApplicationModule),
     typeof(MyProjectNameEntityFrameworkCoreModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(AbpAccountWebOpenIddictModule),
     typeof(AbpAspNetCoreSerilogModule),
     typeof(AbpSwashbuckleModule)
@@ -74,8 +74,11 @@ public class MyProjectNameHttpApiHostModule : AbpModule
         Configure<AbpBundlingOptions>(options =>
         {
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
-                bundle => { bundle.AddFiles("/global-styles.css"); }
+                LeptonXLiteThemeBundles.Styles.Global,
+                bundle =>
+                {
+                    bundle.AddFiles("/global-styles.css");
+                }
             );
         });
     }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.HttpApi.HostWithIds/package.json

@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0"
   }
 }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyCompanyName.MyProjectName.Web.Host.csproj

@@ -19,6 +19,10 @@
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
     <PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
@@ -26,7 +30,6 @@
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Mvc.Client\Volo.Abp.AspNetCore.Mvc.Client.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Authentication.OpenIdConnect\Volo.Abp.AspNetCore.Authentication.OpenIdConnect.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.Web\Volo.Abp.Http.Client.Web.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Http.Client.IdentityModel.Web\Volo.Abp.Http.Client.IdentityModel.Web.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/MyProjectNameWebModule.cs

@@ -19,8 +19,8 @@ using Volo.Abp.AspNetCore.Mvc.Localization;
 using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared.Toolbars;
 using Volo.Abp.AspNetCore.Serilog;
@@ -50,7 +50,7 @@ namespace MyCompanyName.MyProjectName.Web;
     typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule),
     typeof(AbpAspNetCoreMvcClientModule),
     typeof(AbpHttpClientWebModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(AbpAutofacModule),
     typeof(AbpCachingStackExchangeRedisModule),
     typeof(AbpSettingManagementWebModule),
@@ -97,7 +97,7 @@ public class MyProjectNameWebModule : AbpModule
         Configure<AbpBundlingOptions>(options =>
         {
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");
@@ -181,7 +181,6 @@ public class MyProjectNameWebModule : AbpModule
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBasicThemeModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpPermissionManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpIdentityWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}identity{0}src{0}Volo.Abp.Identity.Web", Path.DirectorySeparatorChar)));
                 //</TEMPLATE-REMOVE>

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web.Host/package.json

@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0"
   }
 }

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyCompanyName.MyProjectName.Web.csproj

@@ -34,12 +34,15 @@
     <PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
     <PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
   </ItemGroup>
+  
+  <ItemGroup>
+    <PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
+  </ItemGroup>
 
   <ItemGroup>
     <ProjectReference Include="..\MyCompanyName.MyProjectName.Application\MyCompanyName.MyProjectName.Application.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.HttpApi\MyCompanyName.MyProjectName.HttpApi.csproj" />
     <ProjectReference Include="..\MyCompanyName.MyProjectName.EntityFrameworkCore\MyCompanyName.MyProjectName.EntityFrameworkCore.csproj" />
-    <ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Swashbuckle\Volo.Abp.Swashbuckle.csproj" />
     <ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.Serilog\Volo.Abp.AspNetCore.Serilog.csproj" />

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/MyProjectNameWebModule.cs

@@ -18,8 +18,8 @@ using Volo.Abp.AspNetCore.Mvc.UI;
 using Volo.Abp.AspNetCore.Mvc.UI.Bootstrap;
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
-using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
+using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
 using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
 using Volo.Abp.AspNetCore.Serilog;
 using Volo.Abp.Autofac;
@@ -47,7 +47,7 @@ namespace MyCompanyName.MyProjectName.Web;
     typeof(AbpIdentityWebModule),
     typeof(AbpSettingManagementWebModule),
     typeof(AbpAccountWebModule),
-    typeof(AbpAspNetCoreMvcUiBasicThemeModule),
+    typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
     typeof(AbpTenantManagementWebModule),
     typeof(AbpAspNetCoreSerilogModule),
     typeof(AbpSwashbuckleModule)
@@ -97,7 +97,7 @@ public class MyProjectNameWebModule : AbpModule
         Configure<AbpBundlingOptions>(options =>
         {
             options.StyleBundles.Configure(
-                BasicThemeBundles.Styles.Global,
+                LeptonXLiteThemeBundles.Styles.Global,
                 bundle =>
                 {
                     bundle.AddFiles("/global-styles.css");
@@ -125,7 +125,6 @@ public class MyProjectNameWebModule : AbpModule
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBootstrapModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Bootstrap", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiThemeSharedModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared", Path.DirectorySeparatorChar)));
-                options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiBasicThemeModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}basic-theme{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpAspNetCoreMvcUiMultiTenancyModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}framework{0}src{0}Volo.Abp.AspNetCore.Mvc.UI.MultiTenancy", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpPermissionManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}permission-management{0}src{0}Volo.Abp.PermissionManagement.Web", Path.DirectorySeparatorChar)));
                 options.FileSets.ReplaceEmbeddedByPhysical<AbpFeatureManagementWebModule>(Path.Combine(hostingEnvironment.ContentRootPath, string.Format("..{0}..{0}..{0}..{0}..{0}modules{0}feature-management{0}src{0}Volo.Abp.FeatureManagement.Web", Path.DirectorySeparatorChar)));

templates/app/aspnet-core/src/MyCompanyName.MyProjectName.Web/package.json

@@ -3,6 +3,6 @@
   "name": "my-app",
   "private": true,
   "dependencies": {
-    "@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0"
+    "@abp/aspnetcore.mvc.ui.theme.leptonxlite": "^1.0.0"
   }
 }