Skip to content

Update dependencies, migrate to MudBlazor 9, and refresh theme palette #69

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
neozhu merged 1 commit into from
Mar 1, 2026
Merged

Update dependencies, migrate to MudBlazor 9, and refresh theme palette #69

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 5 additions & 5 deletions src/CleanAspire.Api/CleanAspire.Api.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -14,18 +14,18 @@
<ItemGroup>
<PackageReference Include="Bogus" Version="35.6.5" />
<PackageReference Include="Google.Apis.Auth" Version="1.73.0" />
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.0">
<PackageReference Include="Microsoft.AspNetCore.Authentication.Google" Version="10.0.3" />
<PackageReference Include="Microsoft.AspNetCore.OpenApi" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.ApiDescription.Server" Version="10.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>

<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.0">
<PackageReference Include="Microsoft.EntityFrameworkCore.Tools" Version="10.0.3">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="Scalar.AspNetCore" Version="2.11.0" />
<PackageReference Include="Scalar.AspNetCore" Version="2.12.50" />
<PackageReference Include="Scrutor" Version="7.0.0" />

<PackageReference Include="StrongGrid" Version="0.114.0" />
Expand Down
2 changes: 1 addition & 1 deletion src/CleanAspire.AppHost/CleanAspire.AppHost.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@
</ItemGroup>

<ItemGroup>
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.0.1" />
<PackageReference Include="Aspire.Hosting.AppHost" Version="13.1.2" />
</ItemGroup>

</Project>
6 changes: 3 additions & 3 deletions src/CleanAspire.Application/CleanAspire.Application.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,14 +10,14 @@
<ItemGroup>
<PackageReference Include="SixLabors.ImageSharp" Version="3.1.12" />
<PackageReference Include="CsvHelper" Version="33.1.0" />
<PackageReference Include="FluentValidation" Version="12.1.0" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.0" />
<PackageReference Include="FluentValidation" Version="12.1.1" />
<PackageReference Include="FluentValidation.DependencyInjectionExtensions" Version="12.1.1" />
<PackageReference Include="Mediator.Abstractions" Version="3.1.0-preview.14" />
<PackageReference Include="Mediator.SourceGenerator" Version="3.1.0-preview.14">
<PrivateAssets>all</PrivateAssets>
<IncludeAssets>runtime; build; native; contentfiles; analyzers; buildtransitive</IncludeAssets>
</PackageReference>
<PackageReference Include="ZiggyCreatures.FusionCache" Version="2.4.0" />
<PackageReference Include="ZiggyCreatures.FusionCache" Version="2.5.0" />
<ProjectReference Include="..\CleanAspire.Domain\CleanAspire.Domain.csproj" />
</ItemGroup>

Expand Down
26 changes: 13 additions & 13 deletions src/CleanAspire.ClientApp/CleanAspire.ClientApp.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,20 +13,20 @@

</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.0" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.Web" Version="10.0.3" />
<PackageReference Include="Microsoft.Extensions.Http" Version="10.0.3" />
<PackageReference Include="Blazored.LocalStorage" Version="4.5.0" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.21.0" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.21.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.0" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.21.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.21.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.21.0" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.21.0" />
<PackageReference Include="MudBlazor" Version="8.15.0" />
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.0.7" />
<PackageReference Include="Microsoft.Kiota.Abstractions" Version="1.21.3" />
<PackageReference Include="Microsoft.Kiota.Http.HttpClientLibrary" Version="1.21.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="10.0.3" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.DevServer" Version="10.0.3" PrivateAssets="all" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="10.0.3" />
<PackageReference Include="Microsoft.Kiota.Serialization.Form" Version="1.21.3" />
<PackageReference Include="Microsoft.Kiota.Serialization.Json" Version="1.21.3" />
<PackageReference Include="Microsoft.Kiota.Serialization.Multipart" Version="1.21.3" />
<PackageReference Include="Microsoft.Kiota.Serialization.Text" Version="1.21.3" />
<PackageReference Include="MudBlazor" Version="9.0.0" />
<PackageReference Include="Net.Codecrete.QrCodeGenerator" Version="2.1.0" />
<PackageReference Include="OneOf" Version="3.0.271" />
</ItemGroup>

Expand Down
2 changes: 1 addition & 1 deletion src/CleanAspire.ClientApp/DependencyInjection.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -32,7 +32,7 @@ public static void TryAddMudBlazor(this IServiceCollection services, IConfigurat
#region register MudBlazor.Services
services.AddMudServices(config =>
{
MudGlobal.InputDefaults.ShrinkLabel = true;

config.SnackbarConfiguration.PositionClass = Defaults.Classes.Position.BottomCenter;
config.SnackbarConfiguration.NewestOnTop = false;
config.SnackbarConfiguration.ShowCloseIcon = true;
Expand Down
4 changes: 2 additions & 2 deletions src/CleanAspire.ClientApp/Layout/MainLayout.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -27,7 +27,7 @@
await ApplyUserPreferences();
if (_mudThemeProvider != null)
{
await _mudThemeProvider.WatchSystemPreference(OnSystemPreferenceChanged);
await _mudThemeProvider.WatchSystemDarkModeAsync(OnSystemPreferenceChanged);
}

}
Expand All @@ -38,7 +38,7 @@
{
if (_mudThemeProvider != null)
{
var defaultDarkMode = await _mudThemeProvider.GetSystemPreference();
var defaultDarkMode = await _mudThemeProvider.GetSystemDarkModeAsync();
if (LayoutService != null)
{
await LayoutService.ApplyUserPreferences(defaultDarkMode);
Expand Down
5 changes: 1 addition & 4 deletions src/CleanAspire.ClientApp/Layout/Navbar.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,10 +23,7 @@
<MudListSubheader Class="pt-4 pb-2">
@L[sub.Label]
</MudListSubheader>
@if (sub.SubItems.All(x => x.Status == PageStatus.ComingSoon))
{
<MudOverlay Visible="true" LightBackground="true" Absolute="true" Class="layout-menu-shadow" />
}

@foreach (var nav in sub.SubItems)
{
@if (nav.Status == PageStatus.ComingSoon)
Expand Down
2 changes: 1 addition & 1 deletion src/CleanAspire.ClientApp/Layout/UserMenu.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
@inject LayoutService LayoutService
<MudMenu Class="ml-1" PositionAtCursor="false" AnchorOrigin="Origin.BottomLeft" TransformOrigin="Origin.BottomLeft">
<ActivatorContent>
<MudStack Row="true" AlignItems="AlignItems.Center">
<MudStack Row="true" AlignItems="AlignItems.Center" @onclick="@context.ToggleAsync">
<MudTooltip Text="@statusTooltip" Delay="300">
<div class="avatar-container">
@if (RendererInfo.Name == "WebAssembly")
Expand Down
2 changes: 1 addition & 1 deletion src/CleanAspire.ClientApp/Pages/Products/Index.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -95,7 +95,7 @@ RowStyleFunc="_rowStyleFunc"
NumberFormat = "#,#",
DisplayFormat = "Total amount is {value}"
};
private async Task<GridData<ProductDto>> ServerReload(GridState<ProductDto> state)
private async Task<GridData<ProductDto>> ServerReload(GridState<ProductDto> state,CancellationToken cancellationToken)
{
try
{
Expand Down
2 changes: 1 addition & 1 deletion src/CleanAspire.ClientApp/Pages/Stocks/Index.razor
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -81,7 +81,7 @@
private bool _loading = false;
private readonly string[] tags = new[] { "stocks" };
private readonly TimeSpan timeSpan = TimeSpan.FromSeconds(30);
private async Task<GridData<StockDto>> ServerReload(GridState<StockDto> state)
private async Task<GridData<StockDto>> ServerReload(GridState<StockDto> state,CancellationToken cancellationToken)
{
try
{
Expand Down
169 changes: 90 additions & 79 deletions src/CleanAspire.ClientApp/Themes/Theme.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,98 +15,109 @@ public static MudTheme ApplicationTheme()
{
var theme = new MudTheme()
{
PaletteLight = new()
PaletteLight = new PaletteLight
{
// **Primary Colors**
Primary = "#7C4DFF", // Adjusted purple, used for highlights and key elements
Secondary = "#9E9E9E", // Dark gray, secondary color
Primary = "#0f172a", // Modern blue, professional and trustworthy
PrimaryContrastText = "#ffffff",
PrimaryDarken = "#020617",
PrimaryLighten = "#1e293b",
Secondary = "#71717a",
SecondaryContrastText = "#ffffff",
SecondaryLighten = "#52525b",
SecondaryDarken = "#a1a1aa",
Success = "#10b981", // Fresh green, success
Info = "#0ea5e9", // Info blue, clear
Tertiary = "#8b5cf6", // Purple 500
TertiaryContrastText = "#ffffff",
TertiaryDarken = "#7c3aed", // Purple 600
TertiaryLighten = "#a78bfa", // Purple 400

// **Background and Surface**
Background = "#F5F5F5", // Standard light background color
Surface = "#FFFFFF", // Light gray, used for surfaces like cards
Warning = "#f59e0b", // Amber 500
WarningContrastText = "#92400e", // Amber 800
WarningDarken = "#d97706", // Amber 600
WarningLighten = "#fbbf24", // Amber 400

// **Text Colors**
TextPrimary = "#424242", // Dark gray, primary text color
TextSecondary = "#6D6D6D", // Medium gray, secondary text color
TextDisabled = "rgba(0,0,0,0.38)", // Semi-transparent black, disabled text color
Error = "#dc2626", // Clear red, error
ErrorContrastText = "#ffffff",
ErrorDarken = "#b91c1c",
ErrorLighten = "#ef4444",

// **Accent Colors**
Success = "#4CAF50", // Green, used for success messages
Warning = "#FF9800", // Orange, used for warning messages
Error = "#F44336", // Red, used for error messages
Info = "#2196F3", // Blue, used for informational messages
Black = "#020617", // Deep blue-black, more texture
White = "#ffffff",
AppbarBackground = "#f8fafc", // Very light blue-gray, modern
AppbarText = "#0a0a0a",
Background = "#f8fafc", // Very light blue-gray, modern
Surface = "#ffffff",
DrawerBackground = "#ffffff",
TextPrimary = "#0f172a", // Deep blue-gray, modern professional
TextSecondary = "#64748b", // Neutral gray, hierarchy

// **Contrast Text for Accent Colors**
SuccessContrastText = "#FFFFFF", // White, text color for success messages
WarningContrastText = "#FFFFFF", // White, text color for warning messages
ErrorContrastText = "#FFFFFF", // White, text color for error messages
InfoContrastText = "#FFFFFF", // White, text color for informational messages
DrawerIcon = "#71717a",

// **Dividers and Borders**
Divider = "rgba(0,0,0,0.12)", // Semi-transparent black, used for dividers

// **Hover and Ripple Effects**
HoverOpacity = 0.04, // Opacity for hover effects
RippleOpacity = 0.08, // Opacity for ripple effects

// **Overlay**
OverlayLight = "rgba(255,255,255,0.5)", // Semi-transparent white, used for overlays

// **App Bar and Navigation**
AppbarBackground = "#FFFFFF", // Light surface
AppbarText = "#424242", // Dark gray, app bar text color
DrawerBackground = "#F5F5F5", // Light surface
DrawerText = "#424242", // Dark gray, drawer text color

// **Contrast Text for Primary Color**
PrimaryContrastText = "#FFFFFF", // White, text on primary color
TextDisabled = "#94a3b8", // Soft gray
ActionDefault = "#262626",
ActionDisabled = "rgba(100, 116, 139, 0.4)",
ActionDisabledBackground = "rgba(100, 116, 139, 0.1)",
Divider = "#e2e8f0", // Elegant divider
DividerLight = "#f1f5f9",
TableLines = "#e2e8f0", // Table lines, elegant
LinesDefault = "#e2e8f0",
LinesInputs = "#cbd5e1",
},

PaletteDark = new()
PaletteDark = new PaletteDark
{
// **Primary Colors**
Primary = "#8a2be2", // Deep blue, used for highlights and key elements
Secondary = "#B0BEC5", // Light gray, secondary text color

// **Background and Surface**
Background = "#121212", // Standard dark mode background color
Surface = "#1E1E1E", // Slightly lighter dark gray, used for surfaces like cards

// **Text Colors**
TextPrimary = "#FFFFFF", // White, primary text color
TextSecondary = "#B0BEC5", // Light gray, secondary text color
TextDisabled = "rgba(255,255,255,0.38)", // Semi-transparent white, disabled text color

// **Accent Colors**
Success = "#4CAF50", // Green, used for success messages
Warning = "#FFC107", // Amber, used for warning messages
Error = "#F44336", // Red, used for error messages
Info = "#2196F3", // Blue, used for informational messages
Primary = "#fafafa", // shadcn/ui white primary
PrimaryContrastText = "#020817",
PrimaryDarken = "#e4e4e7",
PrimaryLighten = "#ffffff",
Secondary = "#78716c", // Neutral gray
Success = "#22c55e", // Green for success
Info = "#0ea5e9", // Sky blue for info (shadcn sky-500)
InfoDarken = "#0284c7", // Darker sky blue (shadcn sky-600)
InfoLighten = "#38bdf8", // Lighter sky blue (shadcn sky-400)

// **Contrast Text for Accent Colors**
SuccessContrastText = "#FFFFFF", // White, text color for success messages
WarningContrastText = "#000000", // Black, text color for warning messages
ErrorContrastText = "#FFFFFF", // White, text color for error messages
InfoContrastText = "#FFFFFF", // White, text color for informational messages
Tertiary = "#6366f1",
TertiaryContrastText = "#fafafa",
TertiaryDarken = "#4f46e5",
TertiaryLighten = "#818cf8",

// **Dividers and Borders**
Divider = "rgba(255,255,255,0.12)", // Semi-transparent white, used for dividers
Warning = "#f59e0b", // Orange for warning
WarningContrastText = "#fafafa",
WarningDarken = "#d97706",
WarningLighten = "#fbbf24",

// **Hover and Ripple Effects**
HoverOpacity = 0.08, // Opacity for hover effects
RippleOpacity = 0.12, // Opacity for ripple effects
Error = "#ef4444", // Red for error
ErrorContrastText = "#fafafa",
ErrorDarken = "#dc2626",
ErrorLighten = "#f87171",

// **Overlay**
OverlayDark = "rgba(0,0,0,0.5)", // Semi-transparent black, used for overlays
OverlayLight = "rgba(30,30,30,0.4)",
// **App Bar and Navigation**
AppbarBackground = "#1E1E1E", // Same as surface color
AppbarText = "#FFFFFF", // White, app bar text color
DrawerBackground = "#1E1E1E", // Same as surface color
DrawerText = "#FFFFFF", // White, drawer text color
Black = "#020817",
White = "#fafafa",
Background = "#0c0a09", // shadcn/ui dark background
Surface = "#171717", // Deeper surface color
AppbarBackground = "#0c0a09",
AppbarText = "#fafafa",
DrawerText = "#fafafa",
DrawerIcon = "#a1a1aa",

// **Contrast Text for Primary Color**
PrimaryContrastText = "#FFFFFF", // White, text on primary color
DrawerBackground = "#0c0a09",
TextPrimary = "#fafafa", // shadcn/ui white text
TextSecondary = "#a1a1aa", // Neutral gray secondary text
TextDisabled = "rgba(161, 161, 170, 0.5)",
ActionDefault = "#e5e5e5",
ActionDisabled = "rgba(161, 161, 170, 0.3)",
ActionDisabledBackground = "rgba(161, 161, 170, 0.1)",
Divider = "rgba(255, 255, 255, 0.1)", // shadcn/ui divider color
DividerLight = "rgba(161, 161, 170, 0.1)",
TableLines = "rgba(255, 255, 255, 0.1)",
LinesDefault = "rgba(255, 255, 255, 0.1)",
LinesInputs = "rgba(161, 161, 170, 0.2)",
DarkContrastText = "#020817",
SecondaryContrastText = "#fafafa",
SecondaryDarken = "#57534e",
SecondaryLighten = "#a8a29e",
OverlayLight = "rgba(250, 250, 250, 0.1)",
OverlayDark = "rgba(0, 0, 0, 0.8)",


},
Expand Down
2 changes: 1 addition & 1 deletion src/CleanAspire.Domain/CleanAspire.Domain.csproj
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@

<ItemGroup>
<PackageReference Include="Mediator.Abstractions" Version="3.1.0-preview.14" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.0" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="10.0.3" />

</ItemGroup>

Expand Down
Loading
Loading