Merge 69ff942 into 33bb6dd

neozhu · Dec 29, 2024 · 5e2da0e · 5e2da0e
2 parents 33bb6dd + 69ff942
commit 5e2da0e
Show file tree

Hide file tree

Showing 64 changed files with 635 additions and 501 deletions.
diff --git a/README.md b/README.md
@@ -87,7 +87,7 @@ By incorporating robust offline capabilities, CleanAspire empowers developers to
 version: '3.8'
 services:
   apiservice:
-    image: blazordevlab/cleanaspire-api:0.0.57
+    image: blazordevlab/cleanaspire-api:0.0.58
     environment:
       - ASPNETCORE_ENVIRONMENT=Development
       - AllowedHosts=*
@@ -110,7 +110,7 @@ services:
 
 
   blazorweb:
-    image: blazordevlab/cleanaspire-webapp:0.0.57
+    image: blazordevlab/cleanaspire-webapp:0.0.58
     environment:
       - ASPNETCORE_ENVIRONMENT=Production
       - AllowedHosts=*

diff --git a/src/CleanAspire.ClientApp/App.razor b/src/CleanAspire.ClientApp/App.razor
@@ -1,4 +1,5 @@
-<Router AppAssembly="@typeof(App).Assembly">
+
+<Router AppAssembly="@typeof(App).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />

diff --git a/src/CleanAspire.ClientApp/Components/Breadcrumbs/Breadcrumbs.razor b/src/CleanAspire.ClientApp/Components/Breadcrumbs/Breadcrumbs.razor
@@ -1,4 +1,5 @@
 
+
 <div class="d-flex justify-content-between">
     <div class="d-flex align-center gap-2">
         <MudBreadcrumbs Items="@BreadcrumbItems"></MudBreadcrumbs>

diff --git a/src/CleanAspire.ClientApp/Components/Carousel.razor b/src/CleanAspire.ClientApp/Components/Carousel.razor
@@ -1,4 +1,5 @@
-<div class="swiper-container">
+
+<div class="swiper-container">
     <div class="swiper-wrapper">
         <div class="swiper-slide">
             <MudCard Elevation="24">

diff --git a/src/CleanAspire.ClientApp/Components/CarouselReverse.razor b/src/CleanAspire.ClientApp/Components/CarouselReverse.razor
@@ -1,4 +1,5 @@
-<div class="swiper-container-reverse">
+
+<div class="swiper-container-reverse">
     <div class="swiper-wrapper">
         <div class="swiper-slide">
             <MudCard Elevation="24">

diff --git a/src/CleanAspire.ClientApp/Components/ConfirmationDialog.razor b/src/CleanAspire.ClientApp/Components/ConfirmationDialog.razor
@@ -1,4 +1,5 @@
-<MudDialog>
+
+<MudDialog>
     <DialogContent>
         <MudText>@ContentText</MudText>
     </DialogContent>

diff --git a/src/CleanAspire.ClientApp/Components/FileSizeFormatter.razor b/src/CleanAspire.ClientApp/Components/FileSizeFormatter.razor
@@ -1,4 +1,5 @@
-<span>@FormattedSize</span>
+
+<span>@FormattedSize</span>
 
 @code {
     [Parameter]

diff --git a/src/CleanAspire.ClientApp/Components/LoadingButton/MudLoadingButton.razor b/src/CleanAspire.ClientApp/Components/LoadingButton/MudLoadingButton.razor
@@ -1,4 +1,5 @@
-@inherits MudBaseButton
+
+@inherits MudBaseButton
 
 <MudButton OnClick="OnClickAsync" StartIcon="@StartIcon" Disabled="@IsDisabled" IconColor="@IconColor" Variant="@Variant" Color="@Color" Size="@Size">
     @if (_loading)

diff --git a/src/CleanAspire.ClientApp/Components/MudEnumSelect.razor b/src/CleanAspire.ClientApp/Components/MudEnumSelect.razor
@@ -1,6 +1,7 @@
 @typeparam TEnum
-@using System.Reflection
 @using System.ComponentModel
+@using System.Reflection
+
 @inherits MudSelect<TEnum>
 
 @{

diff --git a/src/CleanAspire.ClientApp/Components/OfflineSyncStatus.razor b/src/CleanAspire.ClientApp/Components/OfflineSyncStatus.razor
@@ -1,4 +1,5 @@
-@inject OfflineSyncService OfflineSyncService
+
+@inject OfflineSyncService OfflineSyncService
 
 <div class="d-flex justify-center align-center flex-row gap-2">
     @if (OfflineSyncService.CurrentStatus == SyncStatus.Idle)

diff --git a/src/CleanAspire.ClientApp/Components/PasswordInput.razor b/src/CleanAspire.ClientApp/Components/PasswordInput.razor
@@ -1,4 +1,5 @@
 @using System.Linq.Expressions
+
 <MudTextField InputType="@InputType"
 T="string"
 Value="@Value"

diff --git a/src/CleanAspire.ClientApp/Components/Thumbnail.razor b/src/CleanAspire.ClientApp/Components/Thumbnail.razor
@@ -1,4 +1,5 @@
-<div class="d-flex align-content-center align-center gap-2">
+
+<div class="d-flex align-content-center align-center gap-2">
     @if (IsImage)
     {
         <MudImage ObjectFit="ObjectFit.ScaleDown" Src="@Url()" Width="50" Height="50" Class="rounded-lg"></MudImage>

diff --git a/src/CleanAspire.ClientApp/Components/WebpushrSetup.razor b/src/CleanAspire.ClientApp/Components/WebpushrSetup.razor
@@ -1,4 +1,5 @@
-@code {
+
+@code {
     protected override async Task OnInitializedAsync()
     {
         var online = await OnlineStatusInterop.GetOnlineStatusAsync();

diff --git a/src/CleanAspire.ClientApp/DependencyInjection.cs b/src/CleanAspire.ClientApp/DependencyInjection.cs
@@ -8,7 +8,6 @@
 using CleanAspire.ClientApp.Configurations;
 using CleanAspire.ClientApp.Services.Identity;
 using CleanAspire.ClientApp.Services.JsInterop;
-using CleanAspire.ClientApp.Services.Proxies;
 using CleanAspire.Api.Client;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Kiota.Abstractions.Authentication;
@@ -18,6 +17,8 @@
 using Microsoft.Kiota.Serialization.Json;
 using Microsoft.Kiota.Serialization.Multipart;
 using Microsoft.Kiota.Serialization.Text;
+using CleanAspire.ClientApp.Services.PushNotifications;
+using CleanAspire.ClientApp.Services.Products;
 
 namespace CleanAspire.ClientApp;
 
@@ -52,18 +53,21 @@ public static void TryAddMudBlazor(this IServiceCollection services, IConfigurat
 
     public static void AddCoreServices(this IServiceCollection services, IConfiguration configuration)
     {
+
         // Cookie and Authentication Handlers
         services.AddTransient<CookieHandler>();
         services.AddTransient<WebpushrAuthHandler>();
 
-        // Singleton Services
+        // Scoped Services
+        services.AddScoped<WebpushrOptionsCache>();
         services.AddScoped<UserProfileStore>();
         services.AddScoped<OnlineStatusInterop>();
         services.AddScoped<OfflineModeState>();
         services.AddScoped<IndexedDbCache>();
+        services.AddScoped<ProductCacheService>();
         services.AddScoped<ProductServiceProxy>();
         services.AddScoped<OfflineSyncService>();
-        services.AddScoped<WebpushrService>();
+        services.AddScoped<IWebpushrService, WebpushrService>();
 
         // Configuration
         var clientAppSettings = configuration.GetSection(ClientAppSettings.KEY).Get<ClientAppSettings>();

diff --git a/src/CleanAspire.ClientApp/Layout/Appbar.razor b/src/CleanAspire.ClientApp/Layout/Appbar.razor
@@ -1,4 +1,5 @@
-<MudAppBar Elevation="0" Fixed="false">
+
+<MudAppBar Elevation="0" Fixed="false">
 
     <MudIcon>
         <MudBlazorLogo></MudBlazorLogo>

diff --git a/src/CleanAspire.ClientApp/Layout/ApplicationLayout.razor b/src/CleanAspire.ClientApp/Layout/ApplicationLayout.razor
@@ -1,4 +1,5 @@
 @using CleanAspire.ClientApp.Layout.Redirections
+
 @using Microsoft.AspNetCore.Components.Authorization
 
 @inherits LayoutComponentBase

diff --git a/src/CleanAspire.ClientApp/Layout/AuthenticationLayout.razor b/src/CleanAspire.ClientApp/Layout/AuthenticationLayout.razor
@@ -1,4 +1,5 @@
 @using CleanAspire.ClientApp.Layout.Redirections
+
 @using Microsoft.AspNetCore.Components.Authorization
 
 @inherits LayoutComponentBase

diff --git a/src/CleanAspire.ClientApp/Layout/MainLayout.razor b/src/CleanAspire.ClientApp/Layout/MainLayout.razor
@@ -1,4 +1,5 @@
-@inherits LayoutComponentBase
+
+@inherits LayoutComponentBase
 
 <PageTitle>@L[AppSettings.AppName]</PageTitle>
 

diff --git a/src/CleanAspire.ClientApp/Layout/MudBlazorLogo.razor b/src/CleanAspire.ClientApp/Layout/MudBlazorLogo.razor
@@ -1,4 +1,5 @@
 
+
 <?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">
     <!-- 外部圆圈 (线条填充为渐变，背景透明) -->

diff --git a/src/CleanAspire.ClientApp/Layout/Navbar.razor b/src/CleanAspire.ClientApp/Layout/Navbar.razor
@@ -1,4 +1,5 @@
 @using CleanAspire.ClientApp.Services.Navigation
+
 <MudPaper Elevation="1" Square="true">
     <MudToolBar Class="gap-2" Style="height:50px">
         <MudButton StartIcon="@Icons.Material.Filled.Home" Href="/" Variant="Variant.Text">@L["Home"]</MudButton>

diff --git a/src/CleanAspire.ClientApp/Layout/RedirectToLogin.razor b/src/CleanAspire.ClientApp/Layout/RedirectToLogin.razor
@@ -1,4 +1,5 @@
-@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
+
+@using Microsoft.AspNetCore.Components.WebAssembly.Authentication
 @inject NavigationManager Navigation
 
 @code {

diff --git a/src/CleanAspire.ClientApp/Layout/Redirections/RedirectToHome.razor b/src/CleanAspire.ClientApp/Layout/Redirections/RedirectToHome.razor
@@ -1,4 +1,5 @@
-@code {
+
+@code {
 
     protected override void OnAfterRender(bool firstRender)
     {

diff --git a/src/CleanAspire.ClientApp/Layout/Redirections/RedirectToSignIn.razor b/src/CleanAspire.ClientApp/Layout/Redirections/RedirectToSignIn.razor
@@ -1,4 +1,5 @@
-@code {
+
+@code {
 
     protected override void OnAfterRender(bool firstRender)
     {

diff --git a/src/CleanAspire.ClientApp/Layout/UserMenu.razor b/src/CleanAspire.ClientApp/Layout/UserMenu.razor
@@ -1,4 +1,5 @@
 @using CleanAspire.ClientApp.Services.Identity
+
 @using Microsoft.AspNetCore.Components.Authorization
 @inject ISignInManagement IdentityManagement
 @inject LayoutService LayoutService

diff --git a/src/CleanAspire.ClientApp/Pages/Account/ForgetPassword.razor b/src/CleanAspire.ClientApp/Pages/Account/ForgetPassword.razor
@@ -1,5 +1,6 @@
 @page "/account/forgetpassword"
 @using System.ComponentModel.DataAnnotations
+
 <PageTitle>@L["Forgot Password?"]</PageTitle>
 <MudPaper Elevation="3" Class="pa-8" Width="100%" MaxWidth="500px">
     <div class="d-flex flex-row  align-center gap-3 my-3">

diff --git a/src/CleanAspire.ClientApp/Pages/Account/ForgetPasswordConfirm.razor b/src/CleanAspire.ClientApp/Pages/Account/ForgetPasswordConfirm.razor
@@ -2,6 +2,7 @@
 
 @using System.ComponentModel.DataAnnotations
 @using System.Text.Json
+
 <PageTitle>@L["Confirm password reset"]</PageTitle>
 <MudPaper Elevation="3" Class="pa-8" Width="100%" MaxWidth="500px">
     <div class="d-flex flex-row  align-center gap-3 my-3">

diff --git a/src/CleanAspire.ClientApp/Pages/Account/ForgetPasswordSuccessful.razor b/src/CleanAspire.ClientApp/Pages/Account/ForgetPasswordSuccessful.razor
@@ -1,5 +1,6 @@
 @page "/account/forgetpasswordsuccessful"
 
+
 <PageTitle>@L["Check Your Inbox"]</PageTitle>
 <MudPaper Elevation="3" Class="pa-8" Width="100%" MaxWidth="500px">
     <div class="d-flex flex-row  align-center gap-3 my-3">

diff --git a/src/CleanAspire.ClientApp/Pages/Account/GoogleLoginCallback.razor b/src/CleanAspire.ClientApp/Pages/Account/GoogleLoginCallback.razor
@@ -1,4 +1,5 @@
 @page "/external-login"
+
 @inject ISignInManagement SignInManagement
 
 <PageTitle>@L["external login"]</PageTitle>

diff --git a/src/CleanAspire.ClientApp/Pages/Account/Profile/AccountSetting.razor b/src/CleanAspire.ClientApp/Pages/Account/Profile/AccountSetting.razor
@@ -1,4 +1,5 @@
-@using Microsoft.Kiota.Abstractions
+
+@using Microsoft.Kiota.Abstractions
 <div class="d-flex flex-column gap-2">
     <MudText Typo="Typo.h4">@L["Change email"]</MudText>
     <MudDivider />

diff --git a/src/CleanAspire.ClientApp/Pages/Account/Profile/OfflineModeSetting.razor b/src/CleanAspire.ClientApp/Pages/Account/Profile/OfflineModeSetting.razor
@@ -1,4 +1,5 @@
-@inject OfflineModeState OfflineModeState
+
+@inject OfflineModeState OfflineModeState
 <div class="d-flex flex-column gap-2">
     <MudText Typo="Typo.h4">@L["Offline Mode"]</MudText>
     <MudDivider />

diff --git a/src/CleanAspire.ClientApp/Pages/Account/Profile/Profile.razor b/src/CleanAspire.ClientApp/Pages/Account/Profile/Profile.razor
@@ -1,5 +1,6 @@
 @page "/account/profile"
 
+
 <PageTitle>@L["Profile"]</PageTitle>
 <div class="d-flex flex-column justify-center gap-2">
     <MudText Typo="Typo.h4" Align="Align.Center">@L["Personal info"]</MudText>

diff --git a/src/CleanAspire.ClientApp/Pages/Account/Profile/ProfileSetting.razor b/src/CleanAspire.ClientApp/Pages/Account/Profile/ProfileSetting.razor
@@ -1,4 +1,5 @@
 @using CleanAspire.ClientApp.Components.Autocompletes
+
 @using Microsoft.Kiota.Abstractions
 
 <EditForm Model="@model" class="d-flex flex-grow-1" OnValidSubmit="OnValidSubmit">

diff --git a/src/CleanAspire.ClientApp/Pages/Account/Profile/Setting.razor b/src/CleanAspire.ClientApp/Pages/Account/Profile/Setting.razor
@@ -1,4 +1,5 @@
 @page "/profile/setting"
+
 <PageTitle>@L["Setting"]</PageTitle>
 <MudText Typo="Typo.h2">@L["Settings"]</MudText>
 <MudTabs Outlined="true" Position="Position.Left" Class="mt-3"  Border="true"

diff --git a/src/CleanAspire.ClientApp/Pages/Account/Profile/TwofactorSetting.razor b/src/CleanAspire.ClientApp/Pages/Account/Profile/TwofactorSetting.razor
@@ -1,4 +1,5 @@
-@using Net.Codecrete.QrCodeGenerator
+
+@using Net.Codecrete.QrCodeGenerator
 <div class="d-flex flex-column gap-2">
     <MudText Typo="Typo.h4">@L["Two-factor authentication"]</MudText>
     <MudDivider />

diff --git a/src/CleanAspire.ClientApp/Pages/Account/Profile/_Imports.razor b/src/CleanAspire.ClientApp/Pages/Account/Profile/_Imports.razor
@@ -1 +1,2 @@
-@layout ApplicationLayout
+
+@layout ApplicationLayout
diff --git a/src/CleanAspire.ClientApp/Pages/Account/SignIn.razor b/src/CleanAspire.ClientApp/Pages/Account/SignIn.razor
@@ -2,6 +2,7 @@
 @inject ISignInManagement SignInManagement
 @using System.ComponentModel.DataAnnotations
 @using CleanAspire.ClientApp.Services.Identity
+
 <PageTitle>@L["Sign In"]</PageTitle>
 <MudPaper Elevation="3" Class="pa-8" Width="100%" MaxWidth="500px">
     <div class="d-flex flex-row  align-center gap-3 my-3">

diff --git a/src/CleanAspire.ClientApp/Pages/Account/SignUp.razor b/src/CleanAspire.ClientApp/Pages/Account/SignUp.razor
@@ -3,6 +3,7 @@
 @using System.ComponentModel.DataAnnotations
 @using CleanAspire.ClientApp.Components.Autocompletes
 
+
 <PageTitle>@L["Signup"]</PageTitle>
 <MudPaper Elevation="3" Class="pa-8" Width="100%" MaxWidth="500px">
     <div class="d-flex flex-row  align-center gap-3 my-3">

diff --git a/src/CleanAspire.ClientApp/Pages/Account/SignupConfirmation.razor b/src/CleanAspire.ClientApp/Pages/Account/SignupConfirmation.razor
@@ -1,5 +1,6 @@
 @page "/account/confirm-email"
 
+
 <PageTitle>@L["Confirm Verification"]</PageTitle>
 <MudPaper Elevation="3" Class="pa-8" Width="100%" MaxWidth="500px">
     <div class="d-flex flex-row  align-center gap-3 my-3">

diff --git a/src/CleanAspire.ClientApp/Pages/Account/SignupSuccessful.razor b/src/CleanAspire.ClientApp/Pages/Account/SignupSuccessful.razor
@@ -1,5 +1,6 @@
 @page "/account/signupsuccessful"
 
+
 <PageTitle>@L["Signup Successful"]</PageTitle>
 <MudPaper Elevation="3" Class="pa-8" Width="100%" MaxWidth="500px">
     <div class="d-flex flex-row  align-center gap-3 my-3">

diff --git a/src/CleanAspire.ClientApp/Pages/Authentication.razor b/src/CleanAspire.ClientApp/Pages/Authentication.razor
@@ -1,4 +1,5 @@
 @page "/authentication/{action}"
+
 @using Microsoft.AspNetCore.Components.WebAssembly.Authentication
 <RemoteAuthenticatorView Action="@Action" />
 

diff --git a/src/CleanAspire.ClientApp/Pages/Counter.razor b/src/CleanAspire.ClientApp/Pages/Counter.razor
@@ -1,5 +1,6 @@
 @page "/counter"
 
+
 <PageTitle>Counter</PageTitle>
 
 <h1>Counter</h1>

diff --git a/src/CleanAspire.ClientApp/Pages/Home.razor b/src/CleanAspire.ClientApp/Pages/Home.razor
@@ -1,7 +1,8 @@
 @page "/"
-@using Microsoft.Kiota.Abstractions
-@using System.Text
 @using System.Net.Http.Headers
+@using System.Text
+
+@using Microsoft.Kiota.Abstractions
 @inject IHttpClientFactory HttpClientFactory
 <PageTitle>Home</PageTitle>
 

diff --git a/src/CleanAspire.ClientApp/Pages/PrivacyPolicy.razor b/src/CleanAspire.ClientApp/Pages/PrivacyPolicy.razor
@@ -1,4 +1,5 @@
 @page "/privacy-policy"
+
 @layout MainLayout
 <MudPaper Class="pa-4">
     <MudText Typo="Typo.h4" GutterBottom="true">Privacy Policy</MudText>

diff --git a/src/CleanAspire.ClientApp/Pages/Products/Components/NewProductDialog.razor b/src/CleanAspire.ClientApp/Pages/Products/Components/NewProductDialog.razor
@@ -1,5 +1,6 @@
 @using CleanAspire.ClientApp.Components.Autocompletes
-@using CleanAspire.ClientApp.Services.Proxies
+@using CleanAspire.ClientApp.Services.Products
+
 @inject ProductServiceProxy ProductServiceProxy
 <MudDialog>
     <DialogContent>

diff --git a/src/CleanAspire.ClientApp/Pages/Products/Edit.razor b/src/CleanAspire.ClientApp/Pages/Products/Edit.razor
@@ -1,7 +1,8 @@
 @page "/products/edit/{Id}"
 @using CleanAspire.ClientApp.Components.Autocompletes
 @using CleanAspire.ClientApp.Components.Breadcrumbs
-@using CleanAspire.ClientApp.Services.Proxies
+@using CleanAspire.ClientApp.Services.Products
+
 @inject ProductServiceProxy ProductServiceProxy
 
 <PageTitle>@Title</PageTitle>

diff --git a/src/CleanAspire.ClientApp/Pages/Products/Index.razor b/src/CleanAspire.ClientApp/Pages/Products/Index.razor
@@ -1,7 +1,8 @@
 @page "/products/index"
-@using CleanAspire.ClientApp.Pages.Products.Components
-@using CleanAspire.ClientApp.Services.Proxies
 @using System.Globalization
+@using CleanAspire.ClientApp.Pages.Products.Components
+@using CleanAspire.ClientApp.Services.Products
+
 @inject ProductServiceProxy ProductServiceProxy
 
 <PageTitle>@Title</PageTitle>

diff --git a/src/CleanAspire.ClientApp/Pages/TermsOfService.razor b/src/CleanAspire.ClientApp/Pages/TermsOfService.razor
@@ -1,4 +1,5 @@
 @page "/terms-of-service"
+
 @layout MainLayout
 <MudPaper Class="pa-4">
     <MudText Typo="Typo.h4" GutterBottom="true">Terms of Service</MudText>

diff --git a/src/CleanAspire.ClientApp/Pages/Weather.razor b/src/CleanAspire.ClientApp/Pages/Weather.razor
@@ -1,4 +1,5 @@
 @page "/weather"
+
 @inject HttpClient Http
 
 <PageTitle>Weather</PageTitle>

diff --git a/src/CleanAspire.ClientApp/Pages/_Imports.razor b/src/CleanAspire.ClientApp/Pages/_Imports.razor
@@ -1 +1,2 @@
-@layout ApplicationLayout
+
+@layout ApplicationLayout
diff --git a/src/CleanAspire.ClientApp/Routes.razor b/src/CleanAspire.ClientApp/Routes.razor
@@ -1,4 +1,5 @@
-<Router AppAssembly="@typeof(App).Assembly">
+
+<Router AppAssembly="@typeof(App).Assembly">
     <Found Context="routeData">
         <RouteView RouteData="@routeData" DefaultLayout="@typeof(MainLayout)" />
         <FocusOnNavigate RouteData="@routeData" Selector="h1" />
-Original file line number
+Diff line change
@@ -1,4 +1,5 @@
-    @code {
+    @code {
         protected override void OnAfterRender(bool firstRender)
         {
@@ Expand Down @@
Original file line number	Diff line number	Diff line change
		@@ -1 +1,2 @@
		@layout ApplicationLayout

		@layout ApplicationLayout