diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/HomeController.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/HomeController.cs index bdc5cef67f..1452fd030d 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/HomeController.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Controllers/HomeController.cs @@ -7,7 +7,7 @@ namespace AbpDesk.Web.Mvc.Controllers { public IActionResult Index() { - return RedirectToAction("Index", "Tickets"); + return View(); } } } diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs index 787ce6f723..b584053d14 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Navigation/MainMenuContributor.cs @@ -14,11 +14,16 @@ namespace AbpDesk.Web.Mvc.Navigation context.Menu.DisplayName = "Main Menu"; - context.Menu.AddItem( - new ApplicationMenuItem("TicketManagement", "Ticket Management") - .AddItem(new ApplicationMenuItem("Administration.UserManagement", "User Management")) - .AddItem(new ApplicationMenuItem("Administration.RoleManagement", "Role Management")) - ); + context.Menu + .AddItem( + new ApplicationMenuItem("Home", "Home", url: "/") + ) + .AddItem( + new ApplicationMenuItem("TicketManagement", "Ticket Management") + .AddItem( + new ApplicationMenuItem("TicketManagement.Tickets", "Tickets", url: "/Tickets") + ) + ); return Task.CompletedTask; } diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Home/Index.cshtml b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Home/Index.cshtml new file mode 100644 index 0000000000..da227c3648 --- /dev/null +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Home/Index.cshtml @@ -0,0 +1 @@ +

Home

\ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/HorizontalMenu/HorizontalMenuViewComponent.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/HorizontalMenu/HorizontalMenuViewComponent.cs deleted file mode 100644 index 8d0b2d4802..0000000000 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/HorizontalMenu/HorizontalMenuViewComponent.cs +++ /dev/null @@ -1,24 +0,0 @@ -using System.Threading.Tasks; -using Microsoft.AspNetCore.Mvc; -using Volo.Abp.Ui.Navigation; - -namespace AbpDesk.Web.Mvc.Views.Shared.Components.HorizontalMenu -{ - public class HorizontalMenuViewComponent : ViewComponent - { - private readonly IMenuManager _menuManager; - - public HorizontalMenuViewComponent(IMenuManager menuManager) - { - //TODO: Create a INavigationAppService that can also be used remotely, instead of directly using IMenuManager! - - _menuManager = menuManager; - } - - public async Task InvokeAsync(string menuName = StandardMenus.Main) - { - var menu = await _menuManager.GetAsync(StandardMenus.Main); - return View(menu); - } - } -} diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/HorizontalMenu/Default.cshtml b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/Default.cshtml similarity index 100% rename from src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/HorizontalMenu/Default.cshtml rename to src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/Default.cshtml diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/MenuViewComponent.cs b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/MenuViewComponent.cs new file mode 100644 index 0000000000..bf20652dfc --- /dev/null +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/MenuViewComponent.cs @@ -0,0 +1,22 @@ +using System.Threading.Tasks; +using Microsoft.AspNetCore.Mvc; +using Volo.Abp.Ui.Navigation; + +namespace AbpDesk.Web.Mvc.Views.Shared.Components.Menu +{ + public class MenuViewComponent : ViewComponent + { + private readonly IMenuManager _menuManager; + + public MenuViewComponent(IMenuManager menuManager) + { + _menuManager = menuManager; + } + + public async Task InvokeAsync(string menuName = StandardMenus.Main, string viewName = "Default") + { + var menu = await _menuManager.GetAsync(StandardMenus.Main); + return View(viewName, menu); + } + } +} diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml index 3c83e69d41..05543ebd76 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml @@ -1,5 +1,4 @@ -@using AbpDesk.Web.Mvc.Views.Shared.Components -@using AbpDesk.Web.Mvc.Views.Shared.Components.HorizontalMenu +@using AbpDesk.Web.Mvc.Views.Shared.Components.Menu @{ Layout = null; } @@ -14,7 +13,7 @@ - @await Component.InvokeAsync(typeof(HorizontalMenuViewComponent)) + @await Component.InvokeAsync(typeof(MenuViewComponent)) @RenderBody() diff --git a/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreModule.cs b/src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs similarity index 100% rename from src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreModule.cs rename to src/Volo.Abp.AspNetCore.Mvc/Volo/Abp/AspNetCore/Mvc/AbpAspNetCoreMvcModule.cs