feat: implement version check and update dialog; add browser cache clearing functionality
Build and Deploy / build (push) Successful in 1m40s
Build and Deploy / build (push) Successful in 1m40s
This commit is contained in:
@@ -63,11 +63,32 @@
|
||||
@* </MudBadge> *@
|
||||
<MudIconButton Icon="@Icons.Material.Filled.ShoppingCart" Color="@(_cartCount > 0?Color.Success:Color.Inherit)"
|
||||
Href="@(RouteConstants.Store.Cart)" />
|
||||
@* دکمه بروزرسانی *@
|
||||
@if (_hasUpdate)
|
||||
{
|
||||
<MudBadge Dot="true" Color="Color.Error" Overlap="true" Bordered="true">
|
||||
<MudIconButton Icon="@Icons.Material.Filled.SystemUpdateAlt"
|
||||
Color="Color.Warning"
|
||||
OnClick="OpenUpdateDialog"
|
||||
Title="بروزرسانی موجود است"/>
|
||||
</MudBadge>
|
||||
}
|
||||
<MudMenu Icon="@Icons.Material.Filled.Person" Color="Color.Inherit" Size="Size.Medium">
|
||||
<MudMenuItem OnClick="NavigateToProfile" Disabled="@(!AuthService.IsCompleteRegister())">
|
||||
پروفایل
|
||||
</MudMenuItem>
|
||||
<MudDivider/>
|
||||
@if (_hasUpdate)
|
||||
{
|
||||
<MudMenuItem OnClick="OpenUpdateDialog" IconColor="Color.Warning" Icon="@Icons.Material.Filled.SystemUpdateAlt">
|
||||
<MudText Color="Color.Warning">بروزرسانی (@_newVersion)</MudText>
|
||||
</MudMenuItem>
|
||||
<MudDivider/>
|
||||
}
|
||||
<MudMenuItem OnClick="ToggleTheme" Icon="@(_isDark ? Icons.Material.Filled.LightMode : Icons.Material.Filled.DarkMode)">
|
||||
@(_isDark ? "حالت روشن" : "حالت تاریک")
|
||||
</MudMenuItem>
|
||||
<MudDivider/>
|
||||
<MudMenuItem OnClick="Logout">خروج از حساب</MudMenuItem>
|
||||
</MudMenu>
|
||||
}
|
||||
@@ -75,10 +96,10 @@
|
||||
{
|
||||
<MudIconButton Icon="@Icons.Material.Filled.Login" Color="Color.Inherit"
|
||||
OnClick="OpenAuthDialog"/>
|
||||
<MudIconButton OnClick="@ToggleTheme"
|
||||
Icon="@(_isDark ? Icons.Material.Filled.LightMode : Icons.Material.Filled.DarkMode)"
|
||||
Title="@(_isDark ? "حالت روشن" : "حالت تاریک")"/>
|
||||
}
|
||||
|
||||
<MudIconButton OnClick="@ToggleTheme" Edge="Edge.End"
|
||||
Icon="@(_isDark ? Icons.Material.Filled.DarkMode : Icons.Material.Filled.LightMode)"/>
|
||||
</div>
|
||||
</MudContainer>
|
||||
</MudAppBar>
|
||||
@@ -114,6 +135,19 @@
|
||||
{
|
||||
<MudButton Href="/profile" Color="Color.Primary" OnClick="() => _drawerOpen=false">پروفایل
|
||||
</MudButton>
|
||||
@if (_hasUpdate)
|
||||
{
|
||||
<MudButton Variant="Variant.Filled" Color="Color.Warning"
|
||||
StartIcon="@Icons.Material.Filled.SystemUpdateAlt"
|
||||
OnClick="() => { _drawerOpen=false; OpenUpdateDialog(); }">
|
||||
بروزرسانی (@_newVersion)
|
||||
</MudButton>
|
||||
}
|
||||
<MudButton Variant="Variant.Text"
|
||||
StartIcon="@(_isDark ? Icons.Material.Filled.LightMode : Icons.Material.Filled.DarkMode)"
|
||||
OnClick="ToggleTheme">
|
||||
@(_isDark ? "حالت روشن" : "حالت تاریک")
|
||||
</MudButton>
|
||||
<MudButton Variant="Variant.Text" Color="Color.Error"
|
||||
OnClick="() => { _drawerOpen=false; Logout(); }">خروج از حساب
|
||||
</MudButton>
|
||||
@@ -122,6 +156,11 @@
|
||||
{
|
||||
<MudButton Color="Color.Primary" OnClick="() => { _drawerOpen=false; OpenAuthDialog(); }">ورود
|
||||
</MudButton>
|
||||
<MudButton Variant="Variant.Text"
|
||||
StartIcon="@(_isDark ? Icons.Material.Filled.LightMode : Icons.Material.Filled.DarkMode)"
|
||||
OnClick="ToggleTheme">
|
||||
@(_isDark ? "حالت روشن" : "حالت تاریک")
|
||||
</MudButton>
|
||||
}
|
||||
</MudStack>
|
||||
</MudDrawer>
|
||||
|
||||
@@ -16,11 +16,17 @@ public partial class MainLayout : IDisposable
|
||||
private bool _isAuthenticated;
|
||||
private string? _email;
|
||||
private int _cartCount;
|
||||
|
||||
// متغیرهای بروزرسانی
|
||||
private bool _hasUpdate;
|
||||
private string? _newVersion;
|
||||
private VersionCheckResult? _versionCheckResult;
|
||||
|
||||
[Inject] private ILocalStorageService LocalStorage { get; set; } = default!;
|
||||
[Inject] private AuthService AuthService { get; set; } = default!;
|
||||
[Inject] private AuthDialogService AuthDialogService { get; set; } = default!;
|
||||
[Inject] private CartService CartService { get; set; } = default!;
|
||||
[Inject] private AppVersionService AppVersionService { get; set; } = default!;
|
||||
|
||||
private void ToggleTheme() => _isDark = !_isDark;
|
||||
private void ToggleDrawer() => _drawerOpen = !_drawerOpen;
|
||||
@@ -42,12 +48,83 @@ public partial class MainLayout : IDisposable
|
||||
await CartService.EnsureInitializedAsync();
|
||||
CartService.OnChange += OnCartChanged;
|
||||
_cartCount = CartService.Count;
|
||||
|
||||
// چک کردن بروزرسانی (بدون نمایش popup - فقط برای نشون دادن آیکون)
|
||||
await CheckForUpdateSilentlyAsync();
|
||||
}
|
||||
|
||||
StateHasChanged();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// چک کردن بروزرسانی بدون نمایش popup
|
||||
/// </summary>
|
||||
private async Task CheckForUpdateSilentlyAsync()
|
||||
{
|
||||
try
|
||||
{
|
||||
_versionCheckResult = await AppVersionService.CheckVersionAsync(ignoreSkipped: true);
|
||||
|
||||
if (_versionCheckResult.HasNewVersion && !string.IsNullOrEmpty(_versionCheckResult.NewVersion))
|
||||
{
|
||||
_hasUpdate = true;
|
||||
_newVersion = _versionCheckResult.NewVersion;
|
||||
}
|
||||
}
|
||||
catch
|
||||
{
|
||||
// در صورت خطا نادیده بگیر
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// باز کردن دیالوگ بروزرسانی
|
||||
/// </summary>
|
||||
private async Task OpenUpdateDialog()
|
||||
{
|
||||
if (_versionCheckResult == null || string.IsNullOrEmpty(_versionCheckResult.NewVersion))
|
||||
return;
|
||||
|
||||
// ثبت زمان نمایش دیالوگ
|
||||
await AppVersionService.RecordDialogShownAsync();
|
||||
|
||||
var dialogOptions = new DialogOptions
|
||||
{
|
||||
BackdropClick = !_versionCheckResult.IsForceUpdate,
|
||||
CloseOnEscapeKey = !_versionCheckResult.IsForceUpdate,
|
||||
CloseButton = !_versionCheckResult.IsForceUpdate,
|
||||
MaxWidth = MaxWidth.Small,
|
||||
FullWidth = true
|
||||
};
|
||||
|
||||
var parameters = new DialogParameters<ReleaseNotesDialog>
|
||||
{
|
||||
{ x => x.OldVersion, _versionCheckResult.OldVersion },
|
||||
{ x => x.NewVersion, _versionCheckResult.NewVersion },
|
||||
{ x => x.ReleaseNotes, _versionCheckResult.ReleaseNotes },
|
||||
{ x => x.UpdateMessage, _versionCheckResult.UpdateMessage },
|
||||
{ x => x.IsForceUpdate, _versionCheckResult.IsForceUpdate }
|
||||
};
|
||||
|
||||
var dialog = await DialogService.ShowAsync<ReleaseNotesDialog>("بروزرسانی", parameters, dialogOptions);
|
||||
var result = await dialog.Result;
|
||||
|
||||
if (result is { Canceled: false, Data: bool shouldUpdate })
|
||||
{
|
||||
if (shouldUpdate)
|
||||
{
|
||||
await AppVersionService.ApplyUpdateAsync(_versionCheckResult.NewVersion);
|
||||
Navigation.NavigateTo(Navigation.Uri, forceLoad: true);
|
||||
}
|
||||
else
|
||||
{
|
||||
await AppVersionService.SkipVersionAsync(_versionCheckResult.NewVersion);
|
||||
// نمایش آپدیت همچنان باقی بمونه (hasUpdate true بمونه)
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
private void OnCartChanged()
|
||||
{
|
||||
_cartCount = CartService.Count;
|
||||
|
||||
@@ -0,0 +1,130 @@
|
||||
@using FrontOffice.Main.Utilities
|
||||
@using MudBlazor
|
||||
|
||||
<MudDialog>
|
||||
<TitleContent>
|
||||
<MudStack Row="true" AlignItems="AlignItems.Center" Spacing="2">
|
||||
<MudIcon Icon="@Icons.Material.Filled.SystemUpdateAlt" Color="Color.Primary" Size="Size.Large"/>
|
||||
<MudText Typo="Typo.h6">
|
||||
@if (IsForceUpdate)
|
||||
{
|
||||
<span>بروزرسانی اجباری</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span>نسخه جدید موجود است</span>
|
||||
}
|
||||
</MudText>
|
||||
</MudStack>
|
||||
</TitleContent>
|
||||
|
||||
<DialogContent>
|
||||
<MudStack Spacing="3">
|
||||
@* اطلاعات نسخه *@
|
||||
<MudPaper Class="pa-3" Elevation="0" Style="background-color: var(--mud-palette-background-grey);">
|
||||
<MudStack Row="true" Justify="Justify.SpaceBetween">
|
||||
<MudText>نسخه فعلی:</MudText>
|
||||
<MudText Color="Color.Secondary">@(OldVersion ?? "---")</MudText>
|
||||
</MudStack>
|
||||
<MudDivider Class="my-2"/>
|
||||
<MudStack Row="true" Justify="Justify.SpaceBetween">
|
||||
<MudText>نسخه جدید:</MudText>
|
||||
<MudText Color="Color.Primary"><b>@NewVersion</b></MudText>
|
||||
</MudStack>
|
||||
</MudPaper>
|
||||
|
||||
@* پیام آپدیت *@
|
||||
@if (!string.IsNullOrWhiteSpace(UpdateMessage))
|
||||
{
|
||||
<MudAlert Severity="@(IsForceUpdate ? Severity.Warning : Severity.Info)"
|
||||
Variant="Variant.Outlined"
|
||||
Dense="true">
|
||||
@UpdateMessage
|
||||
</MudAlert>
|
||||
}
|
||||
|
||||
@* یادداشتهای انتشار *@
|
||||
@if (!string.IsNullOrWhiteSpace(ReleaseNotes))
|
||||
{
|
||||
<MudText Typo="Typo.subtitle2" Color="Color.Primary">تغییرات این نسخه:</MudText>
|
||||
<MudPaper Class="pa-3" Elevation="1" Style="max-height: 250px; overflow-y: auto;">
|
||||
@((MarkupString)ReleaseNotes)
|
||||
</MudPaper>
|
||||
}
|
||||
|
||||
@if (IsForceUpdate)
|
||||
{
|
||||
<MudAlert Severity="Severity.Error" Variant="Variant.Filled" Dense="true">
|
||||
<MudText Typo="Typo.body2">
|
||||
این بروزرسانی اجباری است و باید انجام شود.
|
||||
</MudText>
|
||||
</MudAlert>
|
||||
}
|
||||
</MudStack>
|
||||
</DialogContent>
|
||||
|
||||
<DialogActions>
|
||||
@if (!IsForceUpdate)
|
||||
{
|
||||
<MudButton OnClick="OnSkipClicked"
|
||||
Color="Color.Default"
|
||||
Variant="Variant.Text">
|
||||
بعداً
|
||||
</MudButton>
|
||||
}
|
||||
<MudButton OnClick="OnUpdateClicked"
|
||||
Color="Color.Primary"
|
||||
Variant="Variant.Filled"
|
||||
StartIcon="@Icons.Material.Filled.Update">
|
||||
@if (_isUpdating)
|
||||
{
|
||||
<MudProgressCircular Size="Size.Small" Indeterminate="true" Color="Color.Surface"/>
|
||||
<span class="ms-2">در حال بروزرسانی...</span>
|
||||
}
|
||||
else
|
||||
{
|
||||
<span>بروزرسانی</span>
|
||||
}
|
||||
</MudButton>
|
||||
</DialogActions>
|
||||
</MudDialog>
|
||||
|
||||
@code {
|
||||
[CascadingParameter]
|
||||
private IMudDialogInstance MudDialog { get; set; } = default!;
|
||||
|
||||
[Parameter]
|
||||
public string? OldVersion { get; set; }
|
||||
|
||||
[Parameter]
|
||||
public string NewVersion { get; set; } = string.Empty;
|
||||
|
||||
[Parameter]
|
||||
public string? ReleaseNotes { get; set; }
|
||||
|
||||
[Parameter]
|
||||
public string? UpdateMessage { get; set; }
|
||||
|
||||
[Parameter]
|
||||
public bool IsForceUpdate { get; set; }
|
||||
|
||||
private bool _isUpdating;
|
||||
|
||||
private async Task OnUpdateClicked()
|
||||
{
|
||||
_isUpdating = true;
|
||||
StateHasChanged();
|
||||
|
||||
// کمی صبر کنیم برای UI
|
||||
await Task.Delay(500);
|
||||
|
||||
// برگردوندن نتیجه "آپدیت"
|
||||
MudDialog.Close(DialogResult.Ok(true));
|
||||
}
|
||||
|
||||
private void OnSkipClicked()
|
||||
{
|
||||
// برگردوندن نتیجه "بعداً"
|
||||
MudDialog.Close(DialogResult.Ok(false));
|
||||
}
|
||||
}
|
||||
Reference in New Issue
Block a user