From 8926b4379e84378a6361f89bc81239cad14954fb Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Wed, 10 Jul 2019 15:30:16 +0300 Subject: [PATCH] sample dashboard demo: widgets are moved to seperated folders --- .../DashboardDemo.Web/Dashboards/DashboardDefinitionProvider.cs | 2 -- .../Pages/widgets/{ => RoleListWidget}/RoleListWidget.css | 0 .../Pages/widgets/{ => RoleListWidget}/RoleListWidget.js | 0 .../{ => RoleListWidget}/RoleListWidgetScriptContributor.cs | 2 +- .../{ => RoleListWidget}/RoleListWidgetStyleContributor.cs | 2 +- .../{ => RoleListWidget}/RoleListWidgetViewComponent.cshtml | 0 .../{ => RoleListWidget}/RoleListWidgetViewComponent.cshtml.cs | 2 +- .../Pages/widgets/{ => UserCountWidget}/UserCountWidget.css | 0 .../Pages/widgets/{ => UserCountWidget}/UserCountWidget.js | 0 .../UserCountWidgetScriptBundleContributor.cs | 2 +- .../UserCountWidgetStyleBundleContributor.cs | 2 +- .../{ => UserCountWidget}/UserCountWidgetViewComponent.cshtml | 0 .../UserCountWidgetViewComponent.cshtml.cs | 2 +- 13 files changed, 6 insertions(+), 8 deletions(-) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => RoleListWidget}/RoleListWidget.css (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => RoleListWidget}/RoleListWidget.js (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => RoleListWidget}/RoleListWidgetScriptContributor.cs (83%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => RoleListWidget}/RoleListWidgetStyleContributor.cs (76%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => RoleListWidget}/RoleListWidgetViewComponent.cshtml (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => RoleListWidget}/RoleListWidgetViewComponent.cshtml.cs (73%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => UserCountWidget}/UserCountWidget.css (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => UserCountWidget}/UserCountWidget.js (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => UserCountWidget}/UserCountWidgetScriptBundleContributor.cs (89%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => UserCountWidget}/UserCountWidgetStyleBundleContributor.cs (88%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => UserCountWidget}/UserCountWidgetViewComponent.cshtml (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/{ => UserCountWidget}/UserCountWidgetViewComponent.cshtml.cs (74%) diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/DashboardDefinitionProvider.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/DashboardDefinitionProvider.cs index 84ce31f341..5d88d36f1b 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/DashboardDefinitionProvider.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Dashboards/DashboardDefinitionProvider.cs @@ -2,9 +2,7 @@ using DashboardDemo.Localization.DashboardDemo; using DashboardDemo.Pages.widgets; using DashboardDemo.Pages.widgets.Filters; -using DashboardDemo.Widgets; using Volo.Abp.AspNetCore.Mvc.UI.Dashboards; -using Volo.Abp.AspNetCore.Mvc.UI.Widgets; using Volo.Abp.Localization; namespace DashboardDemo.Dashboards diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget.css b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidget.css similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget.css rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidget.css diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget.js b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidget.js similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget.js rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidget.js diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetScriptContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetScriptContributor.cs similarity index 83% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetScriptContributor.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetScriptContributor.cs index 20fc9dc06f..50ad1e92cc 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetScriptContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetScriptContributor.cs @@ -9,7 +9,7 @@ namespace DashboardDemo.Pages.widgets { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/Pages/widgets/RoleListWidget.js"); + context.Files.Add("/Pages/widgets/RoleListWidget/RoleListWidget.js"); } } } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetStyleContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetStyleContributor.cs similarity index 76% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetStyleContributor.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetStyleContributor.cs index 07bb566a71..6422996df8 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetStyleContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetStyleContributor.cs @@ -6,7 +6,7 @@ namespace DashboardDemo.Pages.widgets { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/Pages/widgets/RoleListWidget.css"); + context.Files.Add("/Pages/widgets/RoleListWidget/RoleListWidget.css"); } } } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetViewComponent.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetViewComponent.cshtml similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetViewComponent.cshtml rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetViewComponent.cshtml diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetViewComponent.cshtml.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetViewComponent.cshtml.cs similarity index 73% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetViewComponent.cshtml.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetViewComponent.cshtml.cs index d837424239..797849faf9 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidgetViewComponent.cshtml.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/RoleListWidget/RoleListWidgetViewComponent.cshtml.cs @@ -11,7 +11,7 @@ namespace DashboardDemo.Pages.widgets public IViewComponentResult Invoke() { - return View("/Pages/widgets/RoleListWidgetViewComponent.cshtml", new RoleListWidgetViewComponent()); + return View("/Pages/widgets/RoleListWidget/RoleListWidgetViewComponent.cshtml", new RoleListWidgetViewComponent()); } } } \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget.css b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidget.css similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget.css rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidget.css diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget.js b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidget.js similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget.js rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidget.js diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetScriptBundleContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetScriptBundleContributor.cs similarity index 89% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetScriptBundleContributor.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetScriptBundleContributor.cs index 65a54f4837..de7f39a754 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetScriptBundleContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetScriptBundleContributor.cs @@ -15,7 +15,7 @@ namespace DashboardDemo.Pages.widgets { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/Pages/widgets/UserCountWidget.js"); + context.Files.Add("/Pages/widgets/UserCountWidget/UserCountWidget.js"); } } } \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetStyleBundleContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetStyleBundleContributor.cs similarity index 88% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetStyleBundleContributor.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetStyleBundleContributor.cs index b9a4679b0b..171ccd7616 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetStyleBundleContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetStyleBundleContributor.cs @@ -14,7 +14,7 @@ namespace DashboardDemo.Pages.widgets { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/Pages/widgets/UserCountWidget.css"); + context.Files.Add("/Pages/widgets/UserCountWidget/UserCountWidget.css"); } } } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetViewComponent.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetViewComponent.cshtml similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetViewComponent.cshtml rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetViewComponent.cshtml diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetViewComponent.cshtml.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetViewComponent.cshtml.cs similarity index 74% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetViewComponent.cshtml.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetViewComponent.cshtml.cs index 9a4d9a73aa..69688f707b 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidgetViewComponent.cshtml.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/widgets/UserCountWidget/UserCountWidgetViewComponent.cshtml.cs @@ -11,7 +11,7 @@ namespace DashboardDemo.Pages.widgets public IViewComponentResult Invoke() { - return View("/Pages/widgets/UserCountWidgetViewComponent.cshtml", new UserCountWidgetViewComponent()); + return View("/Pages/widgets/UserCountWidget/UserCountWidgetViewComponent.cshtml", new UserCountWidgetViewComponent()); } } } \ No newline at end of file