diff --git a/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor b/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor index 272bb154d5..2bf9b47935 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor +++ b/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor @@ -112,14 +112,7 @@ } else { - if (column.DisplayFormat == null) - { - @(propertyValue) - } - else - { - @(string.Format(column.DisplayFormatProvider, column.DisplayFormat, propertyValue)) - } + @((MarkupString)GetConvertedFieldValue(propertyValue, column)) } } } diff --git a/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor.cs b/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor.cs index b8bf8c5606..7dad0c4ad3 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor.cs +++ b/framework/src/Volo.Abp.MudBlazorUI/Components/AbpMudExtensibleDataGrid.razor.cs @@ -1,5 +1,6 @@ using System; using System.Collections.Generic; +using System.Globalization; using System.Linq; using System.Reflection; using System.Text.RegularExpressions; @@ -85,6 +86,43 @@ public partial class AbpMudExtensibleDataGrid : ComponentBase return convertedValue; } + protected virtual string GetConvertedFieldValue(object? value, TableColumn columnDefinition) + { + if (value is DateTime dateTime) + { + var converted = Clock.ConvertToUserTime(dateTime); + if (!columnDefinition.DisplayFormat.IsNullOrEmpty()) + { + return string.Format(columnDefinition.DisplayFormatProvider, columnDefinition.DisplayFormat!, converted); + } + + return converted.ToString(columnDefinition.DisplayFormatProvider as CultureInfo ?? CultureInfo.CurrentCulture); + } + + if (value is DateTimeOffset dateTimeOffset) + { + var converted = Clock.ConvertToUserTime(dateTimeOffset); + if (!columnDefinition.DisplayFormat.IsNullOrEmpty()) + { + return string.Format(columnDefinition.DisplayFormatProvider, columnDefinition.DisplayFormat!, converted); + } + + return converted.ToString(columnDefinition.DisplayFormatProvider as CultureInfo ?? CultureInfo.CurrentCulture); + } + + if (value == null) + { + return string.Empty; + } + + if (!columnDefinition.DisplayFormat.IsNullOrEmpty()) + { + return string.Format(columnDefinition.DisplayFormatProvider, columnDefinition.DisplayFormat!, value); + } + + return value.ToString() ?? string.Empty; + } + protected virtual object GetPropertyValue(TItem item, string propertyPath) { ArgumentNullException.ThrowIfNull(item); diff --git a/framework/src/Volo.Abp.MudBlazorUI/Components/UiNotificationAlert.razor b/framework/src/Volo.Abp.MudBlazorUI/Components/UiNotificationAlert.razor index b37ad14e57..fdf1b7cbe4 100644 --- a/framework/src/Volo.Abp.MudBlazorUI/Components/UiNotificationAlert.razor +++ b/framework/src/Volo.Abp.MudBlazorUI/Components/UiNotificationAlert.razor @@ -1,3 +1 @@ @using MudBlazor - - diff --git a/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor b/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor index 2780961d2e..1da6bbaff8 100644 --- a/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor +++ b/modules/account/src/Volo.Abp.Account.Blazor.MudBlazor/Pages/Account/AccountManage.razor @@ -36,8 +36,7 @@ { + Label="@L["DisplayName:UserName"]" /> L @@ -35,20 +37,3 @@ @L["Login"] - -@code { - [Inject] protected NavigationManager Navigation { get; set; } = default!; - [Inject] protected IMenuManager MenuManager { get; set; } = default!; - - protected ApplicationMenu? Menu { get; set; } - - protected override async Task OnInitializedAsync() - { - Menu = await MenuManager.GetAsync(StandardMenus.User); - } - - protected void Logout() - { - Navigation.NavigateTo("/Account/Logout", forceLoad: true); - } -} diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor.cs new file mode 100644 index 0000000000..cc0afa2f07 --- /dev/null +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor.cs @@ -0,0 +1,32 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Routing; +using Volo.Abp.UI.Navigation; + +namespace Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Themes.Basic; + +public partial class LoginDisplay : IDisposable +{ + [Inject] + protected IMenuManager MenuManager { get; set; } + + protected ApplicationMenu Menu { get; set; } + + protected override async Task OnInitializedAsync() + { + Menu = await MenuManager.GetAsync(StandardMenus.User); + + Navigation.LocationChanged += OnLocationChanged; + } + + protected virtual void OnLocationChanged(object sender, LocationChangedEventArgs e) + { + InvokeAsync(StateHasChanged); + } + + public void Dispose() + { + Navigation.LocationChanged -= OnLocationChanged; + } +} diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor deleted file mode 100644 index 21f23f58c5..0000000000 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor +++ /dev/null @@ -1,30 +0,0 @@ -@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Components -@using Volo.Abp.Users -@using MudBlazor -@using Microsoft.Extensions.Localization -@using global::Localization.Resources.AbpUi -@using Volo.Abp.DependencyInjection -@inject ICurrentUser CurrentUser -@inject IStringLocalizer L - -@if (CurrentUser.IsAuthenticated) -{ - - @L["MyAccount"] - - @L["Logout"] - -} -else -{ - @L["Login"] -} - -@code { - [Inject] protected NavigationManager NavigationManager { get; set; } = default!; - - protected void Logout() - { - NavigationManager.NavigateTo("/Account/Logout", forceLoad: true); - } -} diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling.csproj b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling.csproj index 4f63486442..c71770c813 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling.csproj +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling.csproj @@ -9,7 +9,7 @@ - + diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor index 3ef6850a4c..9a25e06cec 100644 --- a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor @@ -4,9 +4,9 @@ @using Microsoft.Extensions.Options @using Microsoft.JSInterop @using Volo.Abp.AspNetCore.Components.Web -@using Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme @using Volo.Abp.AspNetCore.Components.Web.Security @using Volo.Abp.UI.Navigation +@implements IDisposable @inherits AbpComponentBase @inject IJSRuntime JsRuntime @inject NavigationManager Navigation @@ -31,43 +31,14 @@ { @foreach (var menuItem in Menu.Items) { - @menuItem.DisplayName + @menuItem.DisplayName } } - @UiLocalizer["Logout"] + @UiLocalizer["Logout"] @UiLocalizer["Login"] - -@code { - [Inject] protected IMenuManager MenuManager { get; set; } = default!; - [Inject] protected ApplicationConfigurationChangedService ApplicationConfigurationChangedService { get; set; } = default!; - - protected ApplicationMenu? Menu { get; set; } - - protected async override Task OnInitializedAsync() - { - Menu = await MenuManager.GetAsync(StandardMenus.User); - ApplicationConfigurationChangedService.Changed += ApplicationConfigurationChanged; - } - - private async void ApplicationConfigurationChanged() - { - Menu = await MenuManager.GetAsync(StandardMenus.User); - await InvokeAsync(StateHasChanged); - } - - public void Dispose() - { - ApplicationConfigurationChangedService.Changed -= ApplicationConfigurationChanged; - } - - protected void Logout() - { - Navigation.NavigateTo("/Account/Logout", forceLoad: true); - } -} diff --git a/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor.cs b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor.cs new file mode 100644 index 0000000000..32c60bd407 --- /dev/null +++ b/modules/basic-theme/src/Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme/Themes/Basic/LoginDisplay.razor.cs @@ -0,0 +1,71 @@ +using System; +using System.Threading.Tasks; +using Microsoft.AspNetCore.Components; +using Microsoft.AspNetCore.Components.Routing; +using Microsoft.AspNetCore.Components.WebAssembly.Authentication; +using Microsoft.JSInterop; +using Volo.Abp.AspNetCore.Components.Web.Security; +using Volo.Abp.UI.Navigation; + +namespace Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Themes.Basic; + +public partial class LoginDisplay : IDisposable +{ + [Inject] + protected IMenuManager MenuManager { get; set; } + + [Inject] + protected ApplicationConfigurationChangedService ApplicationConfigurationChangedService { get; set; } + + protected ApplicationMenu Menu { get; set; } + + protected async override Task OnInitializedAsync() + { + Menu = await MenuManager.GetAsync(StandardMenus.User); + + Navigation.LocationChanged += OnLocationChanged; + + ApplicationConfigurationChangedService.Changed += ApplicationConfigurationChanged; + } + + protected virtual void OnLocationChanged(object sender, LocationChangedEventArgs e) + { + InvokeAsync(StateHasChanged); + } + + private async void ApplicationConfigurationChanged() + { + Menu = await MenuManager.GetAsync(StandardMenus.User); + await InvokeAsync(StateHasChanged); + } + + public void Dispose() + { + Navigation.LocationChanged -= OnLocationChanged; + ApplicationConfigurationChangedService.Changed -= ApplicationConfigurationChanged; + } + + private async Task NavigateToAsync(string uri, string target = null) + { + if (target == "_blank") + { + await JsRuntime.InvokeVoidAsync("open", uri, target); + } + else + { + Navigation.NavigateTo(uri); + } + } + + private void BeginSignOut() + { + if (AbpAspNetCoreComponentsWebOptions.Value.IsBlazorWebApp) + { + Navigation.NavigateTo(AuthenticationOptions.Value.LogoutUrl, forceLoad: true); + } + else + { + Navigation.NavigateToLogout(AuthenticationOptions.Value.LogoutUrl); + } + } +} diff --git a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor index a692486d2c..c021ea6d12 100644 --- a/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor +++ b/modules/permission-management/src/Volo.Abp.PermissionManagement.Blazor.MudBlazor/Components/PermissionManagementModal.razor @@ -52,9 +52,9 @@ @foreach (var permission in group.Permissions) { var depth = GetPermissionDepthOrDefault(permission.Name); -
+
? _allGroups; protected List? _groups; - protected List _disabledPermissions = new List(); - protected int _activeTabIndex = 0; protected bool _selectAllDisabled; @@ -110,19 +108,6 @@ public partial class PermissionManagementModal _selectAllDisabled = _groups.All(IsPermissionGroupDisabled); - if (checkDisabledPermissions) - { - _disabledPermissions.Clear(); - } - - foreach (var permission in _groups.SelectMany(x => x.Permissions)) - { - if (checkDisabledPermissions && permission.IsGranted && permission.GrantedProviders.All(x => x.ProviderName != _providerName)) - { - _disabledPermissions.Add(permission); - } - } - foreach (var group in _groups) { SetPermissionDepths(group.Permissions, null, 0); diff --git a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor index c1206f1764..c3b511109a 100644 --- a/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor +++ b/modules/setting-management/src/Volo.Abp.SettingManagement.Blazor.MudBlazor/Pages/SettingManagement/EmailSettingGroup/EmailSettingGroupViewComponent.razor @@ -4,7 +4,6 @@ @if (EmailSettings != null) { - @@ -60,6 +59,7 @@ @if (HasSendTestEmailPermission) { @L["SendTestEmail"] @@ -72,7 +72,6 @@ - @if (HasSendTestEmailPermission) { diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Components/App.razor b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Components/App.razor index 9f9aa51130..a3b135b479 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Components/App.razor +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Components/App.razor @@ -1,8 +1,9 @@ @using Volo.Abp.Localization @using System.Globalization @using Microsoft.Extensions.Hosting -@using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling -@using Volo.Abp.AspNetCore.Components.Web.Theming.Bundling +@using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling +@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling +@using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling @inject IHostEnvironment Env @{ var rtl = CultureHelper.IsRtl ? "rtl" : string.Empty; @@ -17,7 +18,9 @@ MyCompanyName.MyProjectName.Blazor.Server - + + + @@ -26,7 +29,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Components/Routes.razor b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Components/Routes.razor index fff90cbc35..9788fed14f 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Components/Routes.razor +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Components/Routes.razor @@ -1,5 +1,5 @@ -@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite -@using Volo.Abp.AspNetCore.Components.Web.Theming.Routing +@using Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme.Themes.Basic +@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing @using Microsoft.Extensions.Options @inject IOptions RouterOptions diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Menus/MyProjectNameMenuContributor.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Menus/MyProjectNameMenuContributor.cs index 2a32b76193..c8c3833fa8 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Menus/MyProjectNameMenuContributor.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/Menus/MyProjectNameMenuContributor.cs @@ -1,7 +1,7 @@ using MyCompanyName.MyProjectName.Localization; -using Volo.Abp.Identity.Blazor; -using Volo.Abp.SettingManagement.Blazor.Menus; -using Volo.Abp.TenantManagement.Blazor.Navigation; +using Volo.Abp.Identity.Blazor.MudBlazor; +using Volo.Abp.SettingManagement.Blazor.MudBlazor.Menus; +using Volo.Abp.TenantManagement.Blazor.MudBlazor.Navigation; using Volo.Abp.UI.Navigation; namespace MyCompanyName.MyProjectName.Menus; diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj index 4f7ffff647..f235b6b16d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyCompanyName.MyProjectName.Blazor.Server.Mongo.csproj @@ -8,8 +8,6 @@ - - @@ -18,11 +16,11 @@ - - + + + - @@ -45,7 +43,7 @@ - + @@ -59,21 +57,21 @@ - + - + - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs index 151f57de6c..df48e3abe5 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/MyProjectNameModule.cs @@ -1,5 +1,3 @@ -using Blazorise.Bootstrap5; -using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; @@ -14,10 +12,10 @@ using Volo.Abp.Account; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Components.Web; 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.Components.Server.MudBlazorBasicTheme; +using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling; -using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; +using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bundling; @@ -28,10 +26,10 @@ using Volo.Abp.Mapperly; using Volo.Abp.MongoDB; using Volo.Abp.Emailing; using Volo.Abp.FeatureManagement; -using Volo.Abp.FeatureManagement.Blazor.Server; +using Volo.Abp.FeatureManagement.Blazor.MudBlazor.Server; using Volo.Abp.FeatureManagement.MongoDB; using Volo.Abp.Identity; -using Volo.Abp.Identity.Blazor.Server; +using Volo.Abp.Identity.Blazor.MudBlazor.Server; using Volo.Abp.Identity.MongoDB; using Volo.Abp.Localization; using Volo.Abp.Localization.ExceptionHandling; @@ -43,11 +41,11 @@ using Volo.Abp.PermissionManagement.HttpApi; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.PermissionManagement.OpenIddict; using Volo.Abp.SettingManagement; -using Volo.Abp.SettingManagement.Blazor.Server; +using Volo.Abp.SettingManagement.Blazor.MudBlazor.Server; using Volo.Abp.SettingManagement.MongoDB; using Volo.Abp.Swashbuckle; using Volo.Abp.TenantManagement; -using Volo.Abp.TenantManagement.Blazor.Server; +using Volo.Abp.TenantManagement.Blazor.MudBlazor.Server; using Volo.Abp.TenantManagement.MongoDB; using Volo.Abp.OpenIddict; using Volo.Abp.Security.Claims; @@ -67,7 +65,7 @@ namespace MyCompanyName.MyProjectName; typeof(AbpSwashbuckleModule), typeof(AbpAspNetCoreSerilogModule), typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), - typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule), + typeof(AbpAspNetCoreComponentsServerMudBlazorBasicThemeModule), // Account module packages typeof(AbpAccountApplicationModule), @@ -81,7 +79,7 @@ namespace MyCompanyName.MyProjectName; typeof(AbpIdentityHttpApiModule), typeof(AbpIdentityMongoDbModule), typeof(AbpOpenIddictMongoDbModule), - typeof(AbpIdentityBlazorServerModule), + typeof(AbpIdentityBlazorMudBlazorServerModule), // Audit logging module packages typeof(AbpAuditLoggingMongoDbModule), @@ -95,19 +93,19 @@ namespace MyCompanyName.MyProjectName; typeof(AbpTenantManagementApplicationModule), typeof(AbpTenantManagementHttpApiModule), typeof(AbpTenantManagementMongoDbModule), - typeof(AbpTenantManagementBlazorServerModule), + typeof(AbpTenantManagementBlazorMudBlazorServerModule), // Feature Management module packages typeof(AbpFeatureManagementApplicationModule), typeof(AbpFeatureManagementMongoDbModule), typeof(AbpFeatureManagementHttpApiModule), - typeof(AbpFeatureManagementBlazorServerModule), + typeof(AbpFeatureManagementBlazorMudBlazorServerModule), // Setting Management module packages typeof(AbpSettingManagementApplicationModule), typeof(AbpSettingManagementMongoDbModule), typeof(AbpSettingManagementHttpApiModule), - typeof(AbpSettingManagementBlazorServerModule) + typeof(AbpSettingManagementBlazorMudBlazorServerModule) )] public class MyProjectNameModule : AbpModule { @@ -181,7 +179,6 @@ public class MyProjectNameModule : AbpModule ConfigureSwaggerServices(context.Services); ConfigureNavigationServices(); ConfigureAutoApiControllers(); - ConfigureBlazorise(context); ConfigureRouter(context); ConfigureMongoDB(context); @@ -221,7 +218,7 @@ public class MyProjectNameModule : AbpModule //BLAZOR UI options.StyleBundles.Configure( - BlazorLeptonXLiteThemeBundles.Styles.Global, + BlazorMudBlazorBasicThemeBundles.Styles.Global, bundle => { bundle.AddFiles("/blazor-global-styles.css"); @@ -296,13 +293,6 @@ public class MyProjectNameModule : AbpModule ); } - private void ConfigureBlazorise(ServiceConfigurationContext context) - { - context.Services - .AddBootstrap5Providers() - .AddFontAwesomeIcons(); - } - private void ConfigureRouter(ServiceConfigurationContext context) { Configure(options => diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/_Imports.razor b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/_Imports.razor index ad711d0c79..063a0594e4 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/_Imports.razor +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server.Mongo/_Imports.razor @@ -8,7 +8,6 @@ @using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.JSInterop @using MyCompanyName.MyProjectName -@using Blazorise -@using Blazorise.DataGrid -@using Volo.Abp.BlazoriseUI -@using Volo.Abp.BlazoriseUI.Components +@using global::MudBlazor +@using Volo.Abp.MudBlazorUI +@using Volo.Abp.MudBlazorUI.Components diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Components/App.razor b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Components/App.razor index 9f9aa51130..a3b135b479 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Components/App.razor +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Components/App.razor @@ -1,8 +1,9 @@ @using Volo.Abp.Localization @using System.Globalization @using Microsoft.Extensions.Hosting -@using Volo.Abp.AspNetCore.Components.Server.LeptonXLiteTheme.Bundling -@using Volo.Abp.AspNetCore.Components.Web.Theming.Bundling +@using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling +@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling +@using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling @inject IHostEnvironment Env @{ var rtl = CultureHelper.IsRtl ? "rtl" : string.Empty; @@ -17,7 +18,9 @@ MyCompanyName.MyProjectName.Blazor.Server - + + + @@ -26,7 +29,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Components/Routes.razor b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Components/Routes.razor index fff90cbc35..9788fed14f 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Components/Routes.razor +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Components/Routes.razor @@ -1,5 +1,5 @@ -@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite -@using Volo.Abp.AspNetCore.Components.Web.Theming.Routing +@using Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme.Themes.Basic +@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing @using Microsoft.Extensions.Options @inject IOptions RouterOptions diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Menus/MyProjectNameMenuContributor.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Menus/MyProjectNameMenuContributor.cs index 2a32b76193..c8c3833fa8 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Menus/MyProjectNameMenuContributor.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/Menus/MyProjectNameMenuContributor.cs @@ -1,7 +1,7 @@ using MyCompanyName.MyProjectName.Localization; -using Volo.Abp.Identity.Blazor; -using Volo.Abp.SettingManagement.Blazor.Menus; -using Volo.Abp.TenantManagement.Blazor.Navigation; +using Volo.Abp.Identity.Blazor.MudBlazor; +using Volo.Abp.SettingManagement.Blazor.MudBlazor.Menus; +using Volo.Abp.TenantManagement.Blazor.MudBlazor.Navigation; using Volo.Abp.UI.Navigation; namespace MyCompanyName.MyProjectName.Menus; diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index 8331ad2fda..fdb5742570 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -8,8 +8,6 @@ - - @@ -18,11 +16,11 @@ - - + + + - @@ -46,7 +44,7 @@ - + @@ -60,21 +58,21 @@ - + - + - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs index 8bf5f371fe..fdadb06ae6 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameModule.cs @@ -1,5 +1,3 @@ -using Blazorise.Bootstrap5; -using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection.Extensions; using Microsoft.Extensions.Options; @@ -15,10 +13,10 @@ using Volo.Abp.Account; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Components.Web; 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.Components.Server.MudBlazorBasicTheme; +using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Theme.LeptonXLite.Bundling; -using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; +using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bundling; @@ -30,10 +28,10 @@ using Volo.Abp.Emailing; using Volo.Abp.EntityFrameworkCore; using Volo.Abp.EntityFrameworkCore.SqlServer; using Volo.Abp.FeatureManagement; -using Volo.Abp.FeatureManagement.Blazor.Server; +using Volo.Abp.FeatureManagement.Blazor.MudBlazor.Server; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Identity; -using Volo.Abp.Identity.Blazor.Server; +using Volo.Abp.Identity.Blazor.MudBlazor.Server; using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.Localization; using Volo.Abp.Localization.ExceptionHandling; @@ -45,11 +43,11 @@ using Volo.Abp.PermissionManagement.HttpApi; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.PermissionManagement.OpenIddict; using Volo.Abp.SettingManagement; -using Volo.Abp.SettingManagement.Blazor.Server; +using Volo.Abp.SettingManagement.Blazor.MudBlazor.Server; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.Swashbuckle; using Volo.Abp.TenantManagement; -using Volo.Abp.TenantManagement.Blazor.Server; +using Volo.Abp.TenantManagement.Blazor.MudBlazor.Server; using Volo.Abp.TenantManagement.EntityFrameworkCore; using Volo.Abp.OpenIddict; using Volo.Abp.Security.Claims; @@ -69,7 +67,7 @@ namespace MyCompanyName.MyProjectName; typeof(AbpSwashbuckleModule), typeof(AbpAspNetCoreSerilogModule), typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), - typeof(AbpAspNetCoreComponentsServerLeptonXLiteThemeModule), + typeof(AbpAspNetCoreComponentsServerMudBlazorBasicThemeModule), // Account module packages typeof(AbpAccountApplicationModule), @@ -83,7 +81,7 @@ namespace MyCompanyName.MyProjectName; typeof(AbpIdentityHttpApiModule), typeof(AbpIdentityEntityFrameworkCoreModule), typeof(AbpOpenIddictEntityFrameworkCoreModule), - typeof(AbpIdentityBlazorServerModule), + typeof(AbpIdentityBlazorMudBlazorServerModule), // Audit logging module packages typeof(AbpAuditLoggingEntityFrameworkCoreModule), @@ -97,19 +95,19 @@ namespace MyCompanyName.MyProjectName; typeof(AbpTenantManagementApplicationModule), typeof(AbpTenantManagementHttpApiModule), typeof(AbpTenantManagementEntityFrameworkCoreModule), - typeof(AbpTenantManagementBlazorServerModule), + typeof(AbpTenantManagementBlazorMudBlazorServerModule), // Feature Management module packages typeof(AbpFeatureManagementApplicationModule), typeof(AbpFeatureManagementEntityFrameworkCoreModule), typeof(AbpFeatureManagementHttpApiModule), - typeof(AbpFeatureManagementBlazorServerModule), + typeof(AbpFeatureManagementBlazorMudBlazorServerModule), // Setting Management module packages typeof(AbpSettingManagementApplicationModule), typeof(AbpSettingManagementEntityFrameworkCoreModule), typeof(AbpSettingManagementHttpApiModule), - typeof(AbpSettingManagementBlazorServerModule) + typeof(AbpSettingManagementBlazorMudBlazorServerModule) )] public class MyProjectNameModule : AbpModule { @@ -184,7 +182,6 @@ public class MyProjectNameModule : AbpModule ConfigureSwaggerServices(context.Services); ConfigureNavigationServices(); ConfigureAutoApiControllers(); - ConfigureBlazorise(context); ConfigureRouter(context); ConfigureEfCore(context); @@ -224,7 +221,7 @@ public class MyProjectNameModule : AbpModule //BLAZOR UI options.StyleBundles.Configure( - BlazorLeptonXLiteThemeBundles.Styles.Global, + BlazorMudBlazorBasicThemeBundles.Styles.Global, bundle => { bundle.AddFiles("/blazor-global-styles.css"); @@ -299,13 +296,6 @@ public class MyProjectNameModule : AbpModule ); } - private void ConfigureBlazorise(ServiceConfigurationContext context) - { - context.Services - .AddBootstrap5Providers() - .AddFontAwesomeIcons(); - } - private void ConfigureRouter(ServiceConfigurationContext context) { Configure(options => diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/_Imports.razor b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/_Imports.razor index ad711d0c79..063a0594e4 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/_Imports.razor +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.Server/_Imports.razor @@ -8,7 +8,6 @@ @using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.JSInterop @using MyCompanyName.MyProjectName -@using Blazorise -@using Blazorise.DataGrid -@using Volo.Abp.BlazoriseUI -@using Volo.Abp.BlazoriseUI.Components +@using global::MudBlazor +@using Volo.Abp.MudBlazorUI +@using Volo.Abp.MudBlazorUI.Components diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/Menus/MyProjectNameMenuContributor.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/Menus/MyProjectNameMenuContributor.cs index efd3a3393c..f7c3af5da5 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/Menus/MyProjectNameMenuContributor.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/Menus/MyProjectNameMenuContributor.cs @@ -3,9 +3,9 @@ using MyCompanyName.MyProjectName.Localization; using MyCompanyName.MyProjectName.MultiTenancy; using Volo.Abp.Account.Localization; using Volo.Abp.Authorization.Permissions; -using Volo.Abp.Identity.Blazor; -using Volo.Abp.SettingManagement.Blazor.Menus; -using Volo.Abp.TenantManagement.Blazor.Navigation; +using Volo.Abp.Identity.Blazor.MudBlazor; +using Volo.Abp.SettingManagement.Blazor.MudBlazor.Menus; +using Volo.Abp.TenantManagement.Blazor.MudBlazor.Navigation; using Volo.Abp.UI.Navigation; namespace MyCompanyName.MyProjectName.Menus; diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj index 929c554ef2..181fdecc24 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyCompanyName.MyProjectName.Blazor.WebAssembly.Client.csproj @@ -9,19 +9,17 @@ - - - + - + - + @@ -29,9 +27,9 @@ - - - + + + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyProjectNameBlazorModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyProjectNameBlazorModule.cs index aeeec93107..0cf8f0e637 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyProjectNameBlazorModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/MyProjectNameBlazorModule.cs @@ -1,26 +1,22 @@ -using Blazorise.Bootstrap5; -using Blazorise.Icons.FontAwesome; -using Microsoft.AspNetCore.Components.Web; -using Microsoft.AspNetCore.Components.WebAssembly.Hosting; +using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using MyCompanyName.MyProjectName.Menus; using MyCompanyName.MyProjectName; using OpenIddict.Abstractions; using Volo.Abp.Account; -using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite; -using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; -using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme; +using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing; +using Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme; using Volo.Abp.Autofac.WebAssembly; using Volo.Abp.Mapperly; using Volo.Abp.FeatureManagement; using Volo.Abp.Identity; -using Volo.Abp.Identity.Blazor.WebAssembly; +using Volo.Abp.Identity.Blazor.MudBlazor.WebAssembly; using Volo.Abp.Modularity; using Volo.Abp.OpenIddict; using Volo.Abp.PermissionManagement; using Volo.Abp.SettingManagement; -using Volo.Abp.SettingManagement.Blazor.WebAssembly; +using Volo.Abp.SettingManagement.Blazor.MudBlazor.WebAssembly; using Volo.Abp.TenantManagement; -using Volo.Abp.TenantManagement.Blazor.WebAssembly; +using Volo.Abp.TenantManagement.Blazor.MudBlazor.WebAssembly; using Volo.Abp.UI.Navigation; namespace MyCompanyName.MyProjectName; @@ -30,14 +26,14 @@ namespace MyCompanyName.MyProjectName; // ABP Framework packages typeof(AbpAutofacWebAssemblyModule), - typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeModule), + typeof(AbpAspNetCoreComponentsWebAssemblyMudBlazorBasicThemeModule), // Account module packages typeof(AbpAccountHttpApiClientModule), // Identity module packages typeof(AbpIdentityHttpApiClientModule), - typeof(AbpIdentityBlazorWebAssemblyModule), + typeof(AbpIdentityBlazorMudBlazorWebAssemblyModule), typeof(AbpOpenIddictDomainSharedModule), // Permission Management module packages @@ -45,14 +41,14 @@ namespace MyCompanyName.MyProjectName; // Tenant Management module packages typeof(AbpTenantManagementHttpApiClientModule), - typeof(AbpTenantManagementBlazorWebAssemblyModule), + typeof(AbpTenantManagementBlazorMudBlazorWebAssemblyModule), // Feature Management module packages typeof(AbpFeatureManagementHttpApiClientModule), // Setting Management module packages typeof(AbpSettingManagementHttpApiClientModule), - typeof(AbpSettingManagementBlazorWebAssemblyModule) + typeof(AbpSettingManagementBlazorMudBlazorWebAssemblyModule) )] public class MyProjectNameBlazorModule : AbpModule { @@ -65,7 +61,6 @@ public class MyProjectNameBlazorModule : AbpModule ConfigureAuthentication(builder); ConfigureHttpClient(context, environment); - ConfigureBlazorise(context); ConfigureRouter(context); ConfigureMenu(context); ConfigureHttpClientProxies(context); @@ -89,13 +84,6 @@ public class MyProjectNameBlazorModule : AbpModule }); } - private void ConfigureBlazorise(ServiceConfigurationContext context) - { - context.Services - .AddBootstrap5Providers() - .AddFontAwesomeIcons(); - } - private void ConfigureHttpClientProxies(ServiceConfigurationContext context) { context.Services.AddHttpClientProxies( @@ -119,12 +107,6 @@ public class MyProjectNameBlazorModule : AbpModule }); } - private static void ConfigureUI(WebAssemblyHostBuilder builder) - { - builder.RootComponents.Add("#ApplicationContainer"); - builder.RootComponents.Add("head::after"); - } - private static void ConfigureHttpClient(ServiceConfigurationContext context, IWebAssemblyHostEnvironment environment) { context.Services.AddTransient(sp => new HttpClient diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/Routes.razor b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/Routes.razor index 12cf8988f1..c2cefa6cff 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/Routes.razor +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/Routes.razor @@ -1,5 +1,5 @@ @using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp -@using Volo.Abp.AspNetCore.Components.Web.LeptonXLiteTheme.Themes.LeptonXLite +@using Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme.Themes.Basic diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/_Imports.razor b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/_Imports.razor index cf5e05c00a..50b30731d1 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/_Imports.razor +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Client/_Imports.razor @@ -8,7 +8,6 @@ @using Microsoft.JSInterop @using Volo.Abp.AspNetCore.Components.Web @using MyCompanyName.MyProjectName -@using Blazorise -@using Blazorise.DataGrid -@using Volo.Abp.BlazoriseUI -@using Volo.Abp.BlazoriseUI.Components +@using global::MudBlazor +@using Volo.Abp.MudBlazorUI +@using Volo.Abp.MudBlazorUI.Components diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj index 4cfca64cd8..5703eebd61 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.Mongo.csproj @@ -74,7 +74,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyProjectNameHostModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyProjectNameHostModule.cs index 4985e565ba..607e26d596 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyProjectNameHostModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server.Mongo/MyProjectNameHostModule.cs @@ -11,7 +11,7 @@ using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; -using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme.Bundling; +using Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling; using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp; using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.AspNetCore.Mvc; @@ -60,7 +60,7 @@ namespace MyCompanyName.MyProjectName; typeof(AbpAutofacModule), typeof(AbpMapperlyModule), typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), - typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeBundlingModule), + typeof(AbpAspNetCoreComponentsWebAssemblyMudBlazorBasicThemeBundlingModule), typeof(AbpSwashbuckleModule), typeof(AbpAspNetCoreSerilogModule), diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj index d2dcc81851..8aef80db82 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyCompanyName.MyProjectName.Blazor.WebAssembly.Server.csproj @@ -75,7 +75,7 @@ - + diff --git a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyProjectNameHostModule.cs b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyProjectNameHostModule.cs index c4dade54cc..0753f5581d 100644 --- a/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyProjectNameHostModule.cs +++ b/templates/app-nolayers/aspnet-core/MyCompanyName.MyProjectName.Blazor.WebAssembly/Server/MyProjectNameHostModule.cs @@ -11,7 +11,7 @@ using OpenIddict.Validation.AspNetCore; using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; -using Volo.Abp.AspNetCore.Components.WebAssembly.LeptonXLiteTheme.Bundling; +using Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme.Bundling; using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp; using Volo.Abp.AspNetCore.MultiTenancy; using Volo.Abp.AspNetCore.Mvc; @@ -63,7 +63,7 @@ namespace MyCompanyName.MyProjectName; typeof(AbpMapperlyModule), typeof(AbpEntityFrameworkCoreSqlServerModule), typeof(AbpAspNetCoreMvcUiLeptonXLiteThemeModule), - typeof(AbpAspNetCoreComponentsWebAssemblyLeptonXLiteThemeBundlingModule), + typeof(AbpAspNetCoreComponentsWebAssemblyMudBlazorBasicThemeBundlingModule), typeof(AbpSwashbuckleModule), typeof(AbpAspNetCoreSerilogModule), diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj index 6418ffe6b9..88277d221c 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyCompanyName.MyProjectName.Blazor.Host.Client.csproj @@ -10,22 +10,20 @@ - - - + - - - + + + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyProjectNameBlazorHostClientModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyProjectNameBlazorHostClientModule.cs index f8f1805ea1..0f7f3a58b8 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyProjectNameBlazorHostClientModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/MyProjectNameBlazorHostClientModule.cs @@ -1,32 +1,30 @@ using System; using System.Net.Http; -using Blazorise.Bootstrap5; -using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Components.Web; using Microsoft.AspNetCore.Components.WebAssembly.Hosting; using Microsoft.Extensions.Configuration; using Microsoft.Extensions.DependencyInjection; using MyCompanyName.MyProjectName.Blazor.WebAssembly; using Volo.Abp.Account; -using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; -using Volo.Abp.AspNetCore.Components.WebAssembly.BasicTheme; +using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing; +using Volo.Abp.AspNetCore.Components.WebAssembly.MudBlazorBasicTheme; using Volo.Abp.Autofac.WebAssembly; using Volo.Abp.Mapperly; -using Volo.Abp.Identity.Blazor.WebAssembly; +using Volo.Abp.Identity.Blazor.MudBlazor.WebAssembly; using Volo.Abp.Modularity; -using Volo.Abp.SettingManagement.Blazor.WebAssembly; -using Volo.Abp.TenantManagement.Blazor.WebAssembly; +using Volo.Abp.SettingManagement.Blazor.MudBlazor.WebAssembly; +using Volo.Abp.TenantManagement.Blazor.MudBlazor.WebAssembly; using Volo.Abp.UI.Navigation; namespace MyCompanyName.MyProjectName.Blazor.Host.Client; [DependsOn( typeof(AbpAutofacWebAssemblyModule), - typeof(AbpAspNetCoreComponentsWebAssemblyBasicThemeModule), + typeof(AbpAspNetCoreComponentsWebAssemblyMudBlazorBasicThemeModule), typeof(AbpAccountApplicationContractsModule), - typeof(AbpIdentityBlazorWebAssemblyModule), - typeof(AbpTenantManagementBlazorWebAssemblyModule), - typeof(AbpSettingManagementBlazorWebAssemblyModule), + typeof(AbpIdentityBlazorMudBlazorWebAssemblyModule), + typeof(AbpTenantManagementBlazorMudBlazorWebAssemblyModule), + typeof(AbpSettingManagementBlazorMudBlazorWebAssemblyModule), typeof(MyProjectNameBlazorWebAssemblyModule) )] public class MyProjectNameBlazorHostClientModule : AbpModule @@ -38,7 +36,6 @@ public class MyProjectNameBlazorHostClientModule : AbpModule ConfigureAuthentication(builder); ConfigureHttpClient(context, environment); - ConfigureBlazorise(context); ConfigureRouter(context); ConfigureMenu(context); @@ -61,13 +58,6 @@ public class MyProjectNameBlazorHostClientModule : AbpModule }); } - private void ConfigureBlazorise(ServiceConfigurationContext context) - { - context.Services - .AddBootstrap5Providers() - .AddFontAwesomeIcons(); - } - private static void ConfigureAuthentication(WebAssemblyHostBuilder builder) { builder.Services.AddOidcAuthentication(options => diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/Routes.razor b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/Routes.razor index d7cc3acec7..61577721a5 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/Routes.razor +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/Routes.razor @@ -1,5 +1,5 @@ @using Volo.Abp.AspNetCore.Components.WebAssembly.WebApp -@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic +@using Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme.Themes.Basic diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/_Imports.razor b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/_Imports.razor index b1ade9c628..4c76904aee 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/_Imports.razor +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host.Client/_Imports.razor @@ -7,5 +7,6 @@ @using Microsoft.JSInterop @using Volo.Abp.AspNetCore.Components.WebAssembly @using MyCompanyName.MyProjectName.Blazor -@using Blazorise -@using Blazorise.DataGrid +@using MudBlazor +@using Volo.Abp.MudBlazorUI +@using Volo.Abp.MudBlazorUI.Components diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj index 2b54b7e2b9..9bc1e67264 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Host/MyCompanyName.MyProjectName.Blazor.Host.csproj @@ -16,7 +16,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Components/App.razor b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Components/App.razor index 1a129ae90c..0339a6507d 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Components/App.razor +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Components/App.razor @@ -1,8 +1,8 @@ @using Volo.Abp.Localization @using System.Globalization @using Microsoft.Extensions.Hosting -@using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling -@using Volo.Abp.AspNetCore.Components.Web.Theming.Bundling +@using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling +@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Bundling @inject IHostEnvironment Env @{ var rtl = CultureHelper.IsRtl ? "rtl" : string.Empty; @@ -17,7 +17,8 @@ MyCompanyName.MyProjectName.Blazor.Server - + + @@ -26,7 +27,7 @@ - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Components/Routes.razor b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Components/Routes.razor index b2251911fa..edf07d0af5 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Components/Routes.razor +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Components/Routes.razor @@ -1,6 +1,6 @@ -@using Volo.Abp.AspNetCore.Components.Web.Theming.Routing +@using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing @using Microsoft.Extensions.Options -@using Volo.Abp.AspNetCore.Components.Web.BasicTheme.Themes.Basic +@using Volo.Abp.AspNetCore.Components.Web.MudBlazorBasicTheme.Themes.Basic @inject IOptions RouterOptions diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Menus/MyProjectNameMenuContributor.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Menus/MyProjectNameMenuContributor.cs index 50b2e293d3..8ddab69d9e 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Menus/MyProjectNameMenuContributor.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/Menus/MyProjectNameMenuContributor.cs @@ -1,8 +1,8 @@ using System.Threading.Tasks; using MyCompanyName.MyProjectName.MultiTenancy; -using Volo.Abp.Identity.Blazor; -using Volo.Abp.SettingManagement.Blazor.Menus; -using Volo.Abp.TenantManagement.Blazor.Navigation; +using Volo.Abp.Identity.Blazor.MudBlazor; +using Volo.Abp.SettingManagement.Blazor.MudBlazor.Menus; +using Volo.Abp.TenantManagement.Blazor.MudBlazor.Navigation; using Volo.Abp.UI.Navigation; namespace MyCompanyName.MyProjectName.Blazor.Server.Host.Menus; diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj index a31f52222b..269b48d33c 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyCompanyName.MyProjectName.Blazor.Server.Host.csproj @@ -13,8 +13,6 @@ - - @@ -27,20 +25,20 @@ - + - + - + - + diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs index 452eb58b56..17ab4f1ee0 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/MyProjectNameBlazorHostModule.cs @@ -1,8 +1,6 @@ using System; using System.IO; using System.Threading.Tasks; -using Blazorise.Bootstrap5; -using Blazorise.Icons.FontAwesome; using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection; @@ -20,9 +18,9 @@ using Volo.Abp; using Volo.Abp.Account; using Volo.Abp.Account.Web; using Volo.Abp.AspNetCore.Components.Web; -using Volo.Abp.AspNetCore.Components.Server.BasicTheme; -using Volo.Abp.AspNetCore.Components.Server.BasicTheme.Bundling; -using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; +using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme; +using Volo.Abp.AspNetCore.Components.Server.MudBlazorBasicTheme.Bundling; +using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing; using Volo.Abp.AspNetCore.Mvc.Localization; using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Theme.Basic; @@ -36,7 +34,7 @@ using Volo.Abp.EntityFrameworkCore; using Volo.Abp.FeatureManagement; using Volo.Abp.FeatureManagement.EntityFrameworkCore; using Volo.Abp.Identity; -using Volo.Abp.Identity.Blazor.Server; +using Volo.Abp.Identity.Blazor.MudBlazor.Server; using Volo.Abp.Identity.EntityFrameworkCore; using Volo.Abp.Localization; using Volo.Abp.Modularity; @@ -45,11 +43,11 @@ using Volo.Abp.PermissionManagement; using Volo.Abp.PermissionManagement.EntityFrameworkCore; using Volo.Abp.PermissionManagement.Identity; using Volo.Abp.SettingManagement; -using Volo.Abp.SettingManagement.Blazor.Server; +using Volo.Abp.SettingManagement.Blazor.MudBlazor.Server; using Volo.Abp.SettingManagement.EntityFrameworkCore; using Volo.Abp.Swashbuckle; using Volo.Abp.TenantManagement; -using Volo.Abp.TenantManagement.Blazor.Server; +using Volo.Abp.TenantManagement.Blazor.MudBlazor.Server; using Volo.Abp.TenantManagement.EntityFrameworkCore; using Volo.Abp.UI.Navigation; using Volo.Abp.UI.Navigation.Urls; @@ -68,20 +66,20 @@ namespace MyCompanyName.MyProjectName.Blazor.Server.Host; typeof(AbpAccountWebOpenIddictModule), typeof(AbpAccountApplicationModule), typeof(AbpAccountHttpApiModule), - typeof(AbpAspNetCoreComponentsServerBasicThemeModule), + typeof(AbpAspNetCoreComponentsServerMudBlazorBasicThemeModule), typeof(AbpIdentityApplicationModule), typeof(AbpIdentityEntityFrameworkCoreModule), typeof(AbpAuditLoggingEntityFrameworkCoreModule), - typeof(AbpIdentityBlazorServerModule), + typeof(AbpIdentityBlazorMudBlazorServerModule), typeof(AbpFeatureManagementApplicationModule), typeof(AbpFeatureManagementEntityFrameworkCoreModule), - typeof(AbpTenantManagementBlazorServerModule), + typeof(AbpTenantManagementBlazorMudBlazorServerModule), typeof(AbpTenantManagementApplicationModule), typeof(AbpTenantManagementEntityFrameworkCoreModule), typeof(AbpPermissionManagementEntityFrameworkCoreModule), typeof(AbpPermissionManagementDomainIdentityModule), typeof(AbpPermissionManagementApplicationModule), - typeof(AbpSettingManagementBlazorServerModule), + typeof(AbpSettingManagementBlazorMudBlazorServerModule), typeof(AbpSettingManagementApplicationModule), typeof(AbpSettingManagementEntityFrameworkCoreModule), typeof(MyProjectNameBlazorServerModule) @@ -152,7 +150,7 @@ public class MyProjectNameBlazorHostModule : AbpModule //BLAZOR UI options.StyleBundles.Configure( - BlazorBasicThemeBundles.Styles.Global, + BlazorMudBlazorBasicThemeBundles.Styles.Global, bundle => { bundle.AddFiles("/blazor-global-styles.css"); @@ -210,10 +208,6 @@ public class MyProjectNameBlazorHostModule : AbpModule options.IsEnabled = MultiTenancyConsts.IsEnabled; }); - context.Services - .AddBootstrap5Providers() - .AddFontAwesomeIcons(); - Configure(options => { options.MenuContributors.Add(new MyProjectNameMenuContributor()); diff --git a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/_Imports.razor b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/_Imports.razor index 82279dd28a..26389b17ac 100644 --- a/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/_Imports.razor +++ b/templates/module/aspnet-core/host/MyCompanyName.MyProjectName.Blazor.Server.Host/_Imports.razor @@ -8,7 +8,6 @@ @using static Microsoft.AspNetCore.Components.Web.RenderMode @using Microsoft.JSInterop @using MyCompanyName.MyProjectName.Blazor.Server -@using Blazorise -@using Blazorise.DataGrid -@using Volo.Abp.BlazoriseUI -@using Volo.Abp.BlazoriseUI.Components +@using MudBlazor +@using Volo.Abp.MudBlazorUI +@using Volo.Abp.MudBlazorUI.Components diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj index debf160188..de882113dd 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyCompanyName.MyProjectName.Blazor.Server.csproj @@ -8,7 +8,7 @@ - + diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs index 42d94ec462..cb9703695d 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.Server/MyProjectNameBlazorServerModule.cs @@ -1,10 +1,10 @@ -using Volo.Abp.AspNetCore.Components.Server.Theming; +using Volo.Abp.AspNetCore.Components.Server.Theming.MudBlazor; using Volo.Abp.Modularity; namespace MyCompanyName.MyProjectName.Blazor.Server; [DependsOn( - typeof(AbpAspNetCoreComponentsServerThemingModule), + typeof(AbpAspNetCoreComponentsServerThemingMudBlazorModule), typeof(MyProjectNameBlazorModule) )] public class MyProjectNameBlazorServerModule : AbpModule diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj index 0eb1577f2d..f764d2736e 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyCompanyName.MyProjectName.Blazor.WebAssembly.csproj @@ -8,7 +8,7 @@ - + diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyProjectNameBlazorWebAssemblyModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyProjectNameBlazorWebAssemblyModule.cs index e705cbabc3..703ecbb221 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyProjectNameBlazorWebAssemblyModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor.WebAssembly/MyProjectNameBlazorWebAssemblyModule.cs @@ -1,4 +1,4 @@ -using Volo.Abp.AspNetCore.Components.WebAssembly.Theming; +using Volo.Abp.AspNetCore.Components.WebAssembly.Theming.MudBlazor; using Volo.Abp.Modularity; namespace MyCompanyName.MyProjectName.Blazor.WebAssembly; @@ -6,7 +6,7 @@ namespace MyCompanyName.MyProjectName.Blazor.WebAssembly; [DependsOn( typeof(MyProjectNameBlazorModule), typeof(MyProjectNameHttpApiClientModule), - typeof(AbpAspNetCoreComponentsWebAssemblyThemingModule) + typeof(AbpAspNetCoreComponentsWebAssemblyThemingMudBlazorModule) )] public class MyProjectNameBlazorWebAssemblyModule : AbpModule { diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj index 682ca7eaa3..6ec1b992d6 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyCompanyName.MyProjectName.Blazor.csproj @@ -9,7 +9,7 @@ - + diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs index 1dcb64b5c5..7fa03428f9 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/MyProjectNameBlazorModule.cs @@ -1,7 +1,7 @@ using Microsoft.Extensions.DependencyInjection; using MyCompanyName.MyProjectName.Blazor.Menus; -using Volo.Abp.AspNetCore.Components.Web.Theming; -using Volo.Abp.AspNetCore.Components.Web.Theming.Routing; +using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor; +using Volo.Abp.AspNetCore.Components.Web.Theming.MudBlazor.Routing; using Volo.Abp.Mapperly; using Volo.Abp.Modularity; using Volo.Abp.UI.Navigation; @@ -10,7 +10,7 @@ namespace MyCompanyName.MyProjectName.Blazor; [DependsOn( typeof(MyProjectNameApplicationContractsModule), - typeof(AbpAspNetCoreComponentsWebThemingModule), + typeof(AbpAspNetCoreComponentsWebThemingMudBlazorModule), typeof(AbpMapperlyModule) )] public class MyProjectNameBlazorModule : AbpModule diff --git a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor index 43b30f8498..690be9c8cf 100644 --- a/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor +++ b/templates/module/aspnet-core/src/MyCompanyName.MyProjectName.Blazor/_Imports.razor @@ -1,5 +1,4 @@ @using Microsoft.AspNetCore.Components.Web @using Volo.Abp.AspNetCore.Components.Web -@using Volo.Abp.BlazoriseUI -@using Blazorise -@using Blazorise.DataGrid \ No newline at end of file +@using Volo.Abp.MudBlazorUI +@using global::MudBlazor \ No newline at end of file