created examples build in prep for new chart wizard

ericdrowell · Jun 20, 2014 · b0d6ac1 · b0d6ac1
1 parent b12fb3d
commit b0d6ac1
Show file tree

Hide file tree

Showing 25 changed files with 195 additions and 177 deletions.
diff --git a/.gitignore b/.gitignore
@@ -1,5 +1,6 @@
 *.sublime-project
 *.sublime-workspace
 /dist
+/examples/dist
 /node_modules
 /docs
diff --git a/Gruntfile.js b/Gruntfile.js
@@ -83,7 +83,8 @@ module.exports = function(grunt) {
       }
     },
     clean: {
-      build: ['dist/*']
+      dist: ['dist/*'],
+      examples: ['examples/dist/*']
     },
     jshint: {
       options: {
@@ -106,6 +107,22 @@ 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: {
@@ -154,19 +171,15 @@ module.exports = function(grunt) {
           spawn: false,
         },
       }
-    }
-    /*
-    shell: {
-      test: {
-        command: 'mocha -u tdd -d -v -R spec test/build/meteorcharts-test.js',
-        options: {
-          callback: function(err, stdout, stderr, cb) {
-            console.log(stdout);
-            cb();
-          }
-        }
+    },
+    copy: {
+      examples: {
+        flatten: true,
+        expand: true,
+        src: ['examples/src/*'],
+        dest: 'examples/dist/',
       }
-    }*/
+    }
   };
 
   grunt.initConfig(config);
@@ -179,10 +192,12 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-contrib-jshint');
   grunt.loadNpmTasks('grunt-simple-mocha');
   grunt.loadNpmTasks('grunt-contrib-watch');
+  grunt.loadNpmTasks('grunt-contrib-copy');
 
   // Tasks
-  grunt.registerTask('dev', ['clean', 'concat:dev', 'concat:dev2', 'replace:dev']);
-  grunt.registerTask('full', ['clean', 'concat:prodSrc', 'uglify', 'concat:prodSrcLicense', 'concat:prodMinLicense', 'replace:prodSrcLicense', 'replace:prodMinLicense']);
+  grunt.registerTask('dev', ['clean:dist', 'concat:dev', 'concat:dev2', 'replace:dev']);
+  grunt.registerTask('examples', ['clean:examples', 'copy:examples:', 'replace: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
@@ -16,9 +16,10 @@
     <script src="../../../lib/three.min.js"></script>
     <script src="../../../lib/moment.min.js"></script>
     <script src="../../../dist/meteorcharts-dev.js"></script>
-    <script src="data/line-series-data.js"></script>
-    <script src="data/bar-series-data.js"></script>
-    <script src="data/bar-series-dual-data.js"></script>
+
+    <script>
+      var CHARTS = [];
+    </script>
 
     <script type="text/javascript">
       var QUERY_STRING = function () {
@@ -47,7 +48,7 @@
 
       var js = document.createElement('script');
       js.type = 'text/javascript';
-      js.src = 'charts/' + QUERY_STRING.chart + '.js';
+      js.src = 'dist/' + QUERY_STRING.chart + '.js';
       document.body.appendChild(js);
     </script>
   </body>

diff --git a/examples/data/bar-series-data.js b/examples/data/bar-series-data.js
diff --git a/examples/data/bar-series-data.json b/examples/data/bar-series-data.json
@@ -0,0 +1,47 @@
+[
+        {
+          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
+            }
+          ]
+        }
+      ]
diff --git a/examples/data/bar-series-dual-data.js b/examples/data/bar-series-dual-data.js
diff --git a/examples/data/bar-series-dual-data.json b/examples/data/bar-series-dual-data.json
@@ -0,0 +1,67 @@
+[
+        {
+          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
+            }
+          ]
+        }
+      ]
diff --git a/examples/data/line-series-data.js b/examples/data/line-series-data.js
diff --git a/examples/data/line-series-data.json b/examples/data/line-series-data.json
@@ -0,0 +1,19 @@
+[
+        {
+          title: 'Series 1',
+          points: [
+            -100, -100,
+            100, 100,
+            200, 50
+          ]
+        },
+        {
+          title: 'Series 2',
+          points: [
+            0, 100,
+            100, 200,
+            200, 150,
+            300, 200
+          ]
+        }
+      ]
diff --git a/...harts/bar-chart-dual-with-right-legend.js → ...s/src/bar-chart-dual-with-right-legend.js b/...harts/bar-chart-dual-with-right-legend.js → ...s/src/bar-chart-dual-with-right-legend.js
@@ -40,10 +40,10 @@ var chart = new MeteorChart({
         min: 0,
         max: 100
       },
-      data: BAR_SERIES_DUAL_DATA,
+      data: @@BAR_SERIES_DUAL_DATA,
       style: function() {
         return {
-          barWidth: (this.get('width') / 10) - 10
+          barWidth: (this.get('width') / 12)
         };
       }
     },