Skip to content

Commit

Permalink
Showing 13 changed files with 110 additions and 26 deletions.
18 changes: 11 additions & 7 deletions src/CleanAspire.ClientApp/Layout/Appbar.razor
Original file line number Diff line number Diff line change
@@ -1,17 +1,21 @@
<MudAppBar Elevation="0" Fixed="false">
<MudIconButton Icon="@Icons.Material.Filled.Menu" Color="Color.Inherit" Edge="Edge.Start" />
<MudText Typo="Typo.h6"> @L[AppSettings.AppName]</MudText>

<MudIcon>
<MudBlazorLogo></MudBlazorLogo>
</MudIcon>

<MudText Typo="Typo.h6" Class="ml-2"> @L[AppSettings.AppName]</MudText>
<MudSpacer />


<MudTooltip Delay="1000" Text="https://github.com/neozhu/cleanaspire.git">
<MudIconButton Icon="@Icons.Custom.Brands.GitHub" Color="Color.Inherit" Href="https://github.com/neozhu/cleanaspire.git" Target="_blank" />
</MudTooltip>
<MudTooltip Delay="1000" Text="@(LayoutService.IsDarkMode ? L["Light mode"]: L["Dark mode"])">
<MudToggleIconButton Toggled="@LayoutService.IsDarkMode" Icon="@Icons.Material.TwoTone.WbSunny"
Color="@Color.Warning" Class="d-flex ml-auto" ToggledIcon="@Icons.Material.TwoTone.DarkMode"
ToggledColor="@Color.Surface" @onclick="@(()=> LayoutService.SetDarkMode(!LayoutService.IsDarkMode))" />
</MudTooltip>
<MudToggleIconButton Toggled="@LayoutService.IsDarkMode" Icon="@Icons.Material.TwoTone.WbSunny"
Color="@Color.Warning" Class="d-flex ml-auto" ToggledIcon="@Icons.Material.TwoTone.DarkMode"
ToggledColor="@Color.Surface" @onclick="@(()=> LayoutService.SetDarkMode(!LayoutService.IsDarkMode))" />
</MudTooltip>
<MudTooltip Delay="1000" Text="@(LayoutService.IsRTL ? L["Left to right"] : L["Right to left"])">
<MudIconButton Icon="@(LayoutService.IsRTL ? @Icons.Material.Filled.FormatTextdirectionLToR : @Icons.Material.Filled.FormatTextdirectionRToL)" OnClick="@LayoutService.ToggleRightToLeft" Color="Color.Inherit" />
</MudTooltip>
46 changes: 42 additions & 4 deletions src/CleanAspire.ClientApp/Layout/MudBlazorLogo.razor
Original file line number Diff line number Diff line change
@@ -1,10 +1,48 @@

<svg xmlns="http://www.w3.org/2000/svg" viewBox="0 0 1404 1404" class="@Class" style="@Style">
<path d="M406.89,219.14c-51.85,6.86-134.7-55.37-142.65-115.43-7.95-60.07,62.01-95.23,113.86-102.09,51.85-6.86,112.62,11.94,120.57,72.01,7.95,60.07-39.93,138.66-91.78,145.52Z" style="fill:#7e6fff;"/>
<path d="M1351.61,490.53c-29.26-77.07-70.13-149.81-121.87-214.05-34.85-43.28-74.24-83.06-118.5-116.66-51.13-38.82-107.18-74.24-169.52-89.6C659.86,.78,682.24,202.58,537.88,264.05c-144.35,61.47-316.15,4.62-409.08,131.03-38.73,52.69-76.68,109.42-100.97,170.37C5.41,621.7-2.93,684,1.05,744.27c7.77,117.64,64.46,245.62,162.39,314.92,34.64,24.51,91.9,55.27,131.4,25.76,19.29-14.41,31.2-37.27,39.96-59.15,25.29-63.2,31.63-134.4,35.72-201.73,4.09-67.39-8.86-285.66,4.07-323.91,10.1-29.89,34.98-51.3,65.12-59.55,37.46-10.25,84.85,1.44,112.4,28.99,11.98,11.98,21.72,26.39,29.24,43.17,7.49,16.78,16.01,38.08,25.62,63.86l55.76,156.52c4.8,13.19,9.9,26.68,15.31,40.45,5.38,13.81,11.24,26.42,17.55,37.79,6.28,11.4,12.88,20.69,19.76,27.9,6.89,7.17,13.96,10.79,21.14,10.79,5.99,0,12.01-3.17,18-9.45,5.99-6.31,11.85-14.7,17.55-25.21,5.7-10.47,11.37-22.61,17.07-36.42,5.7-13.8,11.24-28.47,16.65-44.07l60.28-162.83c8.39-22.77,16.33-42.57,23.83-59.35,7.5-16.78,16.21-30.59,26.07-41.38,9.9-10.79,21.75-18.9,35.55-24.31,13.77-5.38,31.48-8.07,53.07-8.07,16.78,0,31.32,1.63,43.62,4.93,12.3,3.3,22.32,9.77,30.14,19.34,14.5,17.77,17.58,45.82,20.66,68.01,6.54,46.97,1.82,95.87,1.82,143.32v272.45c0,23.37,1.14,47.05,0,70.39-.98,20.03-.76,40.4-10.45,58.74-8.84,16.71-25.19,30.07-43.97,32.23-24.29,2.79-43.71-15.61-52.61-36.6-4.2-9.9-7.05-19.79-8.55-29.69-1.5-9.9-2.24-17.84-2.24-23.83,0,0,10.01-267.01-33.46-261.48-8.83,1.12-28.92,49.45-34.66,61.45-30.1,60.21-107.26,230.27-122.13,251.82-12.03,17.43-28.81,35.72-50.55,39.92-15.19,2.94-29.82-2.71-41.65-12.12-29.45-23.43-42.28-66.81-56.1-100.93-11.3-27.91-84.23-310.38-138.19-317.77-7.14-.98-12.3,12.27-15.31,36.86-3.01,24.6-15.8,456.32,106.49,577.77,174.23,173.02,487.57,157.97,720.78-196.79,113.7-172.96,103.22-422.6,33.4-606.5Z" style="fill:#7e6fff;"/>
<path d="M369.84,537.14s-27.13,411.28-182.45,417.33c-116.75,4.55-168.93-122.4-176.64-144.99,20.77,97.3,72.69,193.09,152.7,249.7,34.64,24.51,91.9,55.26,131.4,25.76,19.29-14.41,31.2-37.27,39.96-59.15,25.29-63.2,31.63-134.4,35.72-201.73,3.34-55.09-4.69-210.9-.67-286.88v-.04Z" style="fill:#5a47ff;"/>
<?xml version="1.0" encoding="utf-8" ?>
<svg class="@Class" style="@Style" viewBox="0 0 24 24" xmlns="http://www.w3.org/2000/svg" fill="none">
<!-- 外部圆圈 (线条填充为渐变,背景透明) -->
<circle cx="12" cy="12" r="11" stroke="url(#circleGradient)" stroke-width="1.5" fill="none" />

<!-- 渐变定义 -->
<defs>
<!-- 外部圆圈的渐变效果 -->
<linearGradient id="circleGradient" x1="0%" y1="0%" x2="100%" y2="100%" gradientUnits="userSpaceOnUse">
<stop offset="0%" stop-color="rgb(89, 74, 226)" />
<stop offset="100%" stop-color="rgb(255, 102, 153)" />
</linearGradient>
</defs>

<!-- 左侧路径 (缩小并居中) -->
<path d="M11.25 6V12.5C11.25 12.75 11.1 13.05 10.85 13.25L6 16.5C5.5 16.85 4.75 16.5 4.65 15.9C4.5 15.25 4.65 14.5 5.05 13.8L7 10L9 6.5C9.2 6.1 9.4 5.8 9.6 5.55C10.1 5 11.25 5.4 11.25 6Z"
fill="url(#gradient1)" />

<!-- 右侧路径 (缩小并居中) -->
<path d="M18 16.5L13.15 13.25C12.9 13.05 12.75 12.75 12.75 12.5V6C12.75 5.4 13.9 5 14.4 5.55C14.6 5.8 14.8 6.1 15 6.5L17 10L18.95 13.8C19.35 14.5 19.5 15.25 19.35 15.9C19.25 16.5 18.5 16.85 18 16.5Z"
fill="url(#gradient2)" />

<!-- 底部路径 (缩小并居中) -->
<path d="M7 17L11.4 14C11.7 13.8 12.3 13.8 12.6 14L17 17C18.2 17.8 18 18.5 16.6 18.5H7.4C6 18.5 5.8 17.8 7 17Z"
fill="url(#gradient3)" />

<!-- 渐变定义 -->
<defs>
<linearGradient id="gradient1" x1="4" y1="6" x2="12" y2="16" gradientUnits="userSpaceOnUse">
<stop stop-color="#D0BFFF" />
<stop offset="1" stop-color="#B48AFF" />
</linearGradient>
<linearGradient id="gradient2" x1="12" y1="6" x2="20" y2="16" gradientUnits="userSpaceOnUse">
<stop stop-color="#B48AFF" />
<stop offset="1" stop-color="#9F6EFF" />
</linearGradient>
<linearGradient id="gradient3" x1="7" y1="14" x2="17" y2="18" gradientUnits="userSpaceOnUse">
<stop stop-color="#9F6EFF" />
<stop offset="1" stop-color="#7D5FFF" />
</linearGradient>
</defs>
</svg>


@code {
[Parameter] public string Style { get; set; } = default!;
[Parameter] public string Class { get; set; } = default!;
4 changes: 2 additions & 2 deletions src/CleanAspire.ClientApp/Layout/UserMenu.razor
Original file line number Diff line number Diff line change
@@ -17,11 +17,11 @@
}
@if (string.IsNullOrEmpty(userModel?.AvatarUrl))
{
<MudAvatar Style="width:40px;height:40px" >@userModel?.Username?.FirstOrDefault()</MudAvatar>
<MudAvatar Style="width:35px;height:35px">@userModel?.Username?.FirstOrDefault()</MudAvatar>
}
else
{
<MudAvatar Style="width:40px;height:40px">
<MudAvatar Style="width:35px;height:35px">
<MudImage Src="@userModel.AvatarUrl"></MudImage>
</MudAvatar>
}
2 changes: 1 addition & 1 deletion src/CleanAspire.ClientApp/Pages/Account/SignIn.razor
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
<MudPaper Elevation="3" Class="pa-8" Width="100%" MaxWidth="500px">
<div class="d-flex flex-row align-center gap-3 my-3">
<MudBlazorLogo Style="with:60px;height:60px"></MudBlazorLogo>
<MudText Typo="Typo.h5">@L["Blazor WPA"]</MudText>
<MudText Typo="Typo.h5">@L[AppSettings.AppName]</MudText>
</div>
<div class="d-flex flex-column gap-2">

Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
}
},
"ClientAppSettings": {
"AppName": "Progressive Web Application",
"AppName": "Blazor Aspire",
"Version": "v0.0.52",
"ServiceBaseUrl": "https://localhost:7341"
}
2 changes: 1 addition & 1 deletion src/CleanAspire.ClientApp/wwwroot/appsettings.json
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
}
},
"ClientAppSettings": {
"AppName": "Progressive Web Application",
"AppName": "Blazor Aspire",
"Version": "v0.0.52",
"ServiceBaseUrl": "https://apiservice.blazorserver.com"
}
16 changes: 8 additions & 8 deletions src/CleanAspire.ClientApp/wwwroot/css/app.css
Original file line number Diff line number Diff line change
@@ -137,8 +137,8 @@
}

.network-status-indicator {
width: 48px;
height: 48px;
width: 43px;
height: 43px;
display: flex;
justify-content: center;
align-items: center;
@@ -148,17 +148,17 @@

.avatar-container {
position: relative;
width: 40px; /* Fixed container width, same as avatar */
height: 40px; /* Fixed container height, same as avatar */
width: 35px; /* Fixed container width, same as avatar */
height: 35px; /* Fixed container height, same as avatar */
}

/* Red rotating border (common style) */
.rotating-border {
position: absolute;
top: -4px;
left: -4px;
width: 48px;
height: 48px;
width: 43px;
height: 43px;
border: 3px solid transparent; /* Default transparent */
border-radius: 50%;
animation: spin 2s linear infinite; /* Rotating animation */
@@ -183,8 +183,8 @@
position: absolute;
top: -4px;
left: -4px;
width: 48px;
height: 48px;
width: 43px;
height: 43px;
border-radius: 50%;
animation: green-pulse 2s infinite; /* Breathing animation */
z-index: 1;
Binary file modified src/CleanAspire.ClientApp/wwwroot/favicon.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/CleanAspire.ClientApp/wwwroot/icon-192.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified src/CleanAspire.ClientApp/wwwroot/icon-512.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
42 changes: 42 additions & 0 deletions src/CleanAspire.ClientApp/wwwroot/icon.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
2 changes: 1 addition & 1 deletion src/CleanAspire.WebApp/appsettings.Development.json
Original file line number Diff line number Diff line change
@@ -6,7 +6,7 @@
}
},
"ClientAppSettings": {
"AppName": "Progressive Web Application",
"AppName": "Blazor Aspire",
"Version": "v0.0.52",
"ServiceBaseUrl": "https://localhost:7341"
}
2 changes: 1 addition & 1 deletion src/CleanAspire.WebApp/appsettings.json
Original file line number Diff line number Diff line change
@@ -7,7 +7,7 @@
},
"AllowedHosts": "*",
"ClientAppSettings": {
"AppName": "Progressive Web Application",
"AppName": "Blazor Aspire",
"Version": "v0.0.52",
"ServiceBaseUrl": "https://apiservice.blazorserver.com"
}

0 comments on commit 9075500

Please sign in to comment.