From fafac3b4128a0993b0de1c6e8ca3062bf1ccc14e Mon Sep 17 00:00:00 2001 From: Roald de Vries Date: Thu, 8 Dec 2016 16:59:09 +0100 Subject: Revert "[#801] Merge branch 'signup'" This reverts commit d10f607a4d40587510b0dc31b31fe4750bf4a3a3, reversing changes made to c28abba2f5b1186c671ebef508d40ffaae6d5bc5. --- web-ui/config/add_git_version.sh | 2 +- web-ui/config/buildoptions.js | 4 +-- web-ui/config/compass.rb | 12 +++++---- web-ui/config/control-tower.yml | 2 +- web-ui/config/imagemin.js | 4 +-- web-ui/config/minify_app.sh | 34 ------------------------- web-ui/config/package.sh | 54 ++++++++++++++++++++++++++++++++++++++-- 7 files changed, 65 insertions(+), 47 deletions(-) delete mode 100644 web-ui/config/minify_app.sh (limited to 'web-ui/config') diff --git a/web-ui/config/add_git_version.sh b/web-ui/config/add_git_version.sh index abda150a..a0abefc0 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="public/js/generated/hbs/templates.js" +TEMPLATE_FILE="app/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 2e7ba028..63c91653 100644 --- a/web-ui/config/buildoptions.js +++ b/web-ui/config/buildoptions.js @@ -16,11 +16,11 @@ */ ({ - baseUrl: '../public', + baseUrl: '../app', wrap: true, almond: true, optimize: 'none', - mainConfigFile: '../public/js/main.js', + mainConfigFile: '../app/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 461bd9e2..9c52a04e 100644 --- a/web-ui/config/compass.rb +++ b/web-ui/config/compass.rb @@ -17,12 +17,14 @@ # Set this to the root of your project when deployed: +target_dir = ENV['PIXELATED_BUILD'] == 'package' ? 'dist' : 'app' + + http_path = "/" -css_dir = "public/css" -sass_dir = "public/scss" -images_dir = "src/images" -generated_images_dir = "public/images" -javascripts_dir = "public/js" +css_dir = "#{target_dir}/css" +sass_dir = "app/scss" +images_dir = "app/images" +javascripts_dir = "app/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 2d4d5865..874e1b64 100644 --- a/web-ui/config/control-tower.yml +++ b/web-ui/config/control-tower.yml @@ -1,3 +1,3 @@ --- -include_pattern: 'public/js/**/*.js' +include_pattern: 'app/js/**/*.js' exclude_pattern: '' diff --git a/web-ui/config/imagemin.js b/web-ui/config/imagemin.js index 6f94373e..2b2c87e0 100644 --- a/web-ui/config/imagemin.js +++ b/web-ui/config/imagemin.js @@ -17,8 +17,8 @@ const imagemin = require('imagemin'); -imagemin(['src/images/*.{gif,jpg,png,svg}'], - 'public/images' +imagemin(['app/images/*.{gif,jpg,png,svg}'], + 'dist/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 deleted file mode 100644 index d9e232a5..00000000 --- a/web-ui/config/minify_app.sh +++ /dev/null @@ -1,34 +0,0 @@ -#!/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 . - -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 06351257..165eeff3 100644 --- a/web-ui/config/package.sh +++ b/web-ui/config/package.sh @@ -18,11 +18,61 @@ set -e +export PIXELATED_BUILD='package' + +mkdir -p dist + # initial npm tasks -./go build +./go clean +./go compass +./go handlebars +./go imagemin +./go minify_html +./go minify_sandbox +./go add_git_version +./go buildmain + -if [ ! -s public/app.min.js ] +# 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 ] 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 -- cgit v1.2.3