From 8332c28f9720c79f852098d87a2ebb48ef33c4b4 Mon Sep 17 00:00:00 2001 From: Eric Rowell Date: Sun, 22 Jun 2014 00:19:05 -0700 Subject: [PATCH] refactored examples. integrated new charts data structure which powers examples, tests, and chart wizard --- Gruntfile.js | 63 +- examples/chart.html | 24 +- examples/data/bar-dual-series-data.js | 67 + examples/data/bar-series-data.js | 47 + examples/data/bar-series-data.json | 47 - examples/data/bar-series-dual-data.json | 67 - examples/data/line-series-data.js | 19 + examples/data/line-series-data.json | 19 - examples/index.html | 8 +- .../src/bar-chart-dual-with-right-legend.js | 64 - .../src/bar-chart-dual-with-top-legend.js | 64 - examples/src/bar-chart-dual.js | 55 - examples/src/bar-chart-spark.js | 26 - examples/src/bar-chart-with-right-legend.js | 62 + examples/src/bar-chart-with-top-legend.js | 62 + examples/src/bar-chart.js | 102 +- examples/src/bar-dual-chart.js | 53 + examples/src/bar-spark-chart.js | 24 + examples/src/charts.js | 2 + examples/src/line-chart-with-bottom-slider.js | 92 +- examples/src/line-chart-with-grid.js | 105 +- .../src/line-chart-with-horizontal-lines.js | 87 +- examples/src/line-chart-with-right-legend.js | 96 +- examples/src/line-chart-with-title.js | 85 +- examples/src/line-chart-with-top-legend.js | 89 +- .../src/line-chart-with-vertical-lines.js | 90 +- examples/src/line-chart.js | 76 +- examples/src/line-spark-chart.js | 44 +- lib/underscore.js | 1343 +++++++++++++++++ 29 files changed, 2164 insertions(+), 818 deletions(-) create mode 100644 examples/data/bar-dual-series-data.js create mode 100644 examples/data/bar-series-data.js delete mode 100644 examples/data/bar-series-data.json delete mode 100644 examples/data/bar-series-dual-data.json create mode 100644 examples/data/line-series-data.js delete mode 100644 examples/data/line-series-data.json delete mode 100644 examples/src/bar-chart-dual-with-right-legend.js delete mode 100644 examples/src/bar-chart-dual-with-top-legend.js delete mode 100644 examples/src/bar-chart-dual.js delete mode 100644 examples/src/bar-chart-spark.js create mode 100644 examples/src/bar-chart-with-right-legend.js create mode 100644 examples/src/bar-chart-with-top-legend.js create mode 100644 examples/src/bar-dual-chart.js create mode 100644 examples/src/bar-spark-chart.js create mode 100644 examples/src/charts.js create mode 100644 lib/underscore.js diff --git a/Gruntfile.js b/Gruntfile.js index a63c79d..eee3b33 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -47,6 +47,33 @@ module.exports = function(grunt) { 'src/Formatter.js' ]; + var allChartFiles = [ + 'examples/src/charts.js', + + // data + 'examples/data/line-series-data.js', + 'examples/data/bar-series-data.js', + 'examples/data/bar-dual-series-data.js', + + // line charts + 'examples/src/line-chart.js', + 'examples/src/line-spark-chart.js', + 'examples/src/line-chart-with-top-legend.js', + 'examples/src/line-chart-with-right-legend.js', + 'examples/src/line-chart-with-title.js', + 'examples/src/line-chart-with-grid.js', + 'examples/src/line-chart-with-horizontal-lines.js', + 'examples/src/line-chart-with-vertical-lines.js', + 'examples/src/line-chart-with-bottom-slider.js', + + // bar charts + 'examples/src/bar-chart.js', + 'examples/src/bar-spark-chart.js', + 'examples/src/bar-dual-chart.js', + 'examples/src/bar-chart-with-top-legend.js', + 'examples/src/bar-chart-with-right-legend.js' + ]; + // Project configuration. var config = { pkg: grunt.file.readJSON('package.json'), @@ -73,7 +100,11 @@ module.exports = function(grunt) { prodMinLicense: { src: ['license.js', 'dist/meteorcharts-v<%= pkg.version %>.min.js'], dest: 'dist/meteorcharts-v<%= pkg.version %>.min.js' - } + }, + examples: { + src: allChartFiles, + dest: 'examples/dist/all-charts.js' + }, }, uglify: { build: { @@ -107,22 +138,6 @@ module.exports = function(grunt) { dest: 'dist/meteorcharts-dev.js' }] }, - examples: { - options: { - variables: { - LINE_SERIES_DATA: grunt.file.read('examples/data/line-series-data.json'), - BAR_SERIES_DATA: grunt.file.read('examples/data/bar-series-data.json'), - BAR_SERIES_DUAL_DATA: grunt.file.read('examples/data/bar-series-dual-data.json') - }, - prefix: '@@' - }, - - files: [{ - expand: true, flatten: true, - src: ['examples/src/*.js'], - dest: 'examples/dist/' - }] - }, prodSrcLicense: { options: { variables: { @@ -165,20 +180,12 @@ module.exports = function(grunt) { }, watch: { src: { - files: ['src/**/*.js'], - tasks: ['dev'], + files: ['src/**/*.js', 'examples/**/*.js'], + tasks: ['dev', 'examples'], options: { spawn: false, }, } - }, - copy: { - examples: { - flatten: true, - expand: true, - src: ['examples/src/*'], - dest: 'examples/dist/', - } } }; @@ -196,7 +203,7 @@ module.exports = function(grunt) { // Tasks grunt.registerTask('dev', ['clean:dist', 'concat:dev', 'concat:dev2', 'replace:dev']); - grunt.registerTask('examples', ['clean:examples', 'copy:examples:', 'replace:examples']); + grunt.registerTask('examples', ['clean:examples', 'concat:examples']); grunt.registerTask('full', ['clean:dist', 'concat:prodSrc', 'uglify', 'concat:prodSrcLicense', 'concat:prodMinLicense', 'replace:prodSrcLicense', 'replace:prodMinLicense']); grunt.registerTask('test', ['simplemocha']); grunt.registerTask('devtest', ['dev', 'test']); diff --git a/examples/chart.html b/examples/chart.html index 0d86b67..5733d9a 100644 --- a/examples/chart.html +++ b/examples/chart.html @@ -15,11 +15,9 @@ + - - + \ No newline at end of file diff --git a/examples/data/bar-dual-series-data.js b/examples/data/bar-dual-series-data.js new file mode 100644 index 0000000..61e2008 --- /dev/null +++ b/examples/data/bar-dual-series-data.js @@ -0,0 +1,67 @@ +DATA.BAR_DUAL_SERIES = [ + { + title: 'Califonia', + bars: [ + { + title: 'Republicans', + value: 5 + }, + { + title: 'Democrats', + value: 95 + } + ] + }, + { + title: 'New York', + bars: [ + { + title: 'Republicans', + value: 15 + }, + { + title: 'Democrats', + value: 85 + } + ] + }, + { + title: 'Colorado', + bars: [ + { + title: 'Republicans', + value: 25 + }, + { + title: 'Democrats', + value: 75 + } + ] + }, + { + title: 'Florida', + bars: [ + { + title: 'Republicans', + value: 45 + }, + { + title: 'Democrats', + value: 55 + } + ] + }, + { + title: 'Texas', + bars: [ + { + title: 'Republicans', + value: 85 + }, + { + title: 'Democrats', + value: 15 + } + ] + } +] \ No newline at end of file diff --git a/examples/data/bar-series-data.js b/examples/data/bar-series-data.js new file mode 100644 index 0000000..ea3caec --- /dev/null +++ b/examples/data/bar-series-data.js @@ -0,0 +1,47 @@ +DATA.BAR_SERIES = [ + { + title: 'Califonia', + bars: [ + { + title: 'Republicans', + value: 10 + } + ] + }, + { + title: 'New York', + bars: [ + { + title: 'Republicans', + value: 15 + } + ] + }, + { + title: 'Colorado', + bars: [ + { + title: 'Republicans', + value: 25 + } + ] + }, + { + title: 'Florida', + bars: [ + { + title: 'Republicans', + value: 45 + } + ] + }, + { + title: 'Texas', + bars: [ + { + title: 'Republicans', + value: 85 + } + ] + } +] \ No newline at end of file diff --git a/examples/data/bar-series-data.json b/examples/data/bar-series-data.json deleted file mode 100644 index bc4ef67..0000000 --- a/examples/data/bar-series-data.json +++ /dev/null @@ -1,47 +0,0 @@ -[ - { - title: 'Califonia', - bars: [ - { - title: 'Republicans', - value: 10 - } - ] - }, - { - title: 'New York', - bars: [ - { - title: 'Republicans', - value: 15 - } - ] - }, - { - title: 'Colorado', - bars: [ - { - title: 'Republicans', - value: 25 - } - ] - }, - { - title: 'Florida', - bars: [ - { - title: 'Republicans', - value: 45 - } - ] - }, - { - title: 'Texas', - bars: [ - { - title: 'Republicans', - value: 85 - } - ] - } - ] \ No newline at end of file diff --git a/examples/data/bar-series-dual-data.json b/examples/data/bar-series-dual-data.json deleted file mode 100644 index 076143b..0000000 --- a/examples/data/bar-series-dual-data.json +++ /dev/null @@ -1,67 +0,0 @@ -[ - { - title: 'Califonia', - bars: [ - { - title: 'Republicans', - value: 5 - }, - { - title: 'Democrats', - value: 95 - } - ] - }, - { - title: 'New York', - bars: [ - { - title: 'Republicans', - value: 15 - }, - { - title: 'Democrats', - value: 85 - } - ] - }, - { - title: 'Colorado', - bars: [ - { - title: 'Republicans', - value: 25 - }, - { - title: 'Democrats', - value: 75 - } - ] - }, - { - title: 'Florida', - bars: [ - { - title: 'Republicans', - value: 45 - }, - { - title: 'Democrats', - value: 55 - } - ] - }, - { - title: 'Texas', - bars: [ - { - title: 'Republicans', - value: 85 - }, - { - title: 'Democrats', - value: 15 - } - ] - } - ] \ No newline at end of file diff --git a/examples/data/line-series-data.js b/examples/data/line-series-data.js new file mode 100644 index 0000000..d166df5 --- /dev/null +++ b/examples/data/line-series-data.js @@ -0,0 +1,19 @@ +DATA.LINE_SERIES = [ + { + title: 'Series 1', + points: [ + -100, -100, + 100, 100, + 200, 50 + ] + }, + { + title: 'Series 2', + points: [ + 0, 100, + 100, 200, + 200, 150, + 300, 200 + ] + } +]; \ No newline at end of file diff --git a/examples/data/line-series-data.json b/examples/data/line-series-data.json deleted file mode 100644 index 37fc737..0000000 --- a/examples/data/line-series-data.json +++ /dev/null @@ -1,19 +0,0 @@ -[ - { - title: 'Series 1', - points: [ - -100, -100, - 100, 100, - 200, 50 - ] - }, - { - title: 'Series 2', - points: [ - 0, 100, - 100, 200, - 200, 150, - 300, 200 - ] - } - ] \ No newline at end of file diff --git a/examples/index.html b/examples/index.html index a412939..e56710e 100644 --- a/examples/index.html +++ b/examples/index.html @@ -16,10 +16,10 @@

Line Charts

Bar Charts