From b14833fbb56bcd5bff0750c16fd9214009b955be Mon Sep 17 00:00:00 2001
From: Zara Gebru <zgebru@thoughtworks.com>
Date: Fri, 2 Dec 2016 15:25:23 +0100
Subject: [refactor] move app dir into public dir

---
 web-ui/config/add_git_version.sh |  2 +-
 web-ui/config/buildoptions.js    |  4 ++--
 web-ui/config/compass.rb         |  8 ++++----
 web-ui/config/control-tower.yml  |  2 +-
 web-ui/config/imagemin.js        |  2 +-
 web-ui/config/package.sh         | 32 ++++++++++++++++----------------
 6 files changed, 25 insertions(+), 25 deletions(-)

(limited to 'web-ui/config')

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..bc0301a3 100644
--- a/web-ui/config/compass.rb
+++ b/web-ui/config/compass.rb
@@ -17,14 +17,14 @@
 
 # Set this to the root of your project when deployed:
 
-target_dir = ENV['PIXELATED_BUILD'] == 'package' ? 'dist' : 'app'
+target_dir = ENV['PIXELATED_BUILD'] == 'package' ? 'dist' : 'public'
 
 
 http_path = "/"
 css_dir = "#{target_dir}/css"
-sass_dir = "app/scss"
-images_dir = "app/images"
-javascripts_dir = "app/js"
+sass_dir = "public/scss"
+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..bbc589a8 100644
--- a/web-ui/config/imagemin.js
+++ b/web-ui/config/imagemin.js
@@ -17,7 +17,7 @@
 
 const imagemin = require('imagemin');
 
-imagemin(['app/images/*.{gif,jpg,png,svg}'],
+imagemin(['public/images/*.{gif,jpg,png,svg}'],
          'dist/images'
 ).then(files => {
   console.log('Images list:')
diff --git a/web-ui/config/package.sh b/web-ui/config/package.sh
index 165eeff3..d4208ecb 100644
--- a/web-ui/config/package.sh
+++ b/web-ui/config/package.sh
@@ -34,7 +34,7 @@ mkdir -p dist
 
 
 # copy files
-cd app
+cd public
 cp --parents \
 404.html \
 fonts/* \
@@ -47,19 +47,19 @@ 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 \
+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 > dist/app.js
 node_modules/.bin/minify dist/app.js > dist/app.min.js
 rm dist/app.js
@@ -72,7 +72,7 @@ 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
+public/js/sandbox.js \
+public/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
-- 
cgit v1.2.3