Причесать меню (#2833)

* Add plus to addcharacter in menu

* убрать отдельный пункт меню «форумы»

* Пофиксить кнопку «заявиться» в меню игрока

* Причесать меню группы

Author: leotsarev

src/JoinRpg.Portal/Menu/ProjectMenuViewComponent.cs

@@ -10,24 +10,16 @@
 
 namespace JoinRpg.Portal.Menu;
 
-public class ProjectMenuViewComponent : ViewComponent
+public class ProjectMenuViewComponent(
+    ICurrentUserAccessor currentUserAccessor,
+    IProjectRepository projectRepository,
+    ICurrentProjectAccessor currentProjectAccessor) : ViewComponent
 {
-    public ProjectMenuViewComponent(ICurrentUserAccessor currentUserAccessor, IProjectRepository projectRepository, ICurrentProjectAccessor currentProjectAccessor)
-    {
-        CurrentUserAccessor = currentUserAccessor;
-        ProjectRepository = projectRepository;
-        CurrentProjectAccessor = currentProjectAccessor;
-    }
-
-    private ICurrentUserAccessor CurrentUserAccessor { get; }
-    private IProjectRepository ProjectRepository { get; }
-    private ICurrentProjectAccessor CurrentProjectAccessor { get; }
-
     public async Task<IViewComponentResult> InvokeAsync()
     {
-        var project = await ProjectRepository.GetProjectAsync(CurrentProjectAccessor.ProjectId);
+        var project = await projectRepository.GetProjectAsync(currentProjectAccessor.ProjectId);
 
-        var acl = project.ProjectAcls.FirstOrDefault(a => a.UserId == CurrentUserAccessor.UserIdOrDefault);
+        var acl = project.ProjectAcls.FirstOrDefault(a => a.UserId == currentUserAccessor.UserIdOrDefault);
 
         if (acl != null)
         {
@@ -43,7 +35,7 @@ public async Task<IViewComponentResult> InvokeAsync()
         {
             var menuModel = new PlayerMenuViewModel()
             {
-                Claims = project.Claims.OfUserActive(CurrentUserAccessor.UserIdOrDefault).Select(c => new ClaimShortListItemViewModel(c)).ToArray(),
+                Claims = project.Claims.OfUserActive(currentUserAccessor.UserIdOrDefault).Select(c => new ClaimShortListItemViewModel(c)).ToArray(),
                 PlotPublished = project.Details.PublishPlot,
             };
             SetCommonMenuParameters(menuModel, project);
@@ -57,13 +49,12 @@ private void SetCommonMenuParameters(MenuViewModelBase menuModel, Project projec
         menuModel.ProjectName = project.ProjectName;
         //TODO[GroupsLoad]. If we not loaded groups already, that's slow
         menuModel.BigGroups = project.RootGroup.ChildGroups.Where(
-                cg => !cg.IsSpecial && cg.IsActive && cg.IsVisible(CurrentUserAccessor.UserIdOrDefault))
+                cg => !cg.IsSpecial && cg.IsActive && cg.IsVisible(currentUserAccessor.UserIdOrDefault))
             .Select(cg => new CharacterGroupLinkSlimViewModel(new(cg.ProjectId), cg.CharacterGroupId, cg.CharacterGroupName, cg.IsPublic, cg.IsActive)).ToList();
         menuModel.IsAcceptingClaims = project.IsAcceptingClaims;
         menuModel.IsActive = project.Active;
-        menuModel.RootGroupId = project.RootGroup.CharacterGroupId;
         menuModel.EnableAccommodation = project.Details.EnableAccommodation;
-        menuModel.IsAdmin = CurrentUserAccessor.IsAdmin;
+        menuModel.IsAdmin = currentUserAccessor.IsAdmin;
         menuModel.ShowSchedule = project.Details.ScheduleEnabled;
     }
 }

src/JoinRpg.Portal/Views/Shared/Components/ProjectMenu/MasterMenu.cshtml

@@ -80,7 +80,7 @@
                         @Html.ActionLink("Удаленные персонажи", "Deleted", "CharacterList", new { Model.ProjectId }, null)
                       </li>
                       <li>
-                        <a asp-controller="Character" asp-action="Create" asp-route-projectId="@Model.ProjectId">Добавить персонажа</a>
+                            <a asp-controller="Character" asp-action="Create" asp-route-projectId="@Model.ProjectId"><i class="glyphicon glyphicon-plus"></i>Добавить персонажа</a>
                       </li>
 
                       @if (Model.BigGroups.Any())
@@ -125,13 +125,6 @@
                             }
                     </ul>
                 </li>
-                <li class="dropdown">
-                    <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Форумы<span class="caret"></span></a>
-
-                    <ul class="dropdown-menu">
-                        <li>@Html.ActionLink("Все активные", "ListThreads", "Forum", new { Model.ProjectId }, null)</li>
-                    </ul>
-                </li>
                 <li class="dropdown">
                     <a href="#" class="dropdown-toggle" data-toggle="dropdown" role="button" aria-haspopup="true" aria-expanded="false">Финансы/АХЧ<span class="caret"></span></a>
                     <ul class="dropdown-menu">
@@ -162,7 +155,7 @@
                     <ul class="dropdown-menu">
                         <li>@Html.ActionLink("Встроить ролевку на сайт", "Apis", "GameTools", new { Model.ProjectId }, null)</li>
                         <li>@Html.ActionLink("Распечатки", "Index", "Print", new { Model.ProjectId }, null)</li>
-
+                        <li>@Html.ActionLink("Форумы", "ListThreads", "Forum", new { Model.ProjectId }, null)</li>
                         <li>@Html.ActionLink("Поля персонажа / заявки", "Index", "GameField", new { Model.ProjectId }, null)</li>
                         <li>@Html.ActionLink("Мастера", "Index", "Acl", new { Model.ProjectId }, null)</li>
                         <li><a asp-page="/GamePages/ResponsibleMasterRules" asp-route-projectId="@Model.ProjectId">

src/JoinRpg.Portal/Views/Shared/Components/ProjectMenu/PlayerMenu.cshtml

@@ -62,10 +62,10 @@
                         </ul>
                     </li>
                 }
-                else if (Model.RootGroupId != null)
+                else 
                 {
                     <li>
-                        @Html.ActionLink("Заявиться", "AddForGroup", "Claim", new { Model.ProjectId, CharacterGroupId = Model.RootGroupId }, null)
+                        @Html.ActionLink("Заявиться", "AddForGroup", "Claim", new { Model.ProjectId}, null)
                     </li>
                 }
 

src/JoinRpg.Portal/Views/Shared/DisplayTemplates/CharacterGroupDetailsViewModel.cshtml

@@ -45,13 +45,16 @@
                     asp-route-charactergroupid="@Model.CharacterGroupId">
                     Обсуждаемые
                 </nav-link>
-                <nav-link
-                    asp-controller="ClaimList"
-                    asp-action="ListForGroupDirect"
-                    asp-route-projectid="@Model.ProjectId"
-                    asp-route-charactergroupid="@Model.CharacterGroupId">
-                    Заявки в группу
-                </nav-link>
+                @if (Model.IsAcceptingClaims || Model.ActiveClaimsCount > 0)
+                {
+                    <nav-link
+                      asp-controller="ClaimList"
+                      asp-action="ListForGroupDirect"
+                      asp-route-projectid="@Model.ProjectId"
+                      asp-route-charactergroupid="@Model.CharacterGroupId">
+                      Заявки в группу
+                    </nav-link>
+                }
             }
             <nav-link
                 asp-controller="CharacterList"
@@ -78,13 +81,6 @@
                 </nav-link>
             }
         }
-        <nav-link
-            asp-controller="Forum"
-            asp-action="ListThreadsByGroup"
-            asp-route-projectid="@Model.ProjectId"
-            asp-route-charactergroupid="@Model.CharacterGroupId">
-            Форумы
-        </nav-link>
     </ul>
 
 </div>

src/JoinRpg.WebPortal.Models/MasterMenuViewModel.cs

@@ -12,7 +12,6 @@ public class MenuViewModelBase
     public bool IsActive { get; set; }
     public bool IsAcceptingClaims { get; set; }
     public bool EnableAccommodation { get; set; }
-    public int? RootGroupId { get; set; }
     public IEnumerable<CharacterGroupLinkSlimViewModel> BigGroups { get; set; } = null!;
     public bool IsAdmin { get; set; }
     public bool ShowSchedule { get; set; }