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

5 files changed, 26 insertions, 22 deletions

diff --git a/.gitignore b/.gitignore
index 344e8bfc..d226c608 100644
--- a/.gitignore
+++ b/.gitignore
@@ -1,15 +1,16 @@
 .idea
 *.log
 *.DS_Store
-node_modules
-app/bower_components
+web-ui/node_modules
+web-ui/app/bower_components
 .tmp
 .sass-cache/
 dist/
 *archive.zip
 *.swp
 *.swo
-app/js/generated
+web-ui/app/js/generated
+web-ui/app/css
 test-results.xml
 control_tower.html
 state.yml
diff --git a/fake-service/Gemfile b/fake-service/Gemfile
index d7ecedc8..5b3eccda 100644
--- a/fake-service/Gemfile
+++ b/fake-service/Gemfile
@@ -3,6 +3,7 @@ source 'https://rubygems.org'
 gem "rake"
 gem "sinatra"
 gem "sinatra-contrib"
+gem "sinatra-index"
 gem "json"
 gem "faker"
 gem "shotgun"
diff --git a/fake-service/Gemfile.lock b/fake-service/Gemfile.lock
index f6695218..a5462ffb 100644
--- a/fake-service/Gemfile.lock
+++ b/fake-service/Gemfile.lock
@@ -85,6 +85,8 @@ GEM
       rack-test
       sinatra (~> 1.4.0)
       tilt (~> 1.3)
+    sinatra-index (0.0.2)
+      sinatra
     spoon (0.0.4)
       ffi
     tilt (1.4.1)
@@ -113,3 +115,4 @@ DEPENDENCIES
   shotgun
   sinatra
   sinatra-contrib
+  sinatra-index
diff --git a/fake-service/lib/pixelated_service/server.rb b/fake-service/lib/pixelated_service/server.rb
index d825a5e2..acf247b1 100644
--- a/fake-service/lib/pixelated_service/server.rb
+++ b/fake-service/lib/pixelated_service/server.rb
@@ -1,13 +1,17 @@
 require 'sinatra/base'
 require 'sinatra/json'
+require 'sinatra-index'
 require 'json'
 require 'net/http'
 
 module PixelatedService
   class Server < Sinatra::Base
     set :root, File.join(File.dirname(__FILE__), '../../')
+    set :public_folder, File.join(File.dirname(__FILE__), '../../../web-ui/app/')
 
     def json_body; JSON.parse request.body.read.to_s; end
+    register Sinatra::Index
+    use_static_index 'index.html'
 
     if ENV['RACK_ENV'] == 'staging'
       get    '/'            do File.read(File.join(settings.root, 'public', 'index.html')) end
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',