[#801] Merge branch 'signup'

7 files changed, 47 insertions, 65 deletions

diff --git a/web-ui/config/add_git_version.sh b/web-ui/config/add_git_version.sh
index a0abefc0..abda150a 100755
--- a/web-ui/config/add_git_version.sh
+++ b/web-ui/config/add_git_version.sh
@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-TEMPLATE_FILE="app/js/generated/hbs/templates.js"
+TEMPLATE_FILE="public/js/generated/hbs/templates.js"
 
 COMMITISH=$(git rev-parse --short HEAD)
 COMMITDATE=$(git show -s --format=%cd)
diff --git a/web-ui/config/buildoptions.js b/web-ui/config/buildoptions.js
index 63c91653..2e7ba028 100644
--- a/web-ui/config/buildoptions.js
+++ b/web-ui/config/buildoptions.js
@@ -16,11 +16,11 @@
  */
 
 ({
-  baseUrl: '../app',
+  baseUrl: '../public',
   wrap: true,
   almond: true,
   optimize: 'none',
-  mainConfigFile: '../app/js/main.js',
+  mainConfigFile: '../public/js/main.js',
   out: '../.tmp/app.concatenated.js',
   include: ['js/main'],
   name: 'bower_components/almond/almond'
diff --git a/web-ui/config/compass.rb b/web-ui/config/compass.rb
index 9c52a04e..461bd9e2 100644
--- a/web-ui/config/compass.rb
+++ b/web-ui/config/compass.rb
@@ -17,14 +17,12 @@
 
 # Set this to the root of your project when deployed:
 
-target_dir = ENV['PIXELATED_BUILD'] == 'package' ? 'dist' : 'app'
-
-
 http_path = "/"
-css_dir = "#{target_dir}/css"
-sass_dir = "app/scss"
-images_dir = "app/images"
-javascripts_dir = "app/js"
+css_dir = "public/css"
+sass_dir = "public/scss"
+images_dir = "src/images"
+generated_images_dir = "public/images"
+javascripts_dir = "public/js"
 
 # You can select your preferred output style here (can be overridden via the command line):
 # output_style = :expanded or :nested or :compact or :compressed
diff --git a/web-ui/config/control-tower.yml b/web-ui/config/control-tower.yml
index 874e1b64..2d4d5865 100644
--- a/web-ui/config/control-tower.yml
+++ b/web-ui/config/control-tower.yml
@@ -1,3 +1,3 @@
 ---
-include_pattern: 'app/js/**/*.js'
+include_pattern: 'public/js/**/*.js'
 exclude_pattern: ''
diff --git a/web-ui/config/imagemin.js b/web-ui/config/imagemin.js
index 2b2c87e0..6f94373e 100644
--- a/web-ui/config/imagemin.js
+++ b/web-ui/config/imagemin.js
@@ -17,8 +17,8 @@
 
 const imagemin = require('imagemin');
 
-imagemin(['app/images/*.{gif,jpg,png,svg}'],
-         'dist/images'
+imagemin(['src/images/*.{gif,jpg,png,svg}'],
+         'public/images'
 ).then(files => {
   console.log('Images list:')
   files.map(function(file) { console.log(file.path); });
diff --git a/web-ui/config/minify_app.sh b/web-ui/config/minify_app.sh
new file mode 100644
index 00000000..d9e232a5
--- /dev/null
+++ b/web-ui/config/minify_app.sh
@@ -0,0 +1,34 @@
+#!/bin/bash
+# Copyright (c) 2014 ThoughtWorks, Inc.
+#
+# Pixelated is free software: you can redistribute it and/or modify
+# it under the terms of the GNU Affero General Public License as published by
+# the Free Software Foundation, either version 3 of the License, or
+# (at your option) any later version.
+#
+# Pixelated is distributed in the hope that it will be useful,
+# but WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+# GNU Affero General Public License for more details.
+#
+# You should have received a copy of the GNU Affero General Public License
+# along with Pixelated. If not, see <http://www.gnu.org/licenses/>.
+
+set -e
+
+# concat js files and minify for app.min.js
+cat \
+public/bower_components/modernizr/modernizr.js \
+public/bower_components/lodash/dist/lodash.js \
+public/bower_components/jquery/dist/jquery.js \
+public/bower_components/jquery-ui/jquery-ui.js \
+public/bower_components/jquery-file-upload/js/jquery.fileupload.js \
+public/js/lib/highlightRegex.js \
+public/bower_components/handlebars/handlebars.js \
+public/bower_components/typeahead.js/dist/typeahead.bundle.js \
+public/bower_components/foundation/js/foundation.js \
+public/bower_components/foundation/js/foundation/foundation.reveal.js \
+public/bower_components/foundation/js/foundation/foundation.offcanvas.js \
+public/js/foundation/initialize_foundation.js \
+public/bower_components/iframe-resizer/js/iframeResizer.js \
+.tmp/app.concatenated.js | node_modules/.bin/minify --js > public/app.min.js
diff --git a/web-ui/config/package.sh b/web-ui/config/package.sh
index 165eeff3..06351257 100644
--- a/web-ui/config/package.sh
+++ b/web-ui/config/package.sh
@@ -18,61 +18,11 @@
 
 set -e
 
-export PIXELATED_BUILD='package'
-
-mkdir -p dist
-
 # initial npm tasks
-./go clean
-./go compass
-./go handlebars
-./go imagemin
-./go minify_html
-./go minify_sandbox
-./go add_git_version
-./go buildmain
-
+./go build
 
-# copy files
-cd app
-cp --parents \
-404.html \
-fonts/* \
-locales/**/* \
-bower_components/font-awesome/css/font-awesome.min.css \
-bower_components/jquery-file-upload/css/jquery.fileupload.css \
-bower_components/font-awesome/fonts/* \
-../dist
-cd -
-
-# concat js files and minify for app.min.js
-cat \
-app/bower_components/modernizr/modernizr.js \
-app/bower_components/lodash/dist/lodash.js \
-app/bower_components/jquery/dist/jquery.js \
-app/bower_components/jquery-ui/jquery-ui.js \
-app/bower_components/jquery-file-upload/js/jquery.fileupload.js \
-app/js/lib/highlightRegex.js \
-app/bower_components/handlebars/handlebars.js \
-app/bower_components/typeahead.js/dist/typeahead.bundle.js \
-app/bower_components/foundation/js/foundation.js \
-app/bower_components/foundation/js/foundation/foundation.reveal.js \
-app/bower_components/foundation/js/foundation/foundation.offcanvas.js \
-app/js/foundation/initialize_foundation.js \
-app/bower_components/iframe-resizer/js/iframeResizer.js \
-.tmp/app.concatenated.js > dist/app.js
-node_modules/.bin/minify dist/app.js > dist/app.min.js
-rm dist/app.js
-
-if [ ! -s dist/app.min.js ]
+if [ ! -s public/app.min.js ]
 then
 echo "Minification failed!"
 exit 1;
 fi
-
-# concat js files and minify for sandbox.min.js
-cat \
-app/js/sandbox.js \
-app/bower_components/iframe-resizer/js/iframeResizer.contentWindow.js > dist/sandbox.js
-node_modules/.bin/minify dist/sandbox.js > dist/sandbox.min.js
-rm dist/sandbox.js