Merge pull request #1588 from abpframework/AddChartJsLibrary

Add chart js library

samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsScriptContributor.cs → framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/ChartJs/ChartjsScriptContributor.cs

@@ -1,6 +1,6 @@
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
-namespace DashboardDemo.Web.Bundles
+namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs
 {
     public class ChartjsScriptContributor : BundleContributor
     {

samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsStyleContributor.cs → framework/src/Volo.Abp.AspNetCore.Mvc.UI.Packages/Volo/Abp/AspNetCore/Mvc/UI/Packages/ChartJs/ChartjsStyleContributor.cs

@@ -1,6 +1,6 @@
 using Volo.Abp.AspNetCore.Mvc.UI.Bundling;
 
-namespace DashboardDemo.Web.Bundles
+namespace Volo.Abp.AspNetCore.Mvc.UI.Packages.ChartJs
 {
     public class ChartjsStyleContributor : BundleContributor
     {

npm/packs/chart.js/abp.resourcemapping.js

@@ -0,0 +1,5 @@
+module.exports = {
+    mappings: {
+        "@node_modules/chart.js/dist/*.*": "@libs/chart.js/"
+    }
+}

npm/packs/chart.js/package.json

@@ -0,0 +1,11 @@
+{
+  "version": "0.8.0",
+  "name": "@abp/chart.js",
+  "publishConfig": {
+    "access": "public"
+  },
+  "dependencies": {
+    "chart.js": "^2.8.0"
+  },
+  "gitHead": "4d6791834b7723d8ad78ba4d23ae3425f170fdeb"
+}

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

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

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

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

samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js

@@ -1,5 +1,4 @@
 module.exports = {
     mappings: {
-        "@node_modules/chart.js/dist/*.*": "@libs/chart.js/"
     }
 };

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"
   }
 }