From a009375d3709f0da6f50e8f8861998fcfce21de5 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Thu, 23 May 2019 12:04:06 +0300 Subject: [PATCH] widget & dashboardStyleBundleContributors --- .../AbpBasicDashboardStyleContributor.cs | 8 ++++++++ .../DashboardDemoWebModule.cs | 7 ++++++- .../Pages/MyDashboard.cshtml | 5 ++++- .../MyDashboardScriptBundleContributor.cs | 2 +- .../MyDashboardStyleBundleContributor.cs | 20 +++++++++++++++++++ .../widgets/DemoStatisticsStyleContributor.cs | 8 ++++++++ .../Pages/widgets/MyDashboard.css | 3 +++ .../widgets/MyWidgetStyleBundleContributor.cs | 17 ++++++++++++++++ 8 files changed, 67 insertions(+), 3 deletions(-) create mode 100644 framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/AbpBasicDashboardStyleContributor.cs rename samples/DashboardDemo/src/DashboardDemo.Web/{Dashboards => Pages}/MyDashboardScriptBundleContributor.cs (93%) create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboardStyleBundleContributor.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/DemoStatisticsStyleContributor.cs create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/MyDashboard.css create mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/MyWidgetStyleBundleContributor.cs diff --git a/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/AbpBasicDashboardStyleContributor.cs b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/AbpBasicDashboardStyleContributor.cs new file mode 100644 index 0000000000..5c074783fc --- /dev/null +++ b/framework/src/Volo.Abp.AspNetCore.Mvc.UI.Dashboards/Volo/Abp/AspNetCore/Mvc/UI/Dashboards/AbpBasicDashboardStyleContributor.cs @@ -0,0 +1,8 @@ +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; + +namespace Volo.Abp.AspNetCore.Mvc.UI.Dashboards +{ + public class AbpBasicDashboardStyleContributor : BundleContributor + { + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs index 58821c536c..3dfad24168 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -8,6 +8,7 @@ using Microsoft.Extensions.DependencyInjection; using DashboardDemo.EntityFrameworkCore; using DashboardDemo.Localization.DashboardDemo; using DashboardDemo.Menus; +using DashboardDemo.Pages; using DashboardDemo.Pages.widgets; using DashboardDemo.Permissions; using DashboardDemo.Widgets; @@ -101,10 +102,14 @@ namespace DashboardDemo Configure(options => { - options.ScriptBundles.Add("MyDashboard", configuration => + options.ScriptBundles.Add(DashboardNames.MyDashboard, configuration => { configuration.AddContributors(typeof(MyDashboardScriptBundleContributor)); }); + options.StyleBundles.Add(DashboardNames.MyDashboard, configuration => + { + configuration.AddContributors(typeof(MyDashboardStyleBundleContributor)); + }); }); } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.cshtml index 7911d91b22..9bfa30bafe 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.cshtml +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboard.cshtml @@ -9,8 +9,11 @@ @model DashboardDemo.Pages.MyDashboardModel @{ } +@section styles { + +} @section scripts { } -@await DashboardRenderer.RenderAsync(Component, new { dashboardName = DashboardNames.MyDashboard}) \ No newline at end of file +@await DashboardRenderer.RenderAsync(Component, new { dashboardName = DashboardNames.MyDashboard }) \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/MyDashboardScriptBundleContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboardScriptBundleContributor.cs similarity index 93% rename from samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/MyDashboardScriptBundleContributor.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboardScriptBundleContributor.cs index 5f40a81402..6daf1139d9 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/MyDashboardScriptBundleContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboardScriptBundleContributor.cs @@ -3,7 +3,7 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.AspNetCore.Mvc.UI.Dashboards; using Volo.Abp.Modularity; -namespace DashboardDemo.Dashboards +namespace DashboardDemo.Pages { [DependsOn( typeof(AbpBasicDashboardScriptContributor), diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboardStyleBundleContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboardStyleBundleContributor.cs new file mode 100644 index 0000000000..860e2be292 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyDashboardStyleBundleContributor.cs @@ -0,0 +1,20 @@ +using DashboardDemo.Pages.widgets; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Dashboards; +using Volo.Abp.Modularity; + +namespace DashboardDemo.Pages +{ + [DependsOn( + typeof(AbpBasicDashboardStyleContributor), + typeof(MyWidgetStyleBundleContributor), + typeof(DemoStatisticsStyleContributor) + )] + public class MyDashboardStyleBundleContributor : BundleContributor + { + public override void ConfigureBundle(BundleConfigurationContext context) + { + + } + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/DemoStatisticsStyleContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/DemoStatisticsStyleContributor.cs new file mode 100644 index 0000000000..ae99874446 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/DemoStatisticsStyleContributor.cs @@ -0,0 +1,8 @@ +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; + +namespace DashboardDemo.Pages.widgets +{ + public class DemoStatisticsStyleContributor : BundleContributor + { + } +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/MyDashboard.css b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/MyDashboard.css new file mode 100644 index 0000000000..587c5f117b --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/MyDashboard.css @@ -0,0 +1,3 @@ +body { + margin: 0; +} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/MyWidgetStyleBundleContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/MyWidgetStyleBundleContributor.cs new file mode 100644 index 0000000000..b41eda80c6 --- /dev/null +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/MyWidgetStyleBundleContributor.cs @@ -0,0 +1,17 @@ +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.Bootstrap; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.HighlightJs; +using Volo.Abp.Modularity; + +namespace DashboardDemo.Pages.widgets +{ + [DependsOn(typeof(BootstrapStyleContributor))] + [DependsOn(typeof(HighlightJsStyleContributor))] + public class MyWidgetStyleBundleContributor : BundleContributor + { + public override void ConfigureBundle(BundleConfigurationContext context) + { + context.Files.Add("/Pages/widgets/MyDashboard.css"); + } + } +}