Added MudBlazor components.

This commit is contained in:
2026-05-24 14:28:18 +02:00
parent 879fe283ee
commit e3c11b841d
20 changed files with 192 additions and 255 deletions
+1 -3
View File
@@ -4,16 +4,14 @@
https://learn.microsoft.com/en-us/nuget/consume-packages/Central-Package-Management -->
<ManagePackageVersionsCentrally>true</ManagePackageVersionsCentrally>
</PropertyGroup>
<ItemGroup>
<PackageVersion Include="Grpc.AspNetCore" Version="2.64.0" />
<PackageVersion Include="MudBlazor" Version="9.4.0" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Microsoft.AspNetCore.Diagnostics.EntityFrameworkCore" Version="10.0.7" />
<PackageVersion Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.7" />
</ItemGroup>
<ItemGroup>
<PackageVersion Include="Microsoft.EntityFrameworkCore" Version="10.0.7" />
<PackageVersion Include="Microsoft.EntityFrameworkCore.Design" Version="10.0.7">
@@ -1,5 +1,5 @@
@inherits LayoutComponentBase
@layout Somnia.Core.Components.Layout.EmptyLayout
@layout Somnia.Core.Components.Layout.CommonLayout
<h1>Manage your account</h1>
+18 -2
View File
@@ -6,8 +6,14 @@
<meta name="viewport" content="width=device-width, initial-scale=1.0" />
<base href="/" />
<ResourcePreloader />
<link rel="stylesheet" href="@Assets["lib/bootstrap/dist/css/bootstrap.min.css"]" />
<script src="@Assets["lib/bootstrap/dist/js/bootstrap.bundle.min.js"]" ></script>
<script src="@Assets["lib/bootstrap/dist/js/bootstrap.bundle.min.js"]"></script>
<link href="https://fonts.googleapis.com/css2?family=Roboto:ital,wght@0,100..900;1,100..900&display=swap"
rel="stylesheet" />
<link href="@Assets["_content/MudBlazor/MudBlazor.min.css"]" rel="stylesheet" />
<link rel="stylesheet" href="@Assets["app.css"]" />
<link rel="stylesheet" href="@Assets["Somnia.Core.styles.css"]" />
<ImportMap />
@@ -16,10 +22,20 @@
</head>
<body>
<Routes />
<Routes @rendermode="PageRenderMode" />
<ReconnectModal />
<script src="@Assets["_framework/blazor.web.js"]"></script>
<script src="@Assets["_content/MudBlazor/MudBlazor.min.js"]"></script>
<script src="@Assets["Components/Account/Shared/PasskeySubmit.razor.js"]" type="module"></script>
</body>
</html>
@code {
[CascadingParameter]
private HttpContext HttpContext { get; set; } = default!;
private IComponentRenderMode? PageRenderMode =>
HttpContext.AcceptsInteractiveRouting() ? InteractiveServer : null;
}
@@ -1,30 +1,48 @@
<AuthorizeView>
<Authorized>
<div class="dropdown dropstart">
<button class="btn btn-secondary dropdown-toggle" type="button" data-bs-toggle="dropdown"
aria-expanded="false">
Account
</button>
<div class="dropdown-menu">
<p class="dropdown-item-text">@context.User.Identity!.Name</p>
<hr class="dropdown-divider">
<a class="dropdown-item" href="Account/Manage">Manage Account</a>
<form action="Account/Logout" method="post" class="dropdown-item">
<AntiforgeryToken />
<input type="hidden" name="ReturnUrl" value="" />
<button type="submit" class="btn">
<span class="bi bi-arrow-bar-left-nav-menu" aria-hidden="true"></span> Logout
</button>
</form>
</div>
@implements IDisposable
@inject NavigationManager NavMng
</div>
<AuthorizeView>
<Authorized>
<MudNavGroup Title="Account" Expanded="true">
<MudText Class="pl-4">
<MudIcon Icon="@Icons.Material.Filled.Person" />
@context.User.Identity?.Name
</MudText>
<MudDivider />
<MudNavLink Href="Account/Manage" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Settings">
Manage Account
</MudNavLink>
<form action="Account/Logout" method="post" class="mud-nav-item">
<AntiforgeryToken />
<input type="hidden" name="ReturnUrl" value="@currentUrl" />
<button type="submit" class="mud-nav-link mud-ripple">
<MudIcon Icon="@Icons.Material.Filled.Logout" Color="Color.Info" Class="mr-3"></MudIcon> Logout
</button>
</form>
</MudNavGroup>
</Authorized>
<NotAuthorized>
<a class="btn" href="Account/Login">Login</a>
<MudNavLink Href="Account/Login">Login</MudNavLink>
</NotAuthorized>
</AuthorizeView>
@code {
private string? currentUrl;
protected override void OnInitialized()
{
currentUrl = NavMng.ToBaseRelativePath(NavMng.Uri);
NavMng.LocationChanged += OnLocationChanged;
}
private void OnLocationChanged(object? sender, LocationChangedEventArgs e)
{
currentUrl = NavMng.ToBaseRelativePath(e.Location);
StateHasChanged();
}
public void Dispose()
{
NavMng.LocationChanged -= OnLocationChanged;
}
}
@@ -1 +1 @@
@layout MainLayout
@layout CoreLayout
@@ -0,0 +1,31 @@
@using Microsoft.AspNetCore.Components.Sections
@using Somnia.Core.Components.Controls
@inherits LayoutComponentBase
@layout MainLayout
<SectionContent SectionId="MainLayout.AppBarSection">
<a class="navbar-brand" href="/">
<img src="/resources/SR2.svg" alt="SomniaLogo" height="35" class="d-inline-block">
Somnia
</a>
</SectionContent>
<SectionContent SectionId="MainLayout.AppDrawerSection">
<MudDrawerHeader>
<MudText Typo="Typo.h5" Class="mt-1">Somnia</MudText>
</MudDrawerHeader>
<MudNavMenu>
<MudNavLink Href="/" Match="NavLinkMatch.All">Dashboard</MudNavLink>
<MudNavLink Href="/select-module" Match="NavLinkMatch.Prefix">Module Select</MudNavLink>
<MudNavLink Disabled>Disabled</MudNavLink>
<AccountControl />
</MudNavMenu>
</SectionContent>
<div class="page">
<main>
<article class="content px-4">
@Body
</article>
</main>
</div>
@@ -0,0 +1,26 @@
@using Microsoft.AspNetCore.Components.Sections
@using Somnia.Core.Components.Controls
@inherits LayoutComponentBase
@layout MainLayout
<SectionContent SectionId="MainLayout.AppBarSection">
<div class="top-row px-4">
<a href="/" target="_self">To module select</a>
<a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
</div>
</SectionContent>
<SectionContent SectionId="MainLayout.AppDrawerSection">
<MudDrawerHeader>
<MudText Typo="Typo.h5" Class="mt-1">Somnia.Core</MudText>
</MudDrawerHeader>
<NavMenu />
</SectionContent>
<div class="page">
<main>
<article class="content px-4">
@Body
</article>
</main>
</div>
@@ -1,32 +0,0 @@
@using Somnia.Core.Components.Controls
@inherits LayoutComponentBase
<div class="page">
<main>
<nav class="navbar navbar-expand-sm bg-body-secondary">
<div class="container-fluid">
<a class="navbar-brand" href="/">
<img src="/resources/SR2.svg" alt="SomniaLogo" height="35" class="d-inline-block">
Somnia
</a>
<button class="navbar-toggler" type="button" data-bs-toggle="collapse"
data-bs-target="#navbarNavAltMarkup" aria-controls="navbarNavAltMarkup" aria-expanded="false"
aria-label="Toggle navigation">
<span class="navbar-toggler-icon"></span>
</button>
<div class="collapse navbar-collapse" id="navbarNavAltMarkup">
<div class="navbar-nav me-auto">
<a class="nav-link active" aria-current="page" href="/">Dashboard</a>
<a class="nav-link active" aria-current="page" href="/select-module">Module Select</a>
<a class="nav-link disabled" aria-disabled="true">Disabled</a>
</div>
<AccountControl />
</div>
</div>
</nav>
<article class="content px-4">
@Body
</article>
</main>
</div>
@@ -1,24 +1,45 @@
@inherits LayoutComponentBase
@using Microsoft.AspNetCore.Components.Sections
@inherits LayoutComponentBase
<div class="page">
<div class="sidebar">
<NavMenu />
</div>
@* Required *@
<MudThemeProvider />
<MudPopoverProvider />
<main>
<div class="top-row px-4">
<a href="/" target="_self">To module select</a>
<a href="https://learn.microsoft.com/aspnet/core/" target="_blank">About</a>
</div>
@* Needed for dialogs *@
<MudDialogProvider />
<article class="content px-4">
@Body
</article>
</main>
</div>
@* Needed for snackbars *@
<MudSnackbarProvider />
<MudLayout>
<MudAppBar Elevation="1">
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start"
OnClick="@((e) => DrawerToggle())" />
<MudSpacer />
<SectionOutlet SectionId="AppBarSection" />
</MudAppBar>
<MudDrawer @bind-Open="@_drawerOpen" Elevation="2">
<SectionOutlet SectionId="AppDrawerSection" />
</MudDrawer>
<MudMainContent>
@Body
</MudMainContent>
</MudLayout>
<div id="blazor-error-ui" data-nosnippet>
An unhandled error has occurred.
<a href="." class="reload">Reload</a>
<span class="dismiss">🗙</span>
</div>
@code {
internal static object AppBarSection = new();
internal static object AppDrawerSection = new();
bool _drawerOpen = true;
void DrawerToggle()
{
_drawerOpen = !_drawerOpen;
}
}
@@ -1,4 +1,4 @@
.page {
/* .page {
position: relative;
display: flex;
flex-direction: column;
@@ -74,7 +74,7 @@ main {
padding-left: 2rem !important;
padding-right: 1.5rem !important;
}
}
} */
#blazor-error-ui {
color-scheme: light only;
+15 -35
View File
@@ -1,35 +1,15 @@
<div class="top-row ps-3 navbar navbar-dark">
<div class="container-fluid">
<a class="navbar-brand" href="">Somnia.Core</a>
</div>
</div>
<input type="checkbox" title="Navigation menu" class="navbar-toggler" />
<div class="nav-scrollable" onclick="document.querySelector('.navbar-toggler').click()">
<nav class="nav flex-column">
<div class="nav-item px-3">
<NavLink class="nav-link" href="core" Match="NavLinkMatch.All">
<span class="bi bi-house-door-fill-nav-menu" aria-hidden="true"></span> Home
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="core/counter">
<span class="bi bi-plus-square-fill-nav-menu" aria-hidden="true"></span> Counter
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="core/weather">
<span class="bi bi-list-nested-nav-menu" aria-hidden="true"></span> Weather
</NavLink>
</div>
<div class="nav-item px-3">
<NavLink class="nav-link" href="core/auth">
<span class="bi bi-lock-nav-menu" aria-hidden="true"></span> Auth Required
</NavLink>
</div>
</nav>
</div>
@using Somnia.Core.Components.Controls
<MudNavMenu>
<MudNavLink Href="/core/" Match="NavLinkMatch.All" Icon="@Icons.Material.Filled.Home">
Home
</MudNavLink>
<MudNavLink Href="/core/counter" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Add">
Counter
</MudNavLink>
<MudNavLink Href="/core/weather" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.List">
Weather
</MudNavLink>
<MudNavLink Href="/core/auth" Match="NavLinkMatch.Prefix" Icon="@Icons.Material.Filled.Lock">
Auth Required
</MudNavLink>
</MudNavMenu>
@@ -1,125 +0,0 @@
.navbar-toggler {
appearance: none;
cursor: pointer;
width: 3.5rem;
height: 2.5rem;
color: white;
position: absolute;
top: 0.5rem;
right: 1rem;
border: 1px solid rgba(255, 255, 255, 0.1);
background: url("data:image/svg+xml,%3csvg xmlns='http://www.w3.org/2000/svg' viewBox='0 0 30 30'%3e%3cpath stroke='rgba%28255, 255, 255, 0.55%29' stroke-linecap='round' stroke-miterlimit='10' stroke-width='2' d='M4 7h22M4 15h22M4 23h22'/%3e%3c/svg%3e") no-repeat center/1.75rem rgba(255, 255, 255, 0.1);
}
.navbar-toggler:checked {
background-color: rgba(255, 255, 255, 0.5);
}
.top-row {
min-height: 3.5rem;
background-color: rgba(0,0,0,0.4);
}
.navbar-brand {
font-size: 1.1rem;
}
.bi {
display: inline-block;
position: relative;
width: 1.25rem;
height: 1.25rem;
margin-right: 0.75rem;
top: -1px;
background-size: cover;
}
.bi-house-door-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-house-door-fill' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 14.5v-3.505c0-.245.25-.495.5-.495h2c.25 0 .5.25.5.5v3.5a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5v-7a.5.5 0 0 0-.146-.354L13 5.793V2.5a.5.5 0 0 0-.5-.5h-1a.5.5 0 0 0-.5.5v1.293L8.354 1.146a.5.5 0 0 0-.708 0l-6 6A.5.5 0 0 0 1.5 7.5v7a.5.5 0 0 0 .5.5h4a.5.5 0 0 0 .5-.5Z'/%3E%3C/svg%3E");
}
.bi-plus-square-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-plus-square-fill' viewBox='0 0 16 16'%3E%3Cpath d='M2 0a2 2 0 0 0-2 2v12a2 2 0 0 0 2 2h12a2 2 0 0 0 2-2V2a2 2 0 0 0-2-2H2zm6.5 4.5v3h3a.5.5 0 0 1 0 1h-3v3a.5.5 0 0 1-1 0v-3h-3a.5.5 0 0 1 0-1h3v-3a.5.5 0 0 1 1 0z'/%3E%3C/svg%3E");
}
.bi-list-nested-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath fill-rule='evenodd' d='M4.5 11.5A.5.5 0 0 1 5 11h10a.5.5 0 0 1 0 1H5a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 3 7h10a.5.5 0 0 1 0 1H3a.5.5 0 0 1-.5-.5zm-2-4A.5.5 0 0 1 1 3h10a.5.5 0 0 1 0 1H1a.5.5 0 0 1-.5-.5z'/%3E%3C/svg%3E");
}
.bi-lock-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-list-nested' viewBox='0 0 16 16'%3E%3Cpath d='M8 1a2 2 0 0 1 2 2v4H6V3a2 2 0 0 1 2-2zm3 6V3a3 3 0 0 0-6 0v4a2 2 0 0 0-2 2v5a2 2 0 0 0 2 2h6a2 2 0 0 0 2-2V9a2 2 0 0 0-2-2zM5 8h6a1 1 0 0 1 1 1v5a1 1 0 0 1-1 1H5a1 1 0 0 1-1-1V9a1 1 0 0 1 1-1z'/%3E%3C/svg%3E");
}
.bi-person-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-person' viewBox='0 0 16 16'%3E%3Cpath d='M8 8a3 3 0 1 0 0-6 3 3 0 0 0 0 6Zm2-3a2 2 0 1 1-4 0 2 2 0 0 1 4 0Zm4 8c0 1-1 1-1 1H3s-1 0-1-1 1-4 6-4 6 3 6 4Zm-1-.004c-.001-.246-.154-.986-.832-1.664C11.516 10.68 10.289 10 8 10c-2.29 0-3.516.68-4.168 1.332-.678.678-.83 1.418-.832 1.664h10Z'/%3E%3C/svg%3E");
}
.bi-person-badge-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-person-badge' viewBox='0 0 16 16'%3E%3Cpath d='M6.5 2a.5.5 0 0 0 0 1h3a.5.5 0 0 0 0-1h-3zM11 8a3 3 0 1 1-6 0 3 3 0 0 1 6 0z'/%3E%3Cpath d='M4.5 0A2.5 2.5 0 0 0 2 2.5V14a2 2 0 0 0 2 2h8a2 2 0 0 0 2-2V2.5A2.5 2.5 0 0 0 11.5 0h-7zM3 2.5A1.5 1.5 0 0 1 4.5 1h7A1.5 1.5 0 0 1 13 2.5v10.795a4.2 4.2 0 0 0-.776-.492C11.392 12.387 10.063 12 8 12s-3.392.387-4.224.803a4.2 4.2 0 0 0-.776.492V2.5z'/%3E%3C/svg%3E");
}
.bi-person-fill-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-person-fill' viewBox='0 0 16 16'%3E%3Cpath d='M3 14s-1 0-1-1 1-4 6-4 6 3 6 4-1 1-1 1H3Zm5-6a3 3 0 1 0 0-6 3 3 0 0 0 0 6Z'/%3E%3C/svg%3E");
}
.bi-arrow-bar-left-nav-menu {
background-image: url("data:image/svg+xml,%3Csvg xmlns='http://www.w3.org/2000/svg' width='16' height='16' fill='white' class='bi bi-arrow-bar-left' viewBox='0 0 16 16'%3E%3Cpath d='M12.5 15a.5.5 0 0 1-.5-.5v-13a.5.5 0 0 1 1 0v13a.5.5 0 0 1-.5.5ZM10 8a.5.5 0 0 1-.5.5H3.707l2.147 2.146a.5.5 0 0 1-.708.708l-3-3a.5.5 0 0 1 0-.708l3-3a.5.5 0 1 1 .708.708L3.707 7.5H9.5a.5.5 0 0 1 .5.5Z'/%3E%3C/svg%3E");
}
.nav-item {
font-size: 0.9rem;
padding-bottom: 0.5rem;
}
.nav-item:first-of-type {
padding-top: 1rem;
}
.nav-item:last-of-type {
padding-bottom: 1rem;
}
.nav-item ::deep .nav-link {
color: #d7d7d7;
background: none;
border: none;
border-radius: 4px;
height: 3rem;
display: flex;
align-items: center;
line-height: 3rem;
width: 100%;
}
.nav-item ::deep a.active {
background-color: rgba(255,255,255,0.37);
color: white;
}
.nav-item ::deep .nav-link:hover {
background-color: rgba(255,255,255,0.1);
color: white;
}
.nav-scrollable {
display: none;
}
.navbar-toggler:checked ~ .nav-scrollable {
display: block;
}
@media (min-width: 641px) {
.navbar-toggler {
display: none;
}
.nav-scrollable {
/* Never collapse the sidebar for wide screens */
display: block;
/* Allow sidebar to scroll for tall menus */
height: calc(100vh - 3.5rem);
overflow-y: auto;
}
}
+1 -1
View File
@@ -1,7 +1,7 @@
@using Microsoft.AspNetCore.Authorization
@page "/"
@layout EmptyLayout
@layout CommonLayout
<PageTitle>Somnia</PageTitle>
@@ -1,7 +1,7 @@
@using Microsoft.AspNetCore.Authorization
@page "/select-module"
@layout EmptyLayout
@layout CommonLayout
@attribute [Authorize]
<PageTitle>Somnia</PageTitle>
@@ -10,20 +10,17 @@
<h1>Good Day, @context.User.Identity?.Name!</h1>
<p>Select a module to start</p>
<div class="container text-center w-100">
<div class="row row-cols-auto">
@foreach (Module mod in moduleList)
{
<div class="col m-2 card" style="width: 18rem;">
<img src="@mod.Icon" class="card-img-top" alt="Module Icon">
<div class="card-body">
<h5 class="card-title">@mod.Name</h5>
<a href="@mod.Path" class="btn btn-primary stretched-link">Go to Module</a>
</div>
</div>
}
</div>
</div>
<MudStack Row=true Wrap="Wrap.Wrap">
@foreach (Module mod in moduleList)
{
<MudLink Href="@mod.Path">
<MudCard>
<MudCardMedia Image="@mod.Icon" Style="width: 18rem;" />
<MudCardHeader>@mod.Name</MudCardHeader>
</MudCard>
</MudLink>
}
</MudStack>
</AuthorizeView>
@code {
@@ -1,5 +1,5 @@
@page "/not-found"
@layout EmptyLayout
@layout CommonLayout
<h3>Not Found</h3>
<p>Sorry, the content you are looking for does not exist.</p>
+1 -1
View File
@@ -1,7 +1,7 @@
@using Somnia.Core.Components.Account.Shared
<Router AppAssembly="typeof(Program).Assembly" NotFoundPage="typeof(Pages.NotFound)">
<Found Context="routeData">
<AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(Layout.EmptyLayout)">
<AuthorizeRouteView RouteData="routeData" DefaultLayout="typeof(Layout.CommonLayout)">
<NotAuthorized>
<RedirectToLogin />
</NotAuthorized>
@@ -7,6 +7,7 @@
@using static Microsoft.AspNetCore.Components.Web.RenderMode
@using Microsoft.AspNetCore.Components.Web.Virtualization
@using Microsoft.JSInterop
@using MudBlazor
@using Somnia.Core
@using Somnia.Core.Components
@using Somnia.Core.Components.Layout
+5
View File
@@ -2,6 +2,7 @@ using Microsoft.AspNetCore.Components.Authorization;
using Microsoft.AspNetCore.DataProtection;
using Microsoft.AspNetCore.Identity;
using Microsoft.EntityFrameworkCore;
using MudBlazor.Services;
using Somnia.Core.Components;
using Somnia.Core.Components.Account;
using Somnia.Core.Data;
@@ -31,6 +32,10 @@ builder.Services.AddDatabaseDeveloperPageExceptionFilter();
builder.Services.AddRazorComponents()
.AddInteractiveServerComponents();
builder.Services.AddMudServices();
builder.Services.AddCascadingAuthenticationState();
builder.Services.AddScoped<IdentityRedirectManager>();
builder.Services.AddScoped<AuthenticationStateProvider, IdentityRevalidatingAuthenticationStateProvider>();
+1
View File
@@ -14,6 +14,7 @@
<ItemGroup>
<PackageReference Include="Grpc.AspNetCore" />
<PackageReference Include="MudBlazor" />
</ItemGroup>
<ItemGroup>