Move web server functionality to the service, and update web-ui grunt tasks

1 files changed, 14 insertions, 19 deletions

diff --git a/web-ui/Gruntfile.js b/web-ui/Gruntfile.js
index 01c53007..082d55e1 100644
--- a/web-ui/Gruntfile.js
+++ b/web-ui/Gruntfile.js
@@ -45,7 +45,7 @@ module.exports = function (grunt) {
         files: ['test/spec/{,*/}*.js'],
         tasks: ['newer:jshint:test', 'karma']
       },
-      compass: {
+      sass: {
         files: ['<%= yeoman.app %>/scss/{,*/}*.scss'],
         tasks: ['compass:dev']
       },
@@ -53,15 +53,12 @@ module.exports = function (grunt) {
         files: ['<%= yeoman.app %>/index.html'],
         livereload: true
       },
-      handlebars: {
+      templates: {
         files: ['<%= yeoman.app %>/templates/**/*.hbs'],
         tasks: ['handlebars:dev']
       },
       gruntfile: {
         files: ['Gruntfile.js']
-      },
-      options: {
-        livereload: true
       }
     },
 
@@ -76,7 +73,7 @@ module.exports = function (grunt) {
       dev: {
         options: {
           sassDir: '<%= yeoman.app %>/scss',
-          cssDir: '.tmp/css'
+          cssDir: 'app/css'
         }
       }
     },
@@ -89,15 +86,6 @@ module.exports = function (grunt) {
         hostname: '0.0.0.0',
         livereload: true
       },
-      dev: {
-        options: {
-          base: [
-            '.tmp',
-            '<%= yeoman.app %>'
-          ]
-        },
-        livereload: true
-      },
       test: {
         options: {
           port: 9001,
@@ -382,9 +370,9 @@ module.exports = function (grunt) {
   grunt.loadNpmTasks('grunt-contrib-requirejs');
   grunt.loadNpmTasks('grunt-contrib-concat');
 
-  grunt.registerTask('serve', function (target) {
+  grunt.registerTask('build', function (target) {
     if (target === 'dist') {
-      return grunt.task.run(['package', 'connect:dist:keepalive']);
+      return grunt.task.run(['package', 'dist:keepalive']);
     }
 
     grunt.task.run([
@@ -392,11 +380,18 @@ module.exports = function (grunt) {
       'compass:dev',
       'handlebars:dev',
       'concurrent:server',
-      'update-control-tower',
-      'connect:dev',
+      'update-control-tower'
+    ]);
+  });
+
+  /*
+  grunt.registerTask('watch', function (target) {
+    grunt.task.run([
+      'build',
       'watch'
     ]);
   });
+  */
 
   grunt.registerTask('test-watch', [
     'clean:server',