NuCivic/nucivic-internal#554 New configuration system

Author: topicus

Gruntfile.js

@@ -4,36 +4,38 @@ module.exports = function(grunt) {
   grunt.initConfig({
     pkg: grunt.file.readJSON('package.json'),
     livereload: {
-
+      port: 9999
     },
     express: {
       all: {
         options: {
           bases: ['./'],
-          port: 8080,
+          port: 8888,
           hostname: '0.0.0.0',
-          livereload: true
+          livereload: {
+            port: 9999
+          }
         }
       }
     },
+    jshint: {
+      files: ['Gruntfile.js', 'src/**/*.js', 'examples/*.js' ],
+      options: {
+        jshintrc: true
+      }
+    },
     watch: {
-      all: {
-        files: '**/*.html',
-        options: {
-          livereload: true
-        }
+      files:  ['<%= jshint.files %>'],
+      tasks: ['jshint', 'concat', 'uglify'],
+      options: {
+        interval: 5007,
+        livereload: true
       }
     },
     open: {
       all: {
         path: 'http://localhost:8080/examples/index.html'
       }
-    },
-    jshint: {
-      all: ['Gruntfile.js', 'src/**/*.js', 'examples/*.js' ],
-      options: {
-        jshintrc: true
-      }
     }
   });
 
@@ -43,13 +45,18 @@ module.exports = function(grunt) {
   grunt.loadNpmTasks('grunt-livereload');
   grunt.loadNpmTasks('grunt-contrib-uglify');
   grunt.loadNpmTasks('grunt-contrib-concat');
+
   // Default task(s).
   grunt.registerTask('default', [
     'express',
-    'jshint',
     'open',
-    'watch'
+    'watch',
   ]);
 
+  grunt.registerTask('build', [
+    'jshint',
+    'concat',
+    'uglify'
+  ]);
   grunt.registerTask('lint', ['jshint']);
 };

bower.json

@@ -25,7 +25,7 @@
     "timeline": "2.29.1",
     "underscore.deferred": "*",
     "bootstrap-css": "2.3.2",
-    "nvd3": "*",
+    "nvd3": "https://github.com/novus/nvd3.git#development",
     "chosen-bootstrap": "*",
     "lodash": "*",
     "recline.backend.gdocs": "https://github.com/okfn/recline.backend.gdocs.git#e81bb237759353932834a38a0ec810441e0ada10",

css/img/cumulativeline.png

@@ -106,6 +106,6 @@
   background-image: url('img/scatter.png');
 }
 
-#chart-selector .linePlusBarChart {
-  background-image: url('img/lineplusbar.png');
+#chart-selector .cumulativeLineChart {
+  background-image: url('img/cumulativeline.png');
 }

css/style.css

@@ -20,7 +20,7 @@
   <script src="../vendor/chosen/chosen.jquery.js"></script>
   <script src="../vendor/csv.js/csv.js"></script>
   <script src="../vendor/recline.backend.gdocs/backend.gdocs.js"></script>
-  <script src="../vendor/lodash/dist/lodash.compat.min.js"></script>
+  <script src="../vendor/lodash/lodash.min.js"></script>
   <script src="../vendor/lodash.data/dist/lodash.data.min.js"></script>
   <script src="../vendor/backbone/backbone.js"></script>
   <script src="../vendor/mustache/mustache.js"></script>
@@ -49,7 +49,7 @@
       </div>
     </div>
   </div>
-  <footer style="position:absolute;bottom:10px;height:25px;text-align:center;width: 100%; font-size:12px;">
+  <footer style="text-align:center;width: 100%; font-size:12px;">
     <strong>Disclaimer:</strong> Early alpha phase, use at your own risk. Embed urls could change in the near future.
   </footer>
   <script type="text/javascript" src="../vendor/recline.view.nvd3.js/dist/recline.view.nvd3.min.js"></script>

examples/index.html

@@ -20,7 +20,7 @@
   <script src="../vendor/chosen/chosen.jquery.js"></script>
   <script src="../vendor/csv.js/csv.js"></script>
   <script src="../vendor/recline.backend.gdocs/backend.gdocs.js"></script>
-  <script src="../vendor/lodash/dist/lodash.compat.min.js"></script>
+  <script src="../vendor/lodash/lodash.min.js"></script>
   <script src="../vendor/lodash.data/dist/lodash.data.min.js"></script>
   <script src="../vendor/backbone/backbone.js"></script>
   <script src="../vendor/mustache/mustache.js"></script>

examples/view.html

@@ -17,7 +17,7 @@
                       '</div>' +
                       '<div class="form-group">' +
                         '<label>X Field</label>' +
-                        '<div>{{xfield}}</div>'+
+                        '<div>{{options.x}}</div>'+
                       '</div>' +
                       '<div class="form-group">' +
                         '<label>Series fields</label>' +

src/ChartOptionsView.js

@@ -50,7 +50,7 @@
     render: function(){
       var self = this;
       var graphTypes = ['discreteBarChart', 'multiBarChart', 'stackedAreaChart', 'pieChart',
-        'lineChart', 'lineWithFocusChart', 'scatterChart', 'linePlusBarChart'
+        'lineChart', 'lineWithFocusChart', 'scatterChart', 'cumulativeLineChart'
       ];
 
       self.state.set('graphTypes', _.applyOption(

src/ChooseChartView.js

@@ -62,9 +62,12 @@
     },
     updateState: function(state, cb){
       var self = this;
+      var options = state.get('options') || {};
       state.set('seriesFields', self.$('#control-chart-series').val());
-      state.set('xfield', self.$('#control-chart-xfield').val());
       state.set('xDataType', self.$('input[name=control-chart-x-data-type]:checked').val());
+      options.x = self.$('#control-chart-xfield').val();
+      state.set('options', options);
+
       cb(state);
     }
   });