chore(Vote): remove gitee vote #7489
There are no files selected for viewing
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,14 @@ | ||
| @inherits WebSiteModuleComponentBase | ||
|
|
||
| @code { | ||
| RenderFragment RenderVote => | ||
| @<div> | ||
| <div style="font-size: 48px; text-align: center;">🏆</div> | ||
| <p class="text-center mt-2">正在参加 <b>Gitee 2025 最受欢迎的开源软件</b> 投票活动，快来给我投票吧！</p> | ||
| <div class="my-3 text-center">您的每一票都是对开源社区的支持，感谢您的参与！</div> | ||
| <div style="display: flex; justify-content: space-around;" id="bb-g-toast"> | ||
| <a href="https://gitee.com/activity/2025opensource?ident=I6MYBB" target="_blank" style="font-weight: bold; padding: 6px 12px; border-radius: var(--bs-border-radius); background: linear-gradient(135deg, #667eea, #764ba2); color: #fff;">🚀 必须投一票</a> | ||
| <a href="https://gitee.com/activity/2025opensource?ident=I6MYBB" target="_blank" class="text-muted" style="padding: 6px 12px;" title="老六你居然不投票">我知道了</a> | ||
| </div> | ||
| </div>; | ||
| } | ||
| Original file line number | Diff line number | Diff line change | ||||
|---|---|---|---|---|---|---|
| @@ -0,0 +1,50 @@ | ||||||
| // Licensed to the .NET Foundation under one or more agreements. | ||||||
| // The .NET Foundation licenses this file to you under the Apache 2.0 License | ||||||
| // See the LICENSE file in the project root for more information. | ||||||
| // Maintainer: Argo Zhang(argo@live.ca) Website: https://www.blazor.zone | ||||||
|
|
||||||
| using Microsoft.JSInterop; | ||||||
| using System.Globalization; | ||||||
|
|
||||||
| namespace BootstrapBlazor.Server.Components.Components; | ||||||
|
|
||||||
| /// <summary> | ||||||
| /// 正站通知组件 | ||||||
|
There was a problem hiding this comment. The comment contains a typo. It should be "全站通知组件" (full site notification component) instead of "正站通知组件".
Suggested change
|
||||||
| /// </summary> | ||||||
| [JSModuleAutoLoader("Components/GlobalToast.razor.js", JSObjectReference = true)] | ||||||
| public partial class GlobalToast | ||||||
| { | ||||||
| [Inject] | ||||||
| [NotNull] | ||||||
| private ToastService? Toast { get; set; } | ||||||
|
|
||||||
| /// <summary> | ||||||
| /// <inheritdoc/> | ||||||
| /// </summary> | ||||||
| /// <returns></returns> | ||||||
| protected override Task InvokeInitAsync() => InvokeVoidAsync("init", Interop, nameof(ShowToast)); | ||||||
|
Contributor
There was a problem hiding this comment. suggestion (bug_risk): The JS init function defines a
Suggested implementation: public partial class GlobalToast
{
[Inject]
[NotNull]
private ToastService? Toast { get; set; }
[Inject]
private IWebHostEnvironment? HostEnvironment { get; set; }
/// <summary> /// <inheritdoc/>
protected override Task InvokeInitAsync() =>
InvokeVoidAsync("init", Interop, nameof(ShowToast), HostEnvironment?.IsDevelopment() == true);
Comment on lines
+17
to
+25
There was a problem hiding this comment. The GlobalToast component needs access to WebsiteOption to pass the IsDevelopment flag to the JavaScript init function (as done in the original BaseLayout implementation). Since WebSiteModuleComponentBase has WebsiteOption as a private field, GlobalToast should inject IOptions<WebsiteOptions> and pass WebsiteOption.Value.IsDevelopment as the third parameter to InvokeInitAsync. |
||||||
|
|
||||||
| /// <summary> | ||||||
| /// 显示通知窗口 | ||||||
| /// </summary> | ||||||
| /// <returns></returns> | ||||||
| [JSInvokable] | ||||||
| public async Task ShowToast() | ||||||
| { | ||||||
| // 英文环境不通知 | ||||||
| if (CultureInfo.CurrentUICulture.Name == "en-US") | ||||||
| { | ||||||
| return; | ||||||
| } | ||||||
|
|
||||||
| var option = new ToastOption() | ||||||
| { | ||||||
| Category = ToastCategory.Information, | ||||||
| Title = "Gitee 评选活动", | ||||||
| IsAutoHide = false, | ||||||
| ChildContent = RenderVote, | ||||||
| PreventDuplicates = true | ||||||
| }; | ||||||
| await Toast.Show(option); | ||||||
| } | ||||||
| } | ||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,37 @@ | ||
| import EventHandler from "../../_content/BootstrapBlazor/modules/event-handler.js" | ||
|
|
||
| export function init(invoke, method, debug) { | ||
| const localstorageKey = 'bb-g-toast' | ||
| const v = localStorage.getItem(localstorageKey); | ||
| if (v) { | ||
| try { | ||
| const differ = new Date().getTime() - v; | ||
| if (differ < 86400000) { | ||
| return; | ||
| } | ||
| } | ||
| catch { | ||
| localStorage.removeItem(localstorageKey); | ||
| } | ||
| } | ||
|
|
||
| if (debug !== true) { | ||
| const handler = setTimeout(async () => { | ||
| clearTimeout(handler); | ||
| await invoke.invokeMethodAsync(method); | ||
| }, 10000); | ||
| } | ||
|
|
||
| EventHandler.on(document, 'click', '#bb-g-toast', e => { | ||
| const toast = e.delegateTarget.closest('.toast'); | ||
| if (toast) { | ||
| toast.classList.remove('show'); | ||
|
|
||
| localStorage.setItem(localstorageKey, new Date().getTime()); | ||
| } | ||
| }); | ||
| } | ||
|
|
||
| export function dispose() { | ||
| EventHandler.off(document, 'click', '#bb-g-toast'); | ||
| } |
| Original file line number | Diff line number | Diff line change |
|---|---|---|
|
|
@@ -15,16 +15,3 @@ | |
| <a href="" class="reload">Reload</a> | ||
| <a class="dismiss">🗙</a> | ||
| </div> | ||
| Original file line number | Diff line number | Diff line change | ||||||
|---|---|---|---|---|---|---|---|---|
|
|
@@ -5,14 +5,13 @@ | |||||||
|
|
||||||||
| using Microsoft.Extensions.Options; | ||||||||
| using Microsoft.JSInterop; | ||||||||
|
|
||||||||
| namespace BootstrapBlazor.Server.Components.Layout; | ||||||||
|
|
||||||||
| /// <summary> | ||||||||
| /// 母版页基类 | ||||||||
| /// </summary> | ||||||||
| public partial class BaseLayout : IDisposable | ||||||||
| { | ||||||||
| [Inject] | ||||||||
| [NotNull] | ||||||||
|
|
@@ -51,8 +50,6 @@ public partial class BaseLayout : IAsyncDisposable | |||||||
| private string? CancelText { get; set; } | ||||||||
|
|
||||||||
| private bool _init = false; | ||||||||
|
|
||||||||
| /// <summary> | ||||||||
| /// <inheritdoc/> | ||||||||
|
|
@@ -74,18 +71,13 @@ protected override void OnInitialized() | |||||||
| /// <inheritdoc/> | ||||||||
| /// </summary> | ||||||||
| /// <returns></returns> | ||||||||
| protected override async Task OnInitializedAsync() | ||||||||
| { | ||||||||
| await base.OnInitializedAsync(); | ||||||||
|
|
||||||||
| var module = await JSRuntime.LoadModule($"{WebsiteOption.Value.JSModuleRootPath}Layout/BaseLayout.razor.js"); | ||||||||
| await module.InvokeVoidAsync("initTheme"); | ||||||||
|
Comment on lines
+78
to
+79
There was a problem hiding this comment. The JavaScript module loaded in OnInitializedAsync is not being disposed. The module reference should be stored in a field and disposed in the Dispose method to prevent memory leaks. Consider storing the module as a field and calling DisposeAsync on it during disposal. |
||||||||
| _init = true; | ||||||||
|
Comment on lines
+74
to
+80
There was a problem hiding this comment. Moving the module initialization from OnAfterRenderAsync to OnInitializedAsync may cause issues because the JavaScript may not be ready to execute at this lifecycle stage. The DOM is not guaranteed to be rendered during OnInitializedAsync, which could lead to JavaScript errors if the initTheme function interacts with DOM elements. Consider keeping this in OnAfterRenderAsync with a firstRender check. There was a problem hiding this comment. The StateHasChanged call was removed when _init is set to true. Without StateHasChanged, the UI may not re-render to display the content inside the @if (_init) block in the razor file. This could cause the Header and main content not to appear until the next render cycle is triggered.
Suggested change
|
||||||||
| } | ||||||||
|
|
||||||||
| private async Task NotifyCommit(DispatchEntry<GiteePostBody> payload) | ||||||||
|
|
@@ -129,56 +121,25 @@ private async Task NotifyReboot(DispatchEntry<bool> payload) | |||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| /// <summary> | ||||||||
| /// 释放资源 | ||||||||
| /// </summary> | ||||||||
| /// <param name="disposing"></param> | ||||||||
| private void Dispose(bool disposing) | ||||||||
| { | ||||||||
| if (disposing) | ||||||||
| { | ||||||||
| CommitDispatchService.UnSubscribe(NotifyCommit); | ||||||||
| RebootDispatchService.UnSubscribe(NotifyReboot); | ||||||||
| } | ||||||||
| } | ||||||||
|
|
||||||||
| /// <summary> | ||||||||
| /// 释放资源 | ||||||||
| /// </summary> | ||||||||
| public void Dispose() | ||||||||
|
Comment on lines
+128
to
+140
There was a problem hiding this comment. The change from IAsyncDisposable to IDisposable is problematic because the previous implementation needed to dispose of JSModule asynchronously. While the current code doesn't store the module reference, if async disposal is needed in the future (which is likely given that JSModule disposal is async), this change will require reverting back to IAsyncDisposable. Consider keeping IAsyncDisposable for consistency with JavaScript interop best practices. |
||||||||
| { | ||||||||
| Dispose(true); | ||||||||
| GC.SuppressFinalize(this); | ||||||||
| } | ||||||||
| } | ||||||||
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,44 +1,6 @@ | ||
| import { getTheme, setTheme } from "../../_content/BootstrapBlazor/modules/utility.js" | ||
|
|
||
| export function initTheme() { | ||
| const currentTheme = getTheme(); | ||
| setTheme(currentTheme, false); | ||
| } | ||
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
The GlobalToast component has been created but is not instantiated anywhere in the application. The vote toast functionality was removed from BaseLayout, but the new GlobalToast component needs to be added to a layout or component for the functionality to work. Consider adding <GlobalToast /> to BaseLayout.razor or another appropriate location.