diff --git a/bower.json b/bower.json index 9b0d77b..278bf9a 100644 --- a/bower.json +++ b/bower.json @@ -42,7 +42,8 @@ "leaflet": "~0.7.5", "moment": "~2.10.6", "slimScroll": "jquery-slimscroll#~1.3.6", - "angular-progress-button-styles": "~0.1.0" + "angular-progress-button-styles": "~0.1.0", + "angular-chart.js": "~0.8.8" }, "overrides": { "amcharts": { diff --git a/src/app/app.js b/src/app/app.js index 165026e..7bdaaec 100644 --- a/src/app/app.js +++ b/src/app/app.js @@ -9,7 +9,8 @@ var blurAdminApp = angular.module('BlurAdmin', [ 'BlurAdmin.mail', 'BlurAdmin.buttonsPage', 'BlurAdmin.gridPage', - 'BlurAdmin.chartsPage', + 'BlurAdmin.amChartsPage', + 'BlurAdmin.chartJsPage', 'BlurAdmin.alertsPage', 'BlurAdmin.formInputsPage', 'BlurAdmin.formLayoutsPage', diff --git a/src/app/pages/charts/charts.html b/src/app/pages/charts/amCharts/charts.html similarity index 100% rename from src/app/pages/charts/charts.html rename to src/app/pages/charts/amCharts/charts.html diff --git a/src/app/pages/charts/charts.js b/src/app/pages/charts/amCharts/charts.js similarity index 57% rename from src/app/pages/charts/charts.js rename to src/app/pages/charts/amCharts/charts.js index 8491d4b..0f3804c 100644 --- a/src/app/pages/charts/charts.js +++ b/src/app/pages/charts/amCharts/charts.js @@ -1,10 +1,10 @@ 'use strict'; -angular.module('BlurAdmin.chartsPage', ['ngRoute']) +angular.module('BlurAdmin.amChartsPage', ['ngRoute']) .config(['$routeProvider', function ($routeProvider) { - $routeProvider.when('/charts', { - templateUrl: 'app/pages/charts/charts.html', + $routeProvider.when('/amCharts', { + templateUrl: 'app/pages/charts/amCharts/charts.html', controller: 'chartsPageCtrl' }); }]) @@ -15,21 +15,21 @@ angular.module('BlurAdmin.chartsPage', ['ngRoute']) [ { title: 'Bar Chart', - url: 'app/pages/charts/widgets/barChart/barChart.html' + url: 'app/pages/charts/amCharts/widgets/barChart/barChart.html' }, { title: 'Line Chart', - url: 'app/pages/charts/widgets/lineChart/lineChart.html' + url: 'app/pages/charts/amCharts/widgets/lineChart/lineChart.html' } ], [ { title: 'Area Chart', - url: 'app/pages/charts/widgets/areaChart/areaChart.html' + url: 'app/pages/charts/amCharts/widgets/areaChart/areaChart.html' }, { title: 'Funnel Chart', - url: 'app/pages/charts/widgets/funnelChart/funnelChart.html' + url: 'app/pages/charts/amCharts/widgets/funnelChart/funnelChart.html' } ] ] @@ -39,7 +39,7 @@ angular.module('BlurAdmin.chartsPage', ['ngRoute']) [ { title: 'Pie Chart', - url: 'app/pages/charts/widgets/pieChart/pieChart.html' + url: 'app/pages/charts/amCharts/widgets/pieChart/pieChart.html' } ] ] diff --git a/src/app/pages/charts/widgets/areaChart/areaChart.html b/src/app/pages/charts/amCharts/widgets/areaChart/areaChart.html similarity index 100% rename from src/app/pages/charts/widgets/areaChart/areaChart.html rename to src/app/pages/charts/amCharts/widgets/areaChart/areaChart.html diff --git a/src/app/pages/charts/widgets/areaChart/areaChart.js b/src/app/pages/charts/amCharts/widgets/areaChart/areaChart.js similarity index 100% rename from src/app/pages/charts/widgets/areaChart/areaChart.js rename to src/app/pages/charts/amCharts/widgets/areaChart/areaChart.js diff --git a/src/app/pages/charts/widgets/barChart/barChart.html b/src/app/pages/charts/amCharts/widgets/barChart/barChart.html similarity index 100% rename from src/app/pages/charts/widgets/barChart/barChart.html rename to src/app/pages/charts/amCharts/widgets/barChart/barChart.html diff --git a/src/app/pages/charts/widgets/barChart/barChart.js b/src/app/pages/charts/amCharts/widgets/barChart/barChart.js similarity index 100% rename from src/app/pages/charts/widgets/barChart/barChart.js rename to src/app/pages/charts/amCharts/widgets/barChart/barChart.js diff --git a/src/app/pages/charts/widgets/funnelChart/funnelChart.html b/src/app/pages/charts/amCharts/widgets/funnelChart/funnelChart.html similarity index 100% rename from src/app/pages/charts/widgets/funnelChart/funnelChart.html rename to src/app/pages/charts/amCharts/widgets/funnelChart/funnelChart.html diff --git a/src/app/pages/charts/widgets/funnelChart/funnelChart.js b/src/app/pages/charts/amCharts/widgets/funnelChart/funnelChart.js similarity index 100% rename from src/app/pages/charts/widgets/funnelChart/funnelChart.js rename to src/app/pages/charts/amCharts/widgets/funnelChart/funnelChart.js diff --git a/src/app/pages/charts/widgets/lineChart/lineChart.html b/src/app/pages/charts/amCharts/widgets/lineChart/lineChart.html similarity index 100% rename from src/app/pages/charts/widgets/lineChart/lineChart.html rename to src/app/pages/charts/amCharts/widgets/lineChart/lineChart.html diff --git a/src/app/pages/charts/widgets/lineChart/lineChart.js b/src/app/pages/charts/amCharts/widgets/lineChart/lineChart.js similarity index 100% rename from src/app/pages/charts/widgets/lineChart/lineChart.js rename to src/app/pages/charts/amCharts/widgets/lineChart/lineChart.js diff --git a/src/app/pages/charts/widgets/pieChart/pieChart.html b/src/app/pages/charts/amCharts/widgets/pieChart/pieChart.html similarity index 100% rename from src/app/pages/charts/widgets/pieChart/pieChart.html rename to src/app/pages/charts/amCharts/widgets/pieChart/pieChart.html diff --git a/src/app/pages/charts/widgets/pieChart/pieChart.js b/src/app/pages/charts/amCharts/widgets/pieChart/pieChart.js similarity index 100% rename from src/app/pages/charts/widgets/pieChart/pieChart.js rename to src/app/pages/charts/amCharts/widgets/pieChart/pieChart.js diff --git a/src/app/pages/charts/chartJs/chartJs.html b/src/app/pages/charts/chartJs/chartJs.html new file mode 100644 index 0000000..0bd5efb --- /dev/null +++ b/src/app/pages/charts/chartJs/chartJs.html @@ -0,0 +1,53 @@ +