Browse Source

removed chart.js from dashboardDemo and used from framework

pull/1588/head
Yunus Emre Kalkan 7 years ago
parent
commit
41b7c9c1eb
  1. 12
      samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsScriptContributor.cs
  2. 12
      samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsStyleContributor.cs
  3. 4
      samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetScriptContributor.cs
  4. 4
      samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/LicenseStatisticWidget/LicenseStatisticWidgetViewComponent.cs
  5. 4
      samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetScriptContributor.cs
  6. 4
      samples/DashboardDemo/src/DashboardDemo.Web/Pages/Shared/Components/NewUserStatisticWidget/NewUserStatisticWidgetViewComponent.cs
  7. 1
      samples/DashboardDemo/src/DashboardDemo.Web/abp.resourcemapping.js
  8. 2
      samples/DashboardDemo/src/DashboardDemo.Web/package.json

12
samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsScriptContributor.cs

@ -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");
}
}
}

12
samples/DashboardDemo/src/DashboardDemo.Web/Bundles/ChartjsStyleContributor.cs

@ -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");
}
}
}

4
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

4
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

4
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

4
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

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

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

2
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"
}
}
Loading…
Cancel
Save