修复server端无法登入的bug，修改消息提示样式

CnGal · Aug 22, 2023 · 9a4fa4e · 9a4fa4e
1 parent 7e14444
commit 9a4fa4e
Show file tree

Hide file tree

Showing 8 changed files with 63 additions and 39 deletions.
diff --git a/CnGalWebSite/CnGalWebSite.Helper/Helper/ToolHelper.cs b/CnGalWebSite/CnGalWebSite.Helper/Helper/ToolHelper.cs
@@ -32,7 +32,7 @@ public static class ToolHelper
         //public static string WebApiPath = "http://172.17.0.1:2001/";
         public static string WebApiPath = "https://api.cngal.org/";
 
-        public static bool? PreSetIsSSR = false; //=> WebApiPath == "http://172.17.0.1:2001/";
+        public static bool? PreSetIsSSR = null; //=> WebApiPath == "http://172.17.0.1:2001/";
         public static bool IsSSR = true; //=> WebApiPath == "http://172.17.0.1:2001/";
 
         public static string ImageApiPath = "https://api.cngal.top/";

diff --git a/CnGalWebSite/CnGalWebSite.Server/Startup.cs b/CnGalWebSite/CnGalWebSite.Server/Startup.cs
@@ -16,6 +16,8 @@
 using CnGalWebSite.Shared.Extentions;
 using CnGalWebSite.Shared.Service;
 using IdentityModel.AspNetCore.AccessTokenManagement;
+using Masa.Blazor.Presets;
+using Masa.Blazor;
 using Microsoft.AspNetCore.Builder;
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.AspNetCore.Diagnostics.HealthChecks;
@@ -92,18 +94,33 @@ public void ConfigureServices(IServiceCollection services)
                 .AddScoped(typeof(IPageModelCatche<>), typeof(PageModelCatche<>))
                 .AddScoped<IDataCacheService, DataCatcheService>()
                 .AddScoped(x => new ImagesLargeViewService())
-                .AddMasaBlazor(s => s.ConfigureTheme(s =>
-                {
-                    if(DateTime.Now.ToCstTime().Day==1&& DateTime.Now.ToCstTime().Month == 4)
+                .AddMasaBlazor(options => {
+                    //消息队列
+                    options.Defaults = new Dictionary<string, IDictionary<string, object?>?>()
                     {
-                        s.Themes.Light.Primary = "#4CAF50";
-                    }
-                    else
+                        {
+                            PopupComponents.SNACKBAR, new Dictionary<string, object?>()
+                            {
+                                { nameof(PEnqueuedSnackbars.Outlined), true },
+                                { nameof(PEnqueuedSnackbars.Closeable), true },
+                                { nameof(PEnqueuedSnackbars.Position), SnackPosition.BottomRight }
+                            }
+                        }
+                    };
+                    //主题
+                    options.ConfigureTheme(s =>
                     {
-                        s.Themes.Light.Primary = "#f06292";
-                    }        
-                    s.Themes.Dark.Primary = "#0078BF";
-                }));
+                        if (DateTime.Now.ToCstTime().Day == 1 && DateTime.Now.ToCstTime().Month == 4)
+                        {
+                            s.Themes.Light.Primary = "#4CAF50";
+                        }
+                        else
+                        {
+                            s.Themes.Light.Primary = "#f06292";
+                        }
+                        s.Themes.Dark.Primary = "#0078BF";
+                    });
+                });
 
             //添加状态检查
             services.AddHealthChecks();

diff --git a/CnGalWebSite/CnGalWebSite.Server/wwwroot/css/cover-default.css b/CnGalWebSite/CnGalWebSite.Server/wwwroot/css/cover-default.css
@@ -343,6 +343,14 @@ input.te-image-file-input {
     color: var(--main-color);
 }
 /*步骤条*/
-.m-stepper__wrapper.active{
-    height:auto !important;
+.m-stepper__wrapper.active {
+    height: auto !important;
+}
+/*Toast*/
+.m-enqueued-snackbars .error {
+    height: unset !important;
+}
+
+.m-snack__content > div {
+    white-space: pre-line;
 }
diff --git a/CnGalWebSite/CnGalWebSite.Server/wwwroot/styles/cover-default.min.css b/CnGalWebSite/CnGalWebSite.Server/wwwroot/styles/cover-default.min.css
diff --git a/CnGalWebSite/CnGalWebSite.Shared/Component/PlayedGames/EditGameRecordTip.razor b/CnGalWebSite/CnGalWebSite.Shared/Component/PlayedGames/EditGameRecordTip.razor
@@ -2,6 +2,7 @@
 @inject NavigationManager NavigationManager
 @inject IDataCacheService _dataCacheService
 @inject IEventService _eventService
+@inject IPopupService PopupService
 
 <MDialog @bind-Value="Dialog"
          MaxWidth="550">
@@ -79,8 +80,6 @@
         </MCardActions>
     </MCard>
 </MDialog>
-<PEnqueuedSnackbars @ref="_toast" MaxCount="3">
-</PEnqueuedSnackbars>
 <CnGalWebSite.Shared.MasaComponent.Shared.Components.DeviceIdentification @ref="deviceIdentification" />
 
 @code {
@@ -89,7 +88,6 @@
     public EventCallback OnChanged { get; set; }
 
     public int Id { get; set; }
-    PEnqueuedSnackbars _toast;
 
     public GameRecordViewModel ViewModel { get; set; }
 
@@ -143,7 +141,7 @@
             {
                 if (Model.ScriptSocre + Model.MusicSocre + Model.PaintSocre + Model.ShowSocre + Model.TotalSocre + Model.SystemSocre + Model.CVSocre != 0)
                 {
-                     _toast.EnqueueSnackbar(new SnackbarOptions
+                    await PopupService.EnqueueSnackbarAsync(new SnackbarOptions
                     {
                         Type = AlertTypes.Error,
                         Title = "请填写所有项目的评分",
@@ -160,7 +158,7 @@
                     if (_dataCacheService.ThemeSetting.PlayedGameInforCount >= 0)
                     {
 
-                         _toast.EnqueueSnackbar(new SnackbarOptions
+                        await PopupService.EnqueueSnackbarAsync(new SnackbarOptions
                         {
                             Type = AlertTypes.Info,
                             Title = "提示",
@@ -186,7 +184,7 @@
             //判断结果
             if (obj.Successful == false)
             {
-                 _toast.EnqueueSnackbar(new SnackbarOptions
+                await PopupService.EnqueueSnackbarAsync(new SnackbarOptions
                 {
                     Type = AlertTypes.Error,
                     Title = obj.Error ?? "编辑游玩记录失败~",

diff --git a/CnGalWebSite/CnGalWebSite.Shared/Component/Space/Messages/CommentRpelyMessageTip.razor b/CnGalWebSite/CnGalWebSite.Shared/Component/Space/Messages/CommentRpelyMessageTip.razor
@@ -1,5 +1,6 @@
 @inject IServiceProvider Provider
 @inject NavigationManager NavigationManager
+@inject IPopupService PopupService
 
 <div class="shadow-sm rounded  ps-4 pe-4 pt-3 pb-3 mb-3 bg-opacity">
     <div style="display: flex; flex-direction: column;">
@@ -20,17 +21,17 @@
         <div class="col-12 p-0 pt-2" style="display: flex; justify-content: flex-end;">
             @if (string.IsNullOrWhiteSpace(Model.Link) == false)
             {
-                <CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaButton Text="查看" OnClick="@(()=>NavigationManager.NavigateTo(Model.Link))" XSmall/>
+                <CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaButton Text="查看" OnClick="@(()=>NavigationManager.NavigateTo(Model.Link))" XSmall />
             }
             @if (CommentId != 0)
             {
                 @if (IsReplying)
                 {
-                    <CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaButton Text="取消回复" OnClick="OnUnReplyClick" XSmall  Class="ms-3" />
+                    <CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaButton Text="取消回复" OnClick="OnUnReplyClick" XSmall Class="ms-3" />
                 }
                 else
                 {
-                    <CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaButton Text="回复" OnClick="OnReplyClick" XSmall  Class="ms-3" />
+                    <CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaButton Text="回复" OnClick="OnReplyClick" XSmall Class="ms-3" />
                 }
             }
 
@@ -41,8 +42,6 @@
         }
     </div>
 </div>
-<PEnqueuedSnackbars @ref="_toast" MaxCount="3">
-</PEnqueuedSnackbars>
 
 @code {
     [Parameter]
@@ -52,7 +51,6 @@
     public long CommentId { get; set; }
 
     private bool IsReplying { get; set; }
-    PEnqueuedSnackbars _toast;
 
     public void OnReplyClick()
     {
@@ -66,11 +64,11 @@
         StateHasChanged();
     }
 
-    public void OnRely()
+    public async Task OnRely()
     {
         IsReplying = false;
         StateHasChanged();
-        _toast?.EnqueueSnackbar(new SnackbarOptions
+        await PopupService.EnqueueSnackbarAsync(new SnackbarOptions
         {
             Type = AlertTypes.Success,
             Title = "回复成功",

diff --git a/CnGalWebSite/CnGalWebSite.Shared/MasaComponent/PC/Entries/PlayedGames/ScoreCountChart.razor b/CnGalWebSite/CnGalWebSite.Shared/MasaComponent/PC/Entries/PlayedGames/ScoreCountChart.razor
@@ -1,4 +1,6 @@
-@if (isReady)
+@inject IPopupService PopupService
+
+@if (isReady)
 {
     <div class="@(Outline?"":"rounded shadow-sm  bg-opacity h-100")">
         @if (Model.UserScores.Any(s => s.Socres.IsScored))
@@ -30,8 +32,6 @@
     </div>
 }
 
-<PEnqueuedSnackbars @ref="_toast" MaxCount="3">
-</PEnqueuedSnackbars>
 
 
 @code {
@@ -40,7 +40,6 @@
 
     [Parameter]
     public PlayedGameOverviewModel Model { get; set; }
-    PEnqueuedSnackbars _toast;
 
     EChartsOptionModel model = new EChartsOptionModel();
 
@@ -108,7 +107,7 @@
 
 
         series.AddRange(new List<double>
-    {
+{
             data.Count(s=>s==1),
             data.Count(s=>s==2),
             data.Count(s=>s==3),
@@ -135,7 +134,7 @@
     {
         if (Model.IsDubbing == false && _type == PlayedGameScoreType.CV)
         {
-            _toast.EnqueueSnackbar(new SnackbarOptions
+            await PopupService.EnqueueSnackbarAsync(new SnackbarOptions
             {
                 Type = AlertTypes.Error,
                 Title = "这个游戏没有配音哦~",

diff --git a/CnGalWebSite/CnGalWebSite.Shared/Shared/PCLayout.razor b/CnGalWebSite/CnGalWebSite.Shared/Shared/PCLayout.razor
@@ -2,6 +2,7 @@
 @inject NavigationManager NavigationManager
 @inject IDataCacheService _dataCacheService
 @inject IJSRuntime JS
+@inject IPopupService PopupService
 
 <MAppBar App Class="shadow-sm  bg-opacity">
     <div style=" word-break: keep-all;" class="ms-4 me-8">
@@ -27,11 +28,11 @@
 </MAppBar>
 
 <MMain>
-        <CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaContainer>
-            <ErrorHandler>
-                @Body
-            </ErrorHandler>
-        </CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaContainer>
+    <CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaContainer>
+        <ErrorHandler>
+            @Body
+        </ErrorHandler>
+    </CnGalWebSite.Shared.MasaComponent.Shared.Components.MasaContainer>
 </MMain>
 
 <MFooter App Padless Absolute Class="shadow-sm  bg-opacity">
@@ -51,5 +52,8 @@
             await Task.Delay(500);
         }
         await JS.InvokeAsync<string>("navigateTo", url);
+
+        throw new Exception("测试");
+
     }
 }