From 41b7c9c1eb851666d03c01576e297e0fbe129e72 Mon Sep 17 00:00:00 2001 From: Yunus Emre Kalkan Date: Tue, 6 Aug 2019 09:08:14 +0300 Subject: [PATCH] removed chart.js from dashboardDemo and used from framework --- .../Bundles/ChartjsScriptContributor.cs | 12 ------------ .../Bundles/ChartjsStyleContributor.cs | 12 ------------ .../LicenseStatisticWidgetScriptContributor.cs | 4 ++-- .../LicenseStatisticWidgetViewComponent.cs | 4 ++-- .../NewUserStatisticWidgetScriptContributor.cs | 4 ++-- .../NewUserStatisticWidgetViewComponent.cs | 4 ++-- .../src/DashboardDemo.Web/abp.resourcemapping.js | 1 - .../DashboardDemo/src/DashboardDemo.Web/package.json | 2 +- 8 files changed, 9 insertions(+), 34 deletions(-) delete mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsScriptContributor.cs delete mode 100644 samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsStyleContributor.cs diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsScriptContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsScriptContributor.cs deleted file mode 100644 index eaacdc0e7a..0000000000 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsScriptContributor.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; - -namespace DashboardDemo.Web.Bundles -{ - public class ChartjsScriptContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/chart.js/Chart.js"); - } - } -} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsStyleContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsStyleContributor.cs deleted file mode 100644 index 144baaab12..0000000000 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsStyleContributor.cs +++ /dev/null @@ -1,12 +0,0 @@ -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; - -namespace DashboardDemo.Web.Bundles -{ - public class ChartjsStyleContributor : BundleContributor - { - public override void ConfigureBundle(BundleConfigurationContext context) - { - context.Files.Add("/libs/chart.js/Chart.css"); - } - } -} diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs index 3e58a16889..2dc1e8f7f3 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs @@ -1,5 +1,5 @@ -using DashboardDemo.Web.Bundles; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs; using Volo.Abp.Modularity; namespace DashboardDemo.Web.Pages.Shared.Components.LicenseStatisticWidget diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs index 805ca553c7..17d43db339 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs @@ -1,6 +1,6 @@ -using DashboardDemo.Web.Bundles; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; namespace DashboardDemo.Web.Pages.Shared.Components.LicenseStatisticWidget diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs index 3207bd055c..8563491cb2 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs @@ -1,5 +1,5 @@ -using DashboardDemo.Web.Bundles; -using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Bundling; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs; using Volo.Abp.Modularity; namespace DashboardDemo.Web.Pages.Shared.Components.NewUserStatisticWidget diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs index 1e65fb23ff..5b28e3643f 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs +++ b/samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs @@ -1,6 +1,6 @@ -using DashboardDemo.Web.Bundles; -using Microsoft.AspNetCore.Mvc; +using Microsoft.AspNetCore.Mvc; using Volo.Abp.AspNetCore.Mvc; +using Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs; using Volo.Abp.AspNetCore.Mvc.UI.Widgets; namespace DashboardDemo.Web.Pages.Shared.Components.NewUserStatisticWidget diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js b/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js index c041f9c5c7..dbc138aecc 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js +++ b/samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js @@ -1,5 +1,4 @@ module.exports = { mappings: { - "@node_modules/chart.js/dist/*.*": "@libs/chart.js/" } }; \ No newline at end of file diff --git a/samples/DashboardDemo/src/DashboardDemo.Web/package.json b/samples/DashboardDemo/src/DashboardDemo.Web/package.json index b678de8d74..64cb356254 100644 --- a/samples/DashboardDemo/src/DashboardDemo.Web/package.json +++ b/samples/DashboardDemo/src/DashboardDemo.Web/package.json @@ -4,6 +4,6 @@ "private": true, "dependencies": { "@abp/aspnetcore.mvc.ui.theme.basic": "^0.6.6", - "chart.js": "^2.8.0" + "@abp/chart.js": "^0.8.0" } } \ No newline at end of file