diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs b/src/AbpDesk/AbpDesk.Web.Mvc/AbpDeskWebMvcModule.cs index e585e91932..78fd087763 100644 --- 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()) { diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml index 076fe5f970..23223fb92d 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml +++ b/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/_Layout.cshtml @@ -14,7 +14,7 @@ - + @RenderBody() diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/_ViewImports.cshtml b/src/AbpDesk/AbpDesk.Web.Mvc/Views/_ViewImports.cshtml index 7384078c94..38ff200129 100644 --- 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 \ No newline at end of file diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/project.json b/src/AbpDesk/AbpDesk.Web.Mvc/project.json index 412f4494cb..721663d761 100644 --- 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", diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/MenuViewComponent.cs b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs similarity index 73% rename from src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/MenuViewComponent.cs rename to src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/AbpMenuViewComponent.cs index 64777e2b3a..ef4fbd5919 100644 --- a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/MenuViewComponent.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; } diff --git a/src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/Default.cshtml b/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/Default.cshtml similarity index 100% rename from src/AbpDesk/AbpDesk.Web.Mvc/Views/Shared/Components/Menu/Default.cshtml rename to src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/AbpMenu/Default.cshtml diff --git 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 deleted file mode 100644 index c8e48398aa..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/Menu/Default.cshtml +++ /dev/null @@ -1,22 +0,0 @@ -@using System.Threading.Tasks -@model Volo.Abp.UI.Navigation.ApplicationMenu -

@Model.DisplayName

- \ No newline at end of file diff --git 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 deleted file mode 100644 index 79efafc5d9..0000000000 --- a/src/Volo.Abp.AspNetCore.Mvc.UI/Views/Shared/Components/Menu/MenuViewComponent.cs +++ /dev/null @@ -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 InvokeAsync(string menuName = StandardMenus.Main, string viewName = "Default") - // { - // var menu = await _menuManager.GetAsync(StandardMenus.Main); - // return View(viewName, menu); - // } - //} -} diff --git a/src/Volo.Abp.AspNetCore.Mvc.UI/project.json b/src/Volo.Abp.AspNetCore.Mvc.UI/project.json index 4e95371fe5..be1eb953b9 100644 --- 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/**/*.*" ] } }