Skip to content
This repository was archived by the owner on Apr 11, 2024. It is now read-only.

Commit d5dc12d

Browse files
ratanparairatanparai
authored
feat(frontend-blazor): update MudBlazor to v5 (#386)
1 parent cf8f80a commit d5dc12d

4 files changed

Lines changed: 28 additions & 32 deletions

File tree

‎src/Web/Frontend.Blazor/Frontend.Blazor.Client/Frontend.Blazor.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="5.0.5"/>
1111
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="5.0.5" PrivateAssets="all"/>
1212
<PackageReference Include="Microsoft.Extensions.Http" Version="5.0.0"/>
13-
<PackageReference Include="MudBlazor" Version="1.2.4"/>
13+
<PackageReference Include="MudBlazor" Version="5.0.7"/>
1414
<PackageReference Include="System.Net.Http.Json" Version="5.0.0"/>
1515
<PackageReference Include="StrawberryShake" Version="11.0.0-preview.137"/>
1616
</ItemGroup>

‎src/Web/Frontend.Blazor/Frontend.Blazor.Client/Program.cs‎

Lines changed: 19 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -1,27 +1,24 @@
1-
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
2-
using Microsoft.Extensions.Configuration;
3-
using Microsoft.Extensions.DependencyInjection;
4-
using Microsoft.Extensions.Logging;
51
using System;
6-
using System.Collections.Generic;
72
using System.Net.Http;
83
using System.Net.Http.Json;
9-
using System.Text;
104
using System.Threading.Tasks;
5+
using Microsoft.AspNetCore.Components.WebAssembly.Hosting;
6+
using Microsoft.Extensions.DependencyInjection;
117
using MudBlazor;
128
using MudBlazor.Services;
139
using OpenCodeFoundation.ESchool.Web.Frontend.Blazor.Shared;
1410

1511
namespace OpenCodeFoundation.ESchool.Web.Frontend.Blazor.Client
1612
{
17-
public class Program
13+
public static class Program
1814
{
1915
public static async Task Main(string[] args)
2016
{
2117
var builder = WebAssemblyHostBuilder.CreateDefault(args);
2218
builder.RootComponents.Add<App>("#app");
2319

24-
var settings = await LoadFrontendSettings(builder);
20+
var settings = await LoadFrontendSettings(builder)
21+
.ConfigureAwait(false);
2522
builder.Services.AddSingleton(settings);
2623

2724
builder.Services.AddHttpClient("EschoolClient", client =>
@@ -30,35 +27,34 @@ public static async Task Main(string[] args)
3027
});
3128
builder.Services.AddEschoolClient();
3229

33-
builder.Services.AddScoped(sp => new HttpClient { BaseAddress = new Uri(builder.HostEnvironment.BaseAddress) });
30+
builder.Services.AddScoped(_ =>
31+
new HttpClient
32+
{
33+
BaseAddress = new Uri(builder.HostEnvironment.BaseAddress),
34+
});
3435

35-
builder.Services.AddMudBlazorDialog();
36-
builder.Services.AddMudBlazorSnackbar(config =>
36+
builder.Services.AddMudServices(config =>
3737
{
38-
config.PositionClass = Defaults.Classes.Position.BottomRight;
39-
config.SnackbarVariant = Variant.Filled;
38+
config.SnackbarConfiguration.PositionClass = Defaults.Classes.Position.BottomRight;
39+
config.SnackbarConfiguration.SnackbarVariant = Variant.Filled;
4040
});
41-
builder.Services.AddMudBlazorResizeListener();
4241

43-
await builder.Build().RunAsync();
42+
await builder.Build().RunAsync().ConfigureAwait(false);
4443
}
4544

4645
private static async Task<FrontendSettings> LoadFrontendSettings(WebAssemblyHostBuilder builder)
4746
{
4847
using var http = new HttpClient()
4948
{
50-
BaseAddress = new Uri(builder.HostEnvironment.BaseAddress)
49+
BaseAddress = new Uri(builder.HostEnvironment.BaseAddress),
5150
};
5251

5352
var settings = await http
54-
.GetFromJsonAsync<FrontendSettings>("appsettings");
55-
56-
if (settings is null)
57-
{
58-
throw new ArgumentNullException(nameof(settings));
59-
}
53+
.GetFromJsonAsync<FrontendSettings>("appsettings")
54+
.ConfigureAwait(false);
6055

61-
return settings;
56+
return settings ?? throw new InvalidOperationException(
57+
"Failed to load settings");
6258
}
6359
}
6460
}

‎src/Web/Frontend.Blazor/Frontend.Blazor.Client/Shared/MainLayout.razor‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -6,10 +6,10 @@
66

77
<MudLayout>
88
<MudAppBar Elevation="1">
9-
<MudIconButton Icon="@Icons.Material.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@((e) => DrawerToggle())" />
9+
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" OnClick="@((e) => DrawerToggle())" />
1010
<MudAppBarSpacer />
11-
<MudIconButton Icon="@Icons.Custom.MudBlazor" Color="Color.Inherit" Link="https://mudblazor.com/" Target="_blank" />
12-
<MudIconButton Icon="@Icons.Custom.GitHub" Color="Color.Inherit" Link="https://github.com/Garderoben/MudBlazor" Target="_blank" />
11+
<MudIconButton Icon="@Icons.Custom.Brands.MudBlazor" Color="Color.Inherit" Link="https://mudblazor.com/" Target="_blank" />
12+
<MudIconButton Icon="@Icons.Custom.Brands.GitHub" Color="Color.Inherit" Link="https://github.com/Garderoben/MudBlazor" Target="_blank" />
1313
</MudAppBar>
1414
<MudDrawer Open="_drawerOpen" Elevation="2">
1515
<MudDrawerHeader>

‎src/Web/Frontend.Blazor/Frontend.Blazor.Client/Shared/NavMenu.razor‎

Lines changed: 5 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -1,14 +1,14 @@
11
<MudNavMenu>
2-
<MudNavLink Href="" Match="NavLinkMatch.All" Icon="@Filled.Home">Home</MudNavLink>
3-
<MudNavLink Href="/counter" Match="NavLinkMatch.Prefix" Icon="@Filled.Add">Counter</MudNavLink>
4-
<MudNavGroup Title="Enrollments" Icon="@Filled.ContactMail">
2+
<MudNavLink Href="" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Home">Home</MudNavLink>
3+
<MudNavLink Href="/counter" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Add">Counter</MudNavLink>
4+
<MudNavGroup Title="Enrollments" Icon="@Icons.Material.Filled.ContactMail">
55
<MudNavLink
66
Href="/enrollments"
77
Match="NavLinkMatch.Prefix"
8-
Icon="@Filled.LibraryBooks">List</MudNavLink>
8+
Icon="@Icons.Material.Filled.LibraryBooks">List</MudNavLink>
99
<MudNavLink
1010
Href="/enrollments/create"
1111
Match="NavLinkMatch.Prefix"
12-
Icon="@Filled.Create">Create</MudNavLink>
12+
Icon="@Icons.Material.Filled.Create">Create</MudNavLink>
1313
</MudNavGroup>
1414
</MudNavMenu>

0 commit comments

Comments
 (0)