From 771d7d00ea6131e12dcb39e9bf5e0cbb601a6022 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Halil=20=C4=B0brahim=20Kalkan?= Date: Fri, 26 Jul 2019 10:30:50 +0300 Subject: [PATCH] Move widget components to shared folder. --- .../src/DashboardDemo.Web/DashboardDemoWebModule.cs | 1 - .../src/DashboardDemo.Web/Pages/MyWidgets.cshtml | 2 +- .../CountersWidget/CountersWidgetViewComponent.cs | 6 +++--- .../{ => Shared}/Components/CountersWidget/Default.cshtml | 0 .../{ => Shared}/Components/CountersWidget/Default.css | 0 .../Pages/{ => Shared}/Components/CountersWidget/Default.js | 0 .../Components/LicenseStatisticWidget/Default.cshtml | 0 .../Components/LicenseStatisticWidget/Default.js | 0 .../LicenseStatisticWidgetScriptContributor.cs | 4 ++-- .../LicenseStatisticWidgetViewComponent.cs | 2 +- .../{ => Shared}/Components/MySimpleWidget/Default.cshtml | 2 +- .../{ => Shared}/Components/MySimpleWidget/Default.css | 0 .../Pages/{ => Shared}/Components/MySimpleWidget/Default.js | 0 .../MySimpleWidget/MySimpleWidgetViewComponent.cs | 6 +++--- .../Components/MySimpleWidget/MySimpleWidgetViewModel.cs | 2 +- .../Components/NewUserStatisticWidget/Default.cshtml | 0 .../Components/NewUserStatisticWidget/Default.js | 0 .../NewUserStatisticWidgetScriptContributor.cs | 4 ++-- .../NewUserStatisticWidgetViewComponent.cs | 2 +- 19 files changed, 15 insertions(+), 16 deletions(-) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/CountersWidget/CountersWidgetViewComponent.cs (78%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/CountersWidget/Default.cshtml (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/CountersWidget/Default.css (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/CountersWidget/Default.js (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/LicenseStatisticWidget/Default.cshtml (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/LicenseStatisticWidget/Default.js (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs (67%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs (86%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/MySimpleWidget/Default.cshtml (57%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/MySimpleWidget/Default.css (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/MySimpleWidget/Default.js (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/MySimpleWidget/MySimpleWidgetViewComponent.cs (59%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/MySimpleWidget/MySimpleWidgetViewModel.cs (57%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/NewUserStatisticWidget/Default.cshtml (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/NewUserStatisticWidget/Default.js (100%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs (67%) rename samples/DashboardDemo/src/DashboardDemo.Web/Pages/{ => Shared}/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs (86%) diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs index c38f4b2451..a6aeef838b 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/DashboardDemoWebModule.cs @@ -8,7 +8,6 @@ using DashboardDemo.EntityFrameworkCore; using DashboardDemo.Localization; using DashboardDemo.MultiTenancy; using DashboardDemo.Web.Menus; -using DashboardDemo.Web.Pages.Components.MySimpleWidget; using Swashbuckle.AspNetCore.Swagger; using Volo.Abp; using Volo.Abp.Account.Web; diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyWidgets.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyWidgets.cshtml index cc4cfa270d..399cdce7b3 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyWidgets.cshtml +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/MyWidgets.cshtml @@ -1,5 +1,5 @@ @page -@using DashboardDemo.Web.Pages.Components.MySimpleWidget +@using DashboardDemo.Web.Pages.Shared.Components.MySimpleWidget @model DashboardDemo.Web.Pages.MyWidgetsModel @* Example usage by widget name *@ diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/CountersWidget/CountersWidgetViewComponent.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/CountersWidget/CountersWidgetViewComponent.cs similarity index 78% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/CountersWidget/CountersWidgetViewComponent.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/CountersWidget/CountersWidgetViewComponent.cs index 3a89871628..dd6b0611d2 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/CountersWidget/CountersWidgetViewComponent.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/CountersWidget/CountersWidgetViewComponent.cs @@ -4,11 +4,11 @@ using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; -namespace DashboardDemo.Web.Pages.Components.CountersWidget +namespace DashboardDemo.Web.Pages.Shared.Components.CountersWidget { [Widget( - StyleFiles = new[] { "/Pages/Components/CountersWidget/Default.css" }, - ScriptFiles = new[] { "/Pages/Components/CountersWidget/Default.js" } + StyleFiles = new[] { "/Pages/Shared/Components/CountersWidget/Default.css" }, + ScriptFiles = new[] { "/Pages/Shared/Components/CountersWidget/Default.js" } )] public class CountersWidgetViewComponent : AbpViewComponent { diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/CountersWidget/Default.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/CountersWidget/Default.cshtml similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/CountersWidget/Default.cshtml rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/CountersWidget/Default.cshtml diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/CountersWidget/Default.css b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/CountersWidget/Default.css similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/CountersWidget/Default.css rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/CountersWidget/Default.css diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/CountersWidget/Default.js b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/CountersWidget/Default.js similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/CountersWidget/Default.js rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/CountersWidget/Default.js diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/LicenseStatisticWidget/Default.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/Default.cshtml similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/LicenseStatisticWidget/Default.cshtml rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/Default.cshtml diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/LicenseStatisticWidget/Default.js b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/Default.js similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/LicenseStatisticWidget/Default.js rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/Default.js diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs similarity index 67% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs index 1144865e91..3e58a16889 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs @@ -2,14 +2,14 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.Modularity; -namespace DashboardDemo.Web.Pages.Components.LicenseStatisticWidget +namespace DashboardDemo.Web.Pages.Shared.Components.LicenseStatisticWidget { [DependsOn(typeof(ChartjsScriptContributor))] public class LicenseStatisticWidgetScriptContributor : BundleContributor { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/Pages/Components/LicenseStatisticWidget/Default.js"); + context.Files.Add("/Pages/Shared/Components/LicenseStatisticWidget/Default.js"); } } } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs similarity index 86% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs index f35803e73e..805ca553c7 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; -namespace DashboardDemo.Web.Pages.Components.LicenseStatisticWidget +namespace DashboardDemo.Web.Pages.Shared.Components.LicenseStatisticWidget { [Widget( StyleTypes = new[] { typeof(ChartjsStyleContributor) }, diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/Default.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/Default.cshtml similarity index 57% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/Default.cshtml rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/Default.cshtml index 2f4323bf89..c69bfd5b30 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/Default.cshtml +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/Default.cshtml @@ -1,4 +1,4 @@ -@model DashboardDemo.Web.Pages.Components.MySimpleWidget.MySimpleWidgetViewModel +@model DashboardDemo.Web.Pages.Shared.Components.MySimpleWidget.MySimpleWidgetViewModel

My Simple Widget

Hello @Model.Name! This is a simple widget!

diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/Default.css b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/Default.css similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/Default.css rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/Default.css diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/Default.js b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/Default.js similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/Default.js rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/Default.js diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/MySimpleWidgetViewComponent.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/MySimpleWidgetViewComponent.cs similarity index 59% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/MySimpleWidgetViewComponent.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/MySimpleWidgetViewComponent.cs index 89b1ccfe00..2edaebd405 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/MySimpleWidgetViewComponent.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/MySimpleWidgetViewComponent.cs @@ -2,11 +2,11 @@ using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; -namespace DashboardDemo.Web.Pages.Components.MySimpleWidget +namespace DashboardDemo.Web.Pages.Shared.Components.MySimpleWidget { [Widget( - StyleFiles = new[] { "/Pages/Components/MySimpleWidget/Default.css" }, - ScriptFiles = new[] { "/Pages/Components/MySimpleWidget/Default.js" } + StyleFiles = new[] { "/Pages/Shared/Components/MySimpleWidget/Default.css" }, + ScriptFiles = new[] { "/Pages/Shared/Components/MySimpleWidget/Default.js" } )] public class MySimpleWidgetViewComponent : AbpViewComponent { diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/MySimpleWidgetViewModel.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/MySimpleWidgetViewModel.cs similarity index 57% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/MySimpleWidgetViewModel.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/MySimpleWidgetViewModel.cs index f4fd1b0a95..a25c1e3988 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/MySimpleWidget/MySimpleWidgetViewModel.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/MySimpleWidget/MySimpleWidgetViewModel.cs @@ -1,4 +1,4 @@ -namespace DashboardDemo.Web.Pages.Components.MySimpleWidget +namespace DashboardDemo.Web.Pages.Shared.Components.MySimpleWidget { public class MySimpleWidgetViewModel { diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/NewUserStatisticWidget/Default.cshtml b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/Default.cshtml similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/NewUserStatisticWidget/Default.cshtml rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/Default.cshtml diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/NewUserStatisticWidget/Default.js b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/Default.js similarity index 100% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/NewUserStatisticWidget/Default.js rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/Default.js diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs similarity index 67% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs index aacd02e6b0..3207bd055c 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs @@ -2,14 +2,14 @@ using Volo.Abp.AspNetCore.Mvc.UI.Bundling; using Volo.Abp.Modularity; -namespace DashboardDemo.Web.Pages.Components.NewUserStatisticWidget +namespace DashboardDemo.Web.Pages.Shared.Components.NewUserStatisticWidget { [DependsOn(typeof(ChartjsScriptContributor))] public class NewUserStatisticWidgetScriptContributor : BundleContributor { public override void ConfigureBundle(BundleConfigurationContext context) { - context.Files.Add("/Pages/Components/NewUserStatisticWidget/Default.js"); + context.Files.Add("/Pages/Shared/Components/NewUserStatisticWidget/Default.js"); } } } diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs similarity index 86% rename from samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs rename to samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs index 2e2386be7a..1e65fb23ff 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs @@ -3,7 +3,7 @@ using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; -namespace DashboardDemo.Web.Pages.Components.NewUserStatisticWidget +namespace DashboardDemo.Web.Pages.Shared.Components.NewUserStatisticWidget { [Widget( StyleTypes = new[] { typeof(ChartjsStyleContributor) },