From 020aadefe53007d7cb82aa64ffa6a841a8f52f14 Mon Sep 17 00:00:00 2001 From: LittleFish-233 Date: Fri, 25 Aug 2023 11:22:05 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BF=AE=E5=A4=8D=E6=B8=B8=E6=88=8F=E5=8F=91?= =?UTF-8?q?=E8=A1=8C=E5=88=97=E8=A1=A8=E6=84=8F=E5=A4=96=E6=B6=88=E5=A4=B1?= =?UTF-8?q?=E7=9A=84bug?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- CnGalWebSite.sln | 2 +- .../Application/Examines/EditRecordService.cs | 52 +----- .../Examines/IEditRecordService.cs | 2 - .../Controllers/ExaminesAPIController.cs | 37 ++-- .../EditRecords/ListUserMonitorsViewModel.cs | 33 ---- .../EditRecords/UserMonitorOverviewModel.cs | 30 ++++ .../ViewModel/Others/IconType.cs | 5 +- .../Admin/Entries/Informations/ListCard.razor | 6 +- .../EditRecords/UserCenter/ListMonitors.razor | 163 ------------------ .../ListUnReviewEditRecordsCard.razor | 2 +- .../UserCenter/Monitors/ListCard.razor | 88 ++++++++++ .../UserCenter/Monitors/TypeChip.razor | 30 ++++ .../PC/Entries/BookingButton.razor | 1 - .../Pages/Normal/Home/ContentCenter.razor | 4 +- 14 files changed, 184 insertions(+), 271 deletions(-) delete mode 100644 CnGalWebSite/CnGalWebSite.DataModel/ViewModel/EditRecords/ListUserMonitorsViewModel.cs create mode 100644 CnGalWebSite/CnGalWebSite.DataModel/ViewModel/EditRecords/UserMonitorOverviewModel.cs delete mode 100644 CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/ListMonitors.razor create mode 100644 CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/Monitors/ListCard.razor create mode 100644 CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/Monitors/TypeChip.razor diff --git a/CnGalWebSite.sln b/CnGalWebSite.sln index 49cdbe3b4..7c107af73 100644 --- a/CnGalWebSite.sln +++ b/CnGalWebSite.sln @@ -81,7 +81,7 @@ Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CnGalWebSite.Shared.MasaCom EndProject Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "测试", "测试", "{A6CEAA1A-85A3-4760-A958-37B1A92D840D}" EndProject -Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "CnGalWebSite.UnitTest", "CnGalWebSite\CnGalWebSite.UnitTest\CnGalWebSite.UnitTest.csproj", "{4012E05C-ADF4-43A6-B7CC-5DF56BBDC9E4}" +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "CnGalWebSite.UnitTest", "CnGalWebSite\CnGalWebSite.UnitTest\CnGalWebSite.UnitTest.csproj", "{4012E05C-ADF4-43A6-B7CC-5DF56BBDC9E4}" EndProject Global GlobalSection(SolutionConfigurationPlatforms) = preSolution diff --git a/CnGalWebSite/CnGalWebSite.APIServer/Application/Examines/EditRecordService.cs b/CnGalWebSite/CnGalWebSite.APIServer/Application/Examines/EditRecordService.cs index 5ca8a23d0..e02e8d7dc 100644 --- a/CnGalWebSite/CnGalWebSite.APIServer/Application/Examines/EditRecordService.cs +++ b/CnGalWebSite/CnGalWebSite.APIServer/Application/Examines/EditRecordService.cs @@ -41,55 +41,6 @@ public class EditRecordService : IEditRecordService _examineService = examineService; } - public async Task> GetPaginatedResult(CnGalWebSite.DataModel.ViewModel.Search.QueryPageOptions options, ListUserMonitorAloneModel searchModel, string userId) - { - var items = _userMonitorsRepository.GetAll().Include(s => s.Entry).Where(s => s.EntryId != null && s.ApplicationUserId == userId).AsNoTracking(); - - // 处理 SearchText 模糊搜索 - if (!string.IsNullOrWhiteSpace(options.SearchText)) - { - items = items.Where(item => item.Id.ToString().Contains(options.SearchText) - || item.EntryId.ToString().Contains(options.SearchText)); - } - - - // 排序 - var isSorted = false; - if (!string.IsNullOrWhiteSpace(options.SortName)) - { - items = items.OrderBy(s => s.Id).Sort(options.SortName, (BootstrapBlazor.Components.SortOrder)options.SortOrder); - isSorted = true; - } - - // 设置记录总数 - var total = items.Count(); - - // 内存分页 - var list = await items.Skip((options.PageIndex - 1) * options.PageItems).Take(options.PageItems).ToListAsync(); - - //复制数据 - var resultItems = new List(); - foreach (var item in list) - { - resultItems.Add(new ListUserMonitorAloneModel - { - Id = item.Id, - CreateTime = item.CreateTime, - EntryId = item.Entry.Id, - EntryName = item.Entry.DisplayName, - Type = item.Entry.Type - }); - } - - return new QueryData() - { - Items = resultItems, - TotalCount = total, - IsSorted = isSorted, - // IsFiltered = isFiltered - }; - } - public async Task> GetPaginatedResult(CnGalWebSite.DataModel.ViewModel.Search.QueryPageOptions options, ListUserReviewEditRecordAloneModel searchModel, string userId) { var items = _userReviewEditRecordRepository.GetAll().AsNoTracking() @@ -131,7 +82,8 @@ public async Task> GetPaginatedRes EntryName = item.Examine.Entry.DisplayName, Operation = item.Examine.Operation, UserId = item.Examine.ApplicationUserId, - UserName = item.Examine.ApplicationUser.UserName + UserName = item.Examine.ApplicationUser.UserName, + ReviewedTime=item.ReviewedTime }); } diff --git a/CnGalWebSite/CnGalWebSite.APIServer/Application/Examines/IEditRecordService.cs b/CnGalWebSite/CnGalWebSite.APIServer/Application/Examines/IEditRecordService.cs index d90ae61c4..fc9e76064 100644 --- a/CnGalWebSite/CnGalWebSite.APIServer/Application/Examines/IEditRecordService.cs +++ b/CnGalWebSite/CnGalWebSite.APIServer/Application/Examines/IEditRecordService.cs @@ -8,8 +8,6 @@ namespace CnGalWebSite.APIServer.Application.Examines { public interface IEditRecordService { - Task> GetPaginatedResult(CnGalWebSite.DataModel.ViewModel.Search.QueryPageOptions options, ListUserMonitorAloneModel searchModel, string userId); - Task> GetPaginatedResult(CnGalWebSite.DataModel.ViewModel.Search.QueryPageOptions options, ListUserReviewEditRecordAloneModel searchModel, string userId); /// diff --git a/CnGalWebSite/CnGalWebSite.APIServer/Controllers/ExaminesAPIController.cs b/CnGalWebSite/CnGalWebSite.APIServer/Controllers/ExaminesAPIController.cs index 29d692904..7c3cb5079 100644 --- a/CnGalWebSite/CnGalWebSite.APIServer/Controllers/ExaminesAPIController.cs +++ b/CnGalWebSite/CnGalWebSite.APIServer/Controllers/ExaminesAPIController.cs @@ -33,6 +33,10 @@ using CnGalWebSite.DataModel.ExamineModel.Shared; using CnGalWebSite.DataModel.ExamineModel.Videos; using CnGalWebSite.DataModel.ExamineModel.FavoriteFolders; +using CnGalWebSite.Core.Models; +using CnGalWebSite.DataModel.ViewModel.Entries; +using CnGalWebSite.Core.Services.Query; +using Result = CnGalWebSite.DataModel.Model.Result; namespace CnGalWebSite.APIServer.Controllers { @@ -62,11 +66,11 @@ public class ExaminesAPIController : ControllerBase private readonly IRankService _rankService; private readonly IEditRecordService _editRecordService; private readonly IUserService _userService; - + private readonly IQueryService _queryService; public ExaminesAPIController(IRepository disambigRepository, IRankService rankService, IRepository commentRepository, IUserService userService, IRepository videoRepository, IRepository messageRepository, IRepository userRepository, IRepository userReviewEditRecordRepository, IRepository favoriteFolderRepository, - IExamineService examineService, IRepository userMonitorsRepository, IEditRecordService editRecordService, IRepository userCertificationRepository, + IExamineService examineService, IRepository userMonitorsRepository, IEditRecordService editRecordService, IRepository userCertificationRepository, IQueryService queryService, IRepository articleRepository, IAppHelper appHelper, IRepository entryRepository, IRepository peripheryRepository, IRepository examineRepository, IRepository tagRepository, IRepository playedGameRepository) { @@ -90,6 +94,7 @@ public class ExaminesAPIController : ControllerBase _userService = userService; _videoRepository = videoRepository; _favoriteFolderRepository = favoriteFolderRepository; + _queryService = queryService; } @@ -718,6 +723,10 @@ public async Task> EditUserReviewEditRecordState(EditUserRe .Where(s => s.ApplicationUserId == user.Id && s.ExamineId != null && model.ExamineIds.Contains(s.ExamineId.Value)) .ExecuteUpdateAsync(s => s.SetProperty(s => s.State, b => model.State)); + var now = DateTime.Now.ToCstTime(); + await _userReviewEditRecordRepository.GetAll() + .Where(s => s.ApplicationUserId == user.Id && s.ExamineId != null && model.ExamineIds.Contains(s.ExamineId.Value)) + .ExecuteUpdateAsync(s => s.SetProperty(s => s.ReviewedTime, b => now)); return new Result { Successful = true }; @@ -787,22 +796,28 @@ public async Task> GetUserContentCenter /// /// 获取用户所有监视列表 /// - /// /// [Authorize] [HttpPost] - public async Task>> GetUserMonitorListAsync(UserMonitorsPagesInfor input) + public async Task> ListUserMonitors(QueryParameterModel model) { var user = await _appHelper.GetAPICurrentUserAsync(HttpContext); + var (items, total) = await _queryService.QueryAsync(_userMonitorsRepository.GetAll().Include(s=>s.Entry).AsSingleQuery().Where(s=>s.Entry!=null).Where(s=>s.ApplicationUserId== user.Id), model, + s => string.IsNullOrWhiteSpace(model.SearchText) || (s.Entry.Name.Contains(model.SearchText))); - if (user == null) + return new QueryResultModel { - return NotFound(); - } - - var dtos = await _editRecordService.GetPaginatedResult(input.Options, input.SearchModel, user.Id); - - return dtos; + Items = await items.Select(s => new UserMonitorOverviewModel + { + CreateTime = s.CreateTime, + EntryId=s.Entry.Id, + EntryName=s.Entry.Name, + Type=s.Entry.Type, + Id = s.Id, + }).ToListAsync(), + Total = total, + Parameter = model + }; } /// diff --git a/CnGalWebSite/CnGalWebSite.DataModel/ViewModel/EditRecords/ListUserMonitorsViewModel.cs b/CnGalWebSite/CnGalWebSite.DataModel/ViewModel/EditRecords/ListUserMonitorsViewModel.cs deleted file mode 100644 index e5dc1183e..000000000 --- a/CnGalWebSite/CnGalWebSite.DataModel/ViewModel/EditRecords/ListUserMonitorsViewModel.cs +++ /dev/null @@ -1,33 +0,0 @@ -using CnGalWebSite.DataModel.Model; -using System; -using System.Collections.Generic; -using System.ComponentModel.DataAnnotations; -using System.Text; -using System.Xml.Linq; - -namespace CnGalWebSite.DataModel.ViewModel.EditRecords -{ - public class ListUserMonitorsViewModel - { - public List UserMonitorEntries { get; set; } = new List { }; - } - public class ListUserMonitorAloneModel - { - [Display(Name = "Id")] - public long Id { get; set; } - [Display(Name = "词条Id")] - public int EntryId { get; set; } - [Display(Name = "类型")] - public EntryType Type { get; set; } - [Display(Name = "名称")] - public string EntryName { get; set; } - [Display(Name = "添加监视的时间")] - public DateTime CreateTime { get; set; } - } - - public class UserMonitorsPagesInfor - { - public CnGalWebSite.DataModel.ViewModel.Search.QueryPageOptions Options { get; set; } - public ListUserMonitorAloneModel SearchModel { get; set; } - } -} diff --git a/CnGalWebSite/CnGalWebSite.DataModel/ViewModel/EditRecords/UserMonitorOverviewModel.cs b/CnGalWebSite/CnGalWebSite.DataModel/ViewModel/EditRecords/UserMonitorOverviewModel.cs new file mode 100644 index 000000000..d7d1dcdd7 --- /dev/null +++ b/CnGalWebSite/CnGalWebSite.DataModel/ViewModel/EditRecords/UserMonitorOverviewModel.cs @@ -0,0 +1,30 @@ +using CnGalWebSite.DataModel.Model; +using System; +using System.Collections.Generic; +using System.ComponentModel.DataAnnotations; +using System.Text; +using System.Xml.Linq; + +namespace CnGalWebSite.DataModel.ViewModel.EditRecords +{ + public class UserMonitorOverviewModel + { + public long Id { get; set; } + /// + /// 词条Id + /// + public int EntryId { get; set; } + /// + /// 类型 + /// + public EntryType Type { get; set; } + /// + /// 名称 + /// + public string EntryName { get; set; } + /// + /// 添加监视的时间 + /// + public DateTime CreateTime { get; set; } + } +} diff --git a/CnGalWebSite/CnGalWebSite.DataModel/ViewModel/Others/IconType.cs b/CnGalWebSite/CnGalWebSite.DataModel/ViewModel/Others/IconType.cs index 1b836461f..57477909b 100644 --- a/CnGalWebSite/CnGalWebSite.DataModel/ViewModel/Others/IconType.cs +++ b/CnGalWebSite/CnGalWebSite.DataModel/ViewModel/Others/IconType.cs @@ -155,7 +155,8 @@ public enum IconType Store, Hide, Refresh, - Prize + Prize, + Look } public static class IconTypeHelper @@ -334,6 +335,8 @@ public static string ToIconString(this IconType type) return "mdi-nature-people "; case IconType.Pupil: return "mdi-eye "; + case IconType.Look: + return "mdi-eye "; case IconType.Clothes: return "mdi-hanger "; case IconType.Hair: diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Admin/Entries/Informations/ListCard.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Admin/Entries/Informations/ListCard.razor index d15eafde2..89ee1c327 100644 --- a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Admin/Entries/Informations/ListCard.razor +++ b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Admin/Entries/Informations/ListCard.razor @@ -1,8 +1,4 @@ -@page "/admin/apiscopes" - -@attribute [Authorize(Roles = "Admin")] - -@inject IHttpService _httpService +@inject IHttpService _httpService @inject IPopupService PopupService diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/ListMonitors.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/ListMonitors.razor deleted file mode 100644 index cfaf0c3c7..000000000 --- a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/ListMonitors.razor +++ /dev/null @@ -1,163 +0,0 @@ - -@inject IHttpService _httpService -@inject ToastService? ToastService -@inject IServiceProvider Provider -@inject NavigationManager NavigationManager -@inject IJSRuntime JS -@inject DialogService DialogService - - -@if (noData) -{ -
-
- -
- 找不到数据欸...... - 不过你可以到词条页面添加监视，点击编辑按钮就能看到入口哦~ -
-
-
-} -else -{ -
- - - - - - - - - - - - - - - -
-
-} - - - - -@code { - [NotNull] - private Table TableRows { get; set; } - private List SelectedRows { get; set; } = new(); - - public ListUserMonitorsViewModel ListModel { get; set; } = new ListUserMonitorsViewModel { UserMonitorEntries = new List() }; - - private ListUserMonitorAloneModel SearchModelUser { get; set; } = new ListUserMonitorAloneModel(); - - private IEnumerable PageItems => new int[] { 10, 20, 40, 80, 200, 5000 }; - [CascadingParameter] - public ErrorHandler ErrorHandler { get; set; } - - bool isFirst=true; - bool noData; - - - protected override async Task OnInitializedAsync() - { - - } - - private async Task> OnQueryBasicAsync(QueryPageOptions options) - { - try - { - var obj = await _httpService.PostAsync>("api/examines/GetUserMonitorList", new UserMonitorsPagesInfor { SearchModel = SearchModelUser, Options = (QueryPageOptionsHelper)options }); - - if (isFirst) - { - if (obj.TotalCount == 0) - { - noData = true; - } - } - - isFirst = false; - - StateHasChanged(); - - return obj; - } - catch (Exception ex) - { - ErrorHandler.ProcessError(ex, "无法获取用户监视列表"); - noData = true; - return new QueryData(); - } - } - private async Task RefreshTable() - { - await TableRows.QueryAsync(); - } - private void OnLook(int id) - { - NavigationManager.NavigateTo("/entries/index/" + id); - - } - - private async Task OnRowEditMonitorClick(int[] ids, bool inMonitor, bool showMessage) - { - string tempString = inMonitor ? "添加监视" : "移除监视"; - //调用API - try - { - var obj = await _httpService.PostAsync("api/examines/EditUserMonitors", new EditUserMonitorsModel { Ids = ids, InMonitor = inMonitor }); - - - - if (obj.Successful == false) - { - await ToastService.Error(tempString + "失败", obj.Error); - } - else - { - if (showMessage) - { - await ToastService.Success(tempString + "成功", tempString + "成功"); - await TableRows.QueryAsync(); - } - } - } - catch (Exception ex) - { - ErrorHandler.ProcessError(ex, tempString + "失败"); - } - } - - private async Task OnAddClick(IEnumerable items) - { - if (items.Count() == 0) - { - await ToastService.Information("没有添加监视", "请选中监视"); - return; - } - - await OnRowEditMonitorClick(items.Select(s => s.EntryId).ToArray(), true, false); - - await ToastService.Success("添加监视成功", "添加监视成功"); - await TableRows.QueryAsync(); - } - private async Task OnRemoveClick(IEnumerable items) - { - if (items.Count() == 0) - { - await ToastService.Information("没有移除监视", "请选中监视"); - return; - } - - await OnRowEditMonitorClick(items.Select(s => s.EntryId).ToArray(), false, false); - - await ToastService.Success("移除监视成功", "移除监视成功"); - await TableRows.QueryAsync(); - } -} diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/ListUnReviewEditRecordsCard.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/ListUnReviewEditRecordsCard.razor index 20190fefa..155208a7d 100644 --- a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/ListUnReviewEditRecordsCard.razor +++ b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/ListUnReviewEditRecordsCard.razor @@ -57,7 +57,7 @@ { try { - var obj = await _httpService.PostAsync("api/exaines/EditUserReviewEditRecordState", new EditUserReviewEditRecordStateModel + var obj = await _httpService.PostAsync("api/examines/EditUserReviewEditRecordState", new EditUserReviewEditRecordStateModel { State = EditRecordReviewState.Reviewed, ExamineIds = Model.Select(s => s.Id).ToArray() diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/Monitors/ListCard.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/Monitors/ListCard.razor new file mode 100644 index 000000000..6ba40a562 --- /dev/null +++ b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/Monitors/ListCard.razor @@ -0,0 +1,88 @@ +@inject IHttpService _httpService +@inject IPopupService PopupService +@inject NavigationManager NavigationManager + + + + @if (context.Header.Value == "actions") + { + @IconType.Look.ToIconString() + @IconType.Delete.ToIconString() + } + else if (context.Header.Value == nameof(UserMonitorOverviewModel.Type)) + { + + } + else if (context.Header.Value == nameof(UserMonitorOverviewModel.CreateTime)) + { + @context.Item.CreateTime.ToString("yyyy-MM-dd HH:mm") + } + else + { + @context.Value + } + + + + +@code { + private bool _editDialog; + private long _editedItemId; + private bool _detailDialog; + + private string _baseUrl = "api/examines/ListUserMonitors"; + private string _name = "关注的词条"; + + private List> _headers = new List> + { + new () + { + Text= "Id", + Align= DataTableHeaderAlign.Start, + Value= nameof(UserMonitorOverviewModel.Id) + }, + new (){ Text= "名称", Value= nameof(UserMonitorOverviewModel.EntryName)}, + new (){ Text= "类型", Value= nameof(UserMonitorOverviewModel.Type)}, + new (){ Text= "添加时间", Value= nameof(UserMonitorOverviewModel.CreateTime)}, + new (){ Text= "操作", Value= "actions",Sortable=false } + }; + + DataTableCard dataTableCard; + + [CascadingParameter] + public ErrorHandler ErrorHandler { get; set; } + + public void LookItem(UserMonitorOverviewModel model) + { + NavigationManager.NavigateTo($"/entries/index/{model.Id}"); + } + + public async Task DeleteItem(UserMonitorOverviewModel model) + { + const string operationName = "取消关注词条"; + try + { + var obj = await _httpService.PostAsync("api/examines/EditUserMonitors", new EditUserMonitorsModel { Ids = new int[] { model.EntryId }, InMonitor = false }); + + if (obj.Successful == false) + { + await PopupService.EnqueueSnackbarAsync(operationName + "失败", obj.Error, AlertTypes.Error); + } + else + { + + await PopupService.EnqueueSnackbarAsync(operationName + "成功", AlertTypes.Success); + dataTableCard.GetDataFromApi(); + + } + } + catch (Exception ex) + { + ErrorHandler.ProcessError(ex, operationName + "失败"); + } + } +} diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/Monitors/TypeChip.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/Monitors/TypeChip.razor new file mode 100644 index 000000000..9c3612bf1 --- /dev/null +++ b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/EditRecords/UserCenter/Monitors/TypeChip.razor @@ -0,0 +1,30 @@ + + +@code { + [Parameter] + public EntryType Type { get; set; } + + public string GetColor(EntryType type) + { + return type switch + { + EntryType.Game => "success", + EntryType.ProductionGroup => "info", + EntryType.Role => "warning", + EntryType.Staff => "error", + _ => "purple", + }; + } + + public IconType GetIcon(EntryType type) + { + return type switch + { + EntryType.Game => IconType.Game, + EntryType.ProductionGroup => IconType.Group, + EntryType.Role => IconType.Role, + EntryType.Staff => IconType.Staff, + _ => IconType.UnknowTime, + }; + } +} diff --git a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Entries/BookingButton.razor b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Entries/BookingButton.razor index 7128e8d99..7dae48ad6 100644 --- a/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Entries/BookingButton.razor +++ b/CnGalWebSite/CnGalWebSite.Shared.MasaComponent/PC/Entries/BookingButton.razor @@ -21,7 +21,6 @@ } } - @code { diff --git a/CnGalWebSite/CnGalWebSite.Shared/Pages/Normal/Home/ContentCenter.razor b/CnGalWebSite/CnGalWebSite.Shared/Pages/Normal/Home/ContentCenter.razor index f5b9a6372..9abf02707 100644 --- a/CnGalWebSite/CnGalWebSite.Shared/Pages/Normal/Home/ContentCenter.razor +++ b/CnGalWebSite/CnGalWebSite.Shared/Pages/Normal/Home/ContentCenter.razor @@ -32,9 +32,7 @@ -
- -
+