Created AbpMenuViewComponent.

10 years ago · fc33938fcb
9 changed files with 8 additions and 50 deletions
--- a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs
@ -41,7 +41,7 @@ namespace AbpDesk.Web.Mvc
        {
            var app = context.GetApplicationBuilder();

-            context.GetLoggerFactory().AddConsole();
+            context.GetLoggerFactory().AddConsole().AddDebug();

            if (context.GetEnvironment().IsDevelopment())
            {
--- a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml
@ -14,7 +14,7 @@
 <body>

    <!-- We should pass all optional parapeters because of a bug in MVC -->
-    <vc:menu menu-name="@StandardMenus.Main" view-name="Default"></vc:menu>
+    <vc:abp-menu menu-name="@StandardMenus.Main" view-name="Default"></vc:abp-menu>

    @RenderBody()

--- a/src/AbpDesk/AbpDesk.Web.Mvc/Views/_ViewImports.cshtml
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/Views/_ViewImports.cshtml
@ -1,2 +1,3 @@
@addTagHelper *, Microsoft.AspNetCore.Mvc.TagHelpers
+@addTagHelper *, Volo.Abp.AspNetCore.Mvc.UI
@addTagHelper *, AbpDesk.Web.Mvc
--- a/src/AbpDesk/AbpDesk.Web.Mvc/project.json
+++ b/src/AbpDesk/AbpDesk.Web.Mvc/project.json
@ -8,6 +8,7 @@
    "Microsoft.AspNetCore.Server.IISIntegration": "1.1.0",
    "Microsoft.AspNetCore.Server.Kestrel": "1.1.0",
    "Microsoft.Extensions.Logging.Console": "1.1.0",
+    "Microsoft.Extensions.Logging.Debug": "1.1.0",
    "Microsoft.AspNetCore.StaticFiles": "1.1.0",
    "Microsoft.Extensions.Configuration.EnvironmentVariables": "1.1.0",
    "Microsoft.Extensions.Configuration.Json": "1.1.0",
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs
@ -2,13 +2,13 @@
 using Microsoft.AspNetCore.Mvc;
 using Volo.Abp.UI.Navigation;

-namespace AbpDesk.Web.Mvc.Views.Shared.Components.Menu
+namespace Volo.Abp.AspNetCore.Mvc.Views.Shared.Components.Menu
 {
-    public class MenuViewComponent : ViewComponent
+    public class AbpMenuViewComponent : ViewComponent
    {
        private readonly IMenuManager _menuManager;

-        public MenuViewComponent(IMenuManager menuManager)
+        public AbpMenuViewComponent(IMenuManager menuManager)
        {
            _menuManager = menuManager;
        }
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/Default.cshtml
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/Default.cshtml
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/Menu/Default.cshtml
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/Menu/Default.cshtml
@ -1,22 +0,0 @@
-@using System.Threading.Tasks
-@model Volo.Abp.UI.Navigation.ApplicationMenu
-<h2>@Model.DisplayName</h2>
-<ul>
-    @foreach (var menuItem in Model.Items)
-    {
-        <li>
-            <a href="@menuItem.Url">@menuItem.DisplayName</a>
-            @if (menuItem.Items.Any())
-            {
-                <ul>
-                    @foreach (var childMenuItem in menuItem.Items)
-                    {
-                        <li>
-                            <a href="@childMenuItem.Url">@childMenuItem.DisplayName</a>
-                        </li>
-                    }
-                </ul>
-            }
-        </li>
-    }
-</ul>
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/Menu/MenuViewComponent.cs
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/Menu/MenuViewComponent.cs
@ -1,22 +0,0 @@
-using System.Threading.Tasks;
-using Microsoft.AspNetCore.Mvc;
-using Volo.Abp.UI.Navigation;
-
-namespace Volo.Abp.AspNetCore.Mvc.Views.Shared.Components.Menu
-{
-    //public class MenuViewComponent : ViewComponent
-    //{
-    //    private readonly IMenuManager _menuManager;
-
-    //    public MenuViewComponent(IMenuManager menuManager)
-    //    {
-    //        _menuManager = menuManager;
-    //    }
-
-    //    public async Task<IViewComponentResult> InvokeAsync(string menuName = StandardMenus.Main, string viewName = "Default")
-    //    {
-    //        var menu = await _menuManager.GetAsync(StandardMenus.Main);
-    //        return View(viewName, menu);
-    //    }
-    //}
-}
--- a/src/Volo.Abp.AspNetCore.Mvc.UI/project.json
+++ b/src/Volo.Abp.AspNetCore.Mvc.UI/project.json
@ -15,7 +15,7 @@
  "buildOptions": {
    "embed": {
      "include": [
-        "Views/AbpEmbeddedDemo/*.*"
+        "Views/**/*.*"
      ]
    }
  }