Add leptonx-lite theme as optional for `app-pro` template

pull/12938/head
Engincan VESKE 3 years ago
parent d07f01e81a
commit cdd4251daa

@ -34,12 +34,17 @@
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" />
<!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
<!--</TEMPLATE-REMOVE>-->
</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" />
<!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
<ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
<!--</TEMPLATE-REMOVE>-->
<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" />

@ -17,8 +17,14 @@ 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;
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
//</TEMPLATE-REMOVE>
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Shared;
using Volo.Abp.AspNetCore.Serilog;
using Volo.Abp.Auditing;
@ -40,7 +46,12 @@ namespace MyCompanyName.MyProjectName;
typeof(AbpAccountWebOpenIddictModule),
typeof(AbpAccountApplicationModule),
typeof(AbpAccountHttpApiModule),
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
typeof(AbpAspNetCoreMvcUiBasicThemeModule),
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
//</TEMPLATE-REMOVE>
typeof(MyProjectNameEntityFrameworkCoreModule),
typeof(AbpAspNetCoreSerilogModule)
)]
@ -95,6 +106,7 @@ public class MyProjectNameAuthServerModule : AbpModule
Configure<AbpBundlingOptions>(options =>
{
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
options.StyleBundles.Configure(
BasicThemeBundles.Styles.Global,
bundle =>
@ -102,6 +114,16 @@ public class MyProjectNameAuthServerModule : AbpModule
bundle.AddFiles("/global-styles.css");
}
);
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
options.StyleBundles.Configure(
LeptonXLiteThemeBundles.Styles.Global,
bundle =>
{
bundle.AddFiles("/global-styles.css");
}
);
//</TEMPLATE-REMOVE>
});
Configure<AbpAuditingOptions>(options =>

@ -3,6 +3,8 @@
"name": "my-app-authserver",
"private": true,
"dependencies": {
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
"@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0-rc.3"
//</TEMPLATE-REMOVE>
}
}

@ -18,6 +18,9 @@
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<PackageReference Include="Microsoft.AspNetCore.DataProtection.StackExchangeRedis" Version="6.0.5" />
<!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
<PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="1.0.0-beta.2" />
<!--</TEMPLATE-REMOVE>-->
</ItemGroup>
<ItemGroup>
@ -26,11 +29,13 @@
<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" />
<!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
<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" />
<!--</TEMPLATE-REMOVE>-->
<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" />

@ -1,4 +1,4 @@
using System;
using System;
using System.IO;
using System.Net.Http;
using Blazorise.Bootstrap5;
@ -17,8 +17,16 @@ using MyCompanyName.MyProjectName.MultiTenancy;
using StackExchange.Redis;
using Volo.Abp;
using Volo.Abp.AspNetCore.Authentication.OpenIdConnect;
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
//</TEMPLATE-REMOVE>
using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
using Volo.Abp.AspNetCore.Mvc.Client;
using Volo.Abp.AspNetCore.Mvc.Localization;
@ -26,8 +34,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 +62,16 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered;
typeof(AbpAspNetCoreMvcClientModule),
typeof(AbpAspNetCoreAuthenticationOpenIdConnectModule),
typeof(AbpHttpClientIdentityModelWebModule),
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
typeof(AbpAspNetCoreMvcUiBasicThemeModule),
typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
//</TEMPLATE-REMOVE>
typeof(AbpAutofacModule),
typeof(AbpSwashbuckleModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
typeof(AbpIdentityBlazorServerModule),
typeof(AbpTenantManagementBlazorServerModule),
typeof(AbpSettingManagementBlazorServerModule)
@ -120,8 +131,9 @@ public class MyProjectNameBlazorModule : AbpModule
{
Configure<AbpBundlingOptions>(options =>
{
// MVC UI
options.StyleBundles.Configure(
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
// MVC UI
options.StyleBundles.Configure(
BasicThemeBundles.Styles.Global,
bundle =>
{
@ -129,16 +141,38 @@ public class MyProjectNameBlazorModule : AbpModule
}
);
//BLAZOR UI
options.StyleBundles.Configure(
//BLAZOR UI
options.StyleBundles.Configure(
BlazorBasicThemeBundles.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");
}
);
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
// MVC UI
options.StyleBundles.Configure(
BlazorLeptonXLiteThemeBundles.Styles.Global,
bundle =>
{
bundle.AddFiles("/global-styles.css");
}
);
//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");
}
);
//</TEMPLATE-REMOVE>
});
}
@ -186,19 +220,19 @@ 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);
});

@ -1,8 +1,14 @@
@page "/"
@namespace MyCompanyName.MyProjectName.Blazor.Server.Tiered.Pages
@using System.Globalization
@*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling
@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic
@*</TEMPLATE-REMOVE>*@
@*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite
@using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling
@*</TEMPLATE-REMOVE>*@
@using Volo.Abp.Localization
@{
Layout = null;
@ -16,11 +22,21 @@
<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" />
@*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
<abp-style-bundle name="@BlazorBasicThemeBundles.Styles.Global"/>
@*</TEMPLATE-REMOVE>*@
@*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
<abp-style-bundle name="@BlazorLeptonXLiteThemeBundles.Styles.Global"/>
@*</TEMPLATE-REMOVE>*@
</head>
<body class="abp-application-layout bg-light @rtl">
<component type="typeof(App)" render-mode="Server" />
@*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
<component type="typeof(Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic.App)" render-mode="Server" />
@*</TEMPLATE-REMOVE>*@
@*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
<component type="typeof(Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite.App)" render-mode="Server" />
@*</TEMPLATE-REMOVE>*@
<div id="blazor-error-ui">
<environment include="Staging,Production">
@ -33,6 +49,11 @@
<a class="dismiss">🗙</a>
</div>
@*<TEMPLATE-REMOVE IF-NOT='BASIC'>*@
<abp-script-bundle name="@BlazorBasicThemeBundles.Scripts.Global" />
@*</TEMPLATE-REMOVE>*@
@*<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>*@
<abp-script-bundle name="@BlazorLeptonXLiteThemeBundles.Scripts.Global" />
@*</TEMPLATE-REMOVE>*@
</body>
</html>

@ -17,17 +17,22 @@
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.4" />
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
<PackageReference Include="Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme" Version="1.0.0-beta.2" />
<!--</TEMPLATE-REMOVE>-->
</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" />
<!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
<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" />
<!--</TEMPLATE-REMOVE>-->
<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" />

@ -13,8 +13,16 @@ using MyCompanyName.MyProjectName.Localization;
using MyCompanyName.MyProjectName.MultiTenancy;
using Volo.Abp;
using Volo.Abp.Account.Web;
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
using Volo.Abp.AspNetCore.Components.Server.BasicTheme;
using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme;
using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling;
//</TEMPLATE-REMOVE>
using Volo.Abp.AspNetCore.Components.Web.Theming.Routing;
using Volo.Abp.AspNetCore.Mvc;
using Volo.Abp.AspNetCore.Mvc.Localization;
@ -22,8 +30,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;
@ -50,7 +56,12 @@ namespace MyCompanyName.MyProjectName.Blazor.Server;
typeof(AbpSwashbuckleModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpAccountWebOpenIddictModule),
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
typeof(AbpAspNetCoreComponentsServerBasicThemeModule),
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule),
//</TEMPLATE-REMOVE>
typeof(AbpIdentityBlazorServerModule),
typeof(AbpTenantManagementBlazorServerModule),
typeof(AbpSettingManagementBlazorServerModule)
@ -112,6 +123,7 @@ public class MyProjectNameBlazorModule : AbpModule
{
Configure<AbpBundlingOptions>(options =>
{
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
// MVC UI
options.StyleBundles.Configure(
BasicThemeBundles.Styles.Global,
@ -131,6 +143,28 @@ public class MyProjectNameBlazorModule : AbpModule
bundle.AddFiles("/MyCompanyName.MyProjectName.Blazor.Server.styles.css");
}
);
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
// MVC UI
options.StyleBundles.Configure(
BlazorLeptonXLiteThemeBundles.Styles.Global,
bundle =>
{
bundle.AddFiles("/global-styles.css");
}
);
//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.styles.css");
}
);
//</TEMPLATE-REMOVE>
});
}

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

@ -3,7 +3,9 @@
"name": "my-app",
"private": true,
"dependencies": {
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
"@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0-rc.3",
"@abp/aspnetcore.components.server.basictheme": "^5.3.0-rc.3"
//</TEMPLATE-REMOVE>
}
}

@ -15,11 +15,16 @@
<PackageReference Include="Blazorise.Icons.FontAwesome" Version="1.0.4" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="6.0.5" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="6.0.5" />
<!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
<PackageReference Include="Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme" Version="1.0.0-beta.2" />
<!--</TEMPLATE-REMOVE>-->
</ItemGroup>
<ItemGroup>
<ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac.WebAssembly\Volo.Abp.Autofac.WebAssembly.csproj" />
<!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
<ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme\Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme.csproj" />
<!--</TEMPLATE-REMOVE>-->
</ItemGroup>
<ItemGroup>

@ -8,13 +8,19 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using MyCompanyName.MyProjectName.Blazor.Menus;
using OpenIddict.Abstractions;
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic;
using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme;
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme;
using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite;
//</TEMPLATE-REMOVE>
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 +31,12 @@ namespace MyCompanyName.MyProjectName.Blazor;
[DependsOn(
typeof(AbpAutofacWebAssemblyModule),
typeof(MyProjectNameHttpApiClientModule),
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule),
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule),
//</TEMPLATE-REMOVE>
typeof(AbpIdentityBlazorWebAssemblyModule),
typeof(AbpTenantManagementBlazorWebAssemblyModule),
typeof(AbpSettingManagementBlazorWebAssemblyModule)
@ -86,7 +97,13 @@ public class MyProjectNameBlazorModule : AbpModule
private static void ConfigureUI(WebAssemblyHostBuilder builder)
{
builder.RootComponents.Add<App>("#ApplicationContainer");
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
builder.RootComponents.Add<Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic.App>("#ApplicationContainer");
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
builder.RootComponents.Add<Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite.App>("#ApplicationContainer");
//</TEMPLATE-REMOVE>
}
private static void ConfigureHttpClient(ServiceConfigurationContext context, IWebAssemblyHostEnvironment environment)

@ -12,9 +12,14 @@
<ItemGroup>
<PackageReference Include="Serilog.AspNetCore" Version="5.0.0" />
<PackageReference Include="Serilog.Sinks.Async" Version="1.5.0" />
<!--<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>-->
<PackageReference Include="Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite" Version="1.0.0-beta.2" />
<!--</TEMPLATE-REMOVE>-->
<ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.AspNetCore.MultiTenancy\Volo.Abp.AspNetCore.MultiTenancy.csproj" />
<ProjectReference Include="..\..\..\..\..\framework\src\Volo.Abp.Autofac\Volo.Abp.Autofac.csproj" />
<!--<TEMPLATE-REMOVE IF-NOT='BASIC'>-->
<ProjectReference Include="..\..\..\..\..\modules\basic-theme\src\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic\Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.csproj" />
<!--</TEMPLATE-REMOVE>-->
<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" />

@ -9,7 +9,14 @@ using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using MyCompanyName.MyProjectName.EntityFrameworkCore;
using MyCompanyName.MyProjectName.MultiTenancy;
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic.Bundling;
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite;
using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling;
//</TEMPLATE-REMOVE>
using Microsoft.OpenApi.Models;
using Volo.Abp;
using Volo.Abp.Account;
@ -17,7 +24,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 +41,12 @@ namespace MyCompanyName.MyProjectName;
typeof(AbpAspNetCoreMultiTenancyModule),
typeof(MyProjectNameApplicationModule),
typeof(MyProjectNameEntityFrameworkCoreModule),
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
typeof(AbpAspNetCoreMvcUiBasicThemeModule),
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule),
//</TEMPLATE-REMOVE>
typeof(AbpAccountWebOpenIddictModule),
typeof(AbpAspNetCoreSerilogModule),
typeof(AbpSwashbuckleModule)
@ -73,10 +84,24 @@ public class MyProjectNameHttpApiHostModule : AbpModule
{
Configure<AbpBundlingOptions>(options =>
{
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
options.StyleBundles.Configure(
BasicThemeBundles.Styles.Global,
bundle => { bundle.AddFiles("/global-styles.css"); }
bundle =>
{
bundle.AddFiles("/global-styles.css");
}
);
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
options.StyleBundles.Configure(
LeptonXLiteThemeBundles.Styles.Global,
bundle =>
{
bundle.AddFiles("/global-styles.css");
}
);
//</TEMPLATE-REMOVE>
});
}

@ -3,6 +3,8 @@
"name": "my-app",
"private": true,
"dependencies": {
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
"@abp/aspnetcore.mvc.ui.theme.basic": "^5.3.0-rc.3"
//</TEMPLATE-REMOVE>
}
}

@ -105,9 +105,9 @@ public class MyProjectNameWebModule : AbpModule
private void ConfigureBundles()
{
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
Configure<AbpBundlingOptions>(options =>
{
//<TEMPLATE-REMOVE IF-NOT='LEPTONX-LITE'>
options.StyleBundles.Configure(
LeptonXLiteThemeBundles.Styles.Global,
bundle =>
@ -115,11 +115,8 @@ public class MyProjectNameWebModule : AbpModule
bundle.AddFiles("/global-styles.css");
}
);
});
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
Configure<AbpBundlingOptions>(options =>
{
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
options.StyleBundles.Configure(
BasicThemeBundles.Styles.Global,
bundle =>
@ -127,8 +124,8 @@ public class MyProjectNameWebModule : AbpModule
bundle.AddFiles("/global-styles.css");
}
);
//</TEMPLATE-REMOVE>
});
//</TEMPLATE-REMOVE>
}
private void ConfigureCache()

@ -116,7 +116,6 @@ public class MyProjectNameWebModule : AbpModule
}
);
//</TEMPLATE-REMOVE>
//<TEMPLATE-REMOVE IF-NOT='BASIC'>
options.StyleBundles.Configure(
BasicThemeBundles.Styles.Global,

Loading…
Cancel
Save