From bc922deb23a72d6ca1bf4c39efd1d7366baa9a84 Mon Sep 17 00:00:00 2001 From: Tayane Fernandes Date: Tue, 7 Feb 2017 17:39:09 -0200 Subject: [#922] Refactoring react folder structure with @anikarni --- web-ui/config/alias-webpack.js | 1 + web-ui/config/copy-webpack.js | 2 +- 2 files changed, 2 insertions(+), 1 deletion(-) (limited to 'web-ui/config') diff --git a/web-ui/config/alias-webpack.js b/web-ui/config/alias-webpack.js index 43b23836..d316bb2d 100644 --- a/web-ui/config/alias-webpack.js +++ b/web-ui/config/alias-webpack.js @@ -7,6 +7,7 @@ module.exports = { 'flight': path.join(__dirname, '../app/bower_components/flight'), 'found': path.join(__dirname, '../app/bower_components/foundation'), 'js': path.join(__dirname, '../app/js'), + 'src': path.join(__dirname, '../src'), 'scss': path.join(__dirname, '../app/scss'), 'mail_list': path.join(__dirname, '../app/js/mail_list'), 'page': path.join(__dirname, '../app/js/page'), diff --git a/web-ui/config/copy-webpack.js b/web-ui/config/copy-webpack.js index a2567be6..8e9f9dd3 100644 --- a/web-ui/config/copy-webpack.js +++ b/web-ui/config/copy-webpack.js @@ -4,7 +4,7 @@ module.exports = new CopyWebpackPlugin([ { context: 'app/', from: '404.html' }, { context: 'app/', from: 'index.html' }, { context: 'app/', from: 'sandbox.html' }, - { context: 'app/', from: 'account_recovery.html' }, + { context: 'src/account_recovery/', from: 'account_recovery.html' }, { context: 'app/', from: 'css/*' }, { context: 'app/', from: 'fonts/*' }, { context: 'app/', from: 'locales/**/*' }, -- cgit v1.2.3 From ea852b12e33b0e50ba7986c33ad68be5e38305ba Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 8 Feb 2017 13:49:54 -0200 Subject: [#922] Add css autoprefixer for compatibility with browsers with @tayanefernandes --- web-ui/config/loaders-webpack.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web-ui/config') diff --git a/web-ui/config/loaders-webpack.js b/web-ui/config/loaders-webpack.js index 21e9a572..f5237dff 100644 --- a/web-ui/config/loaders-webpack.js +++ b/web-ui/config/loaders-webpack.js @@ -7,7 +7,7 @@ module.exports = [ }, { test: /\.scss|css$/, - loader: "style-loader!css-loader!sass-loader" + loader: "style-loader!css-loader!postcss-loader!sass-loader" }, { test: /\.woff(2)?(\?v=[0-9]\.[0-9]\.[0-9])?$/, -- cgit v1.2.3 From 2bfd4b8da51310da0e11d87f64f57990d93d79e0 Mon Sep 17 00:00:00 2001 From: Tayane Fernandes Date: Thu, 9 Feb 2017 13:33:30 -0200 Subject: [#922] Rename backup account flow To differentiate between the account recovery flow and the set backup email flow, we renamed all resources and url to reflect this. with @anikarni --- web-ui/config/copy-webpack.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web-ui/config') diff --git a/web-ui/config/copy-webpack.js b/web-ui/config/copy-webpack.js index 8e9f9dd3..1f7f743a 100644 --- a/web-ui/config/copy-webpack.js +++ b/web-ui/config/copy-webpack.js @@ -4,7 +4,7 @@ module.exports = new CopyWebpackPlugin([ { context: 'app/', from: '404.html' }, { context: 'app/', from: 'index.html' }, { context: 'app/', from: 'sandbox.html' }, - { context: 'src/account_recovery/', from: 'account_recovery.html' }, + { context: 'src/backup_account/', from: 'backup_account.html' }, { context: 'app/', from: 'css/*' }, { context: 'app/', from: 'fonts/*' }, { context: 'app/', from: 'locales/**/*' }, -- cgit v1.2.3 From 0b966e696c6a99f825510d406008fc9b9936077e Mon Sep 17 00:00:00 2001 From: Tulio Casagrande Date: Mon, 13 Feb 2017 18:43:15 -0200 Subject: [#907] Convert login page to react with @anikarni --- web-ui/config/copy-webpack.js | 3 +++ 1 file changed, 3 insertions(+) (limited to 'web-ui/config') diff --git a/web-ui/config/copy-webpack.js b/web-ui/config/copy-webpack.js index 1f7f743a..7e56d760 100644 --- a/web-ui/config/copy-webpack.js +++ b/web-ui/config/copy-webpack.js @@ -5,6 +5,9 @@ module.exports = new CopyWebpackPlugin([ { context: 'app/', from: 'index.html' }, { context: 'app/', from: 'sandbox.html' }, { context: 'src/backup_account/', from: 'backup_account.html' }, + { context: 'src/login/', from: '*.html' }, + { context: 'src/login/', from: '*.css' }, + { context: 'src/interstitial/', from: '*' }, { context: 'app/', from: 'css/*' }, { context: 'app/', from: 'fonts/*' }, { context: 'app/', from: 'locales/**/*' }, -- cgit v1.2.3 From 957599ae01687d6b3d02a3c34fdbe2ac6bd920f9 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 16 Feb 2017 18:51:26 -0200 Subject: [#907] Bundles login static files separately Due to conflicts with public and protected urls, login and interstitial files have to be on a different public url from inbox and resources that require login. Therefore, here, we delegate that logic to webpack. Now we have a '/public' url and a '/assets' url for those static assets. --- web-ui/config/copy-webpack.js | 91 ------------------------------- web-ui/config/protected-assets-webpack.js | 25 +++++++++ web-ui/config/public-assets-webpack.js | 10 ++++ 3 files changed, 35 insertions(+), 91 deletions(-) delete mode 100644 web-ui/config/copy-webpack.js create mode 100644 web-ui/config/protected-assets-webpack.js create mode 100644 web-ui/config/public-assets-webpack.js (limited to 'web-ui/config') diff --git a/web-ui/config/copy-webpack.js b/web-ui/config/copy-webpack.js deleted file mode 100644 index 7e56d760..00000000 --- a/web-ui/config/copy-webpack.js +++ /dev/null @@ -1,91 +0,0 @@ -var CopyWebpackPlugin = require('copy-webpack-plugin'); - -module.exports = new CopyWebpackPlugin([ - { context: 'app/', from: '404.html' }, - { context: 'app/', from: 'index.html' }, - { context: 'app/', from: 'sandbox.html' }, - { context: 'src/backup_account/', from: 'backup_account.html' }, - { context: 'src/login/', from: '*.html' }, - { context: 'src/login/', from: '*.css' }, - { context: 'src/interstitial/', from: '*' }, - { context: 'app/', from: 'css/*' }, - { context: 'app/', from: 'fonts/*' }, - { context: 'app/', from: 'locales/**/*' }, - { context: 'app/', from: 'images/**/*' }, - { context: 'app/', from: 'bower_components/font-awesome/fonts/*' }, - { - context: 'app/', - from: 'bower_components/font-awesome/css/font-awesome.min.css', - to: 'bower_components/font-awesome/css' - }, - { - context: 'app/', - from: 'bower_components/jquery-file-upload/css/jquery.fileupload.css', - to: 'bower_components/jquery-file-upload/css' - }, - { - context: 'app/', - from: 'bower_components/modernizr/modernizr.js', - to: 'bower_components/modernizr' - }, - { - context: 'app/', - from: 'bower_components/lodash/dist/lodash.min.js', - to: 'bower_components/lodash/dist' - }, - { - context: 'app/', - from: 'bower_components/jquery/dist/jquery.min.js', - to: 'bower_components/jquery/dist' - }, - { - context: 'app/', - from: 'bower_components/jquery-ui/jquery-ui.min.js', - to: 'bower_components/jquery-ui' - }, - { - context: 'app/', - from: 'bower_components/jquery-file-upload/js/jquery.fileupload.js', - to: 'bower_components/jquery-file-upload/js' - }, - { - context: 'app/', - from: 'bower_components/handlebars/handlebars.min.js', - to: 'bower_components/handlebars' - }, - { - context: 'app/', - from: 'bower_components/typeahead.js/dist/typeahead.bundle.min.js', - to: 'bower_components/typeahead.js/dist' - }, - { - context: 'app/', - from: 'bower_components/iframe-resizer/js/iframeResizer.min.js', - to: 'bower_components/iframe-resizer/js' - }, - { - context: 'app/', - from: 'bower_components/iframe-resizer/js/iframeResizer.contentWindow.min.js', - to: 'bower_components/iframe-resizer/js' - }, - { - context: 'app/', - from: 'bower_components/foundation/js/foundation.js', - to: 'bower_components/foundation/js' - }, - { - context: 'app/', - from: 'bower_components/foundation/js/foundation/foundation.reveal.js', - to: 'bower_components/foundation/js/foundation' - }, - { - context: 'app/', - from: 'bower_components/foundation/js/foundation/foundation.offcanvas.js', - to: 'bower_components/foundation/js/foundation' - }, - { - context: 'app/', - from: 'js/foundation/initialize_foundation.js', - to: 'js/foundation' - } -]) diff --git a/web-ui/config/protected-assets-webpack.js b/web-ui/config/protected-assets-webpack.js new file mode 100644 index 00000000..85654cf0 --- /dev/null +++ b/web-ui/config/protected-assets-webpack.js @@ -0,0 +1,25 @@ +var CopyWebpackPlugin = require('copy-webpack-plugin'); + +module.exports = new CopyWebpackPlugin([ + { context: 'app/', from: '404.html' }, + { context: 'app/', from: 'index.html' }, + { context: 'app/', from: 'sandbox.html' }, + { context: 'app/', from: 'css/*' }, + { context: 'src/backup_account/', from: 'backup_account.html' }, + { context: 'app/bower_components/font-awesome/', from: 'fonts/*' }, + { context: 'app/bower_components/font-awesome/', from: 'css/font-awesome.min.css', to: 'css' }, + { context: 'app/bower_components/jquery-file-upload/', from: 'css/jquery.fileupload.css', to: 'css' }, + { context: 'app/bower_components/modernizr/', from: 'modernizr.js' }, + { context: 'app/bower_components/lodash/dist/', from: 'lodash.min.js' }, + { context: 'app/bower_components/jquery/dist/', from: 'jquery.min.js' }, + { context: 'app/bower_components/jquery-ui/', from: 'jquery-ui.min.js' }, + { context: 'app/bower_components/jquery-file-upload/js/', from: 'jquery.fileupload.js' }, + { context: 'app/bower_components/handlebars/', from: 'handlebars.min.js' }, + { context: 'app/bower_components/typeahead.js/dist/', from: 'typeahead.bundle.min.js' }, + { context: 'app/bower_components/iframe-resizer/js/', from: 'iframeResizer.min.js' }, + { context: 'app/bower_components/iframe-resizer/js/', from: 'iframeResizer.contentWindow.min.js' }, + { context: 'app/bower_components/foundation/js/', from: 'foundation.js' }, + { context: 'app/bower_components/foundation/js/foundation/', from: 'foundation.reveal.js' }, + { context: 'app/bower_components/foundation/js/foundation/', from: 'foundation.offcanvas.js' }, + { context: 'app/js/foundation/', from: 'initialize_foundation.js' } +]) diff --git a/web-ui/config/public-assets-webpack.js b/web-ui/config/public-assets-webpack.js new file mode 100644 index 00000000..28dff566 --- /dev/null +++ b/web-ui/config/public-assets-webpack.js @@ -0,0 +1,10 @@ +var CopyWebpackPlugin = require('copy-webpack-plugin'); + +module.exports = new CopyWebpackPlugin([ + { context: 'src/login/', from: '*.html' }, + { context: 'src/login/', from: '*.css' }, + { context: 'src/interstitial/', from: '*' }, + { context: 'app/', from: 'fonts/*' }, + { context: 'app/', from: 'locales/**/*' }, + { context: 'app/', from: 'images/**/*' } +]); -- cgit v1.2.3 From d5d7c8607138c8f39b55cdaa6ef3231c98d6af8a Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Tue, 21 Feb 2017 16:00:07 -0300 Subject: Fix production environments css directory with @tuliocasagrande --- web-ui/config/compass.rb | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web-ui/config') diff --git a/web-ui/config/compass.rb b/web-ui/config/compass.rb index 9c52a04e..13940ba6 100644 --- a/web-ui/config/compass.rb +++ b/web-ui/config/compass.rb @@ -17,7 +17,7 @@ # Set this to the root of your project when deployed: -target_dir = ENV['PIXELATED_BUILD'] == 'package' ? 'dist' : 'app' +target_dir = 'app' http_path = "/" -- cgit v1.2.3 From edf6c0356ed78dd6d5c0cdce6b716fbf2b93ae76 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 23 Feb 2017 16:14:03 -0300 Subject: [#907] Moves minified images to public folder with @thaissiqueira --- web-ui/config/imagemin.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web-ui/config') diff --git a/web-ui/config/imagemin.js b/web-ui/config/imagemin.js index 2b2c87e0..ed61cdb3 100644 --- a/web-ui/config/imagemin.js +++ b/web-ui/config/imagemin.js @@ -18,7 +18,7 @@ const imagemin = require('imagemin'); imagemin(['app/images/*.{gif,jpg,png,svg}'], - 'dist/images' + 'dist/public/images' ).then(files => { console.log('Images list:') files.map(function(file) { console.log(file.path); }); -- cgit v1.2.3 From d13543e3e680d47c7c675a9684d9854f2397aadb Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 23 Feb 2017 16:38:24 -0300 Subject: [#907] Minifies svg images with @thaissiqueira --- web-ui/config/imagemin.js | 13 ++++++++++--- 1 file changed, 10 insertions(+), 3 deletions(-) (limited to 'web-ui/config') diff --git a/web-ui/config/imagemin.js b/web-ui/config/imagemin.js index ed61cdb3..40c84f1c 100644 --- a/web-ui/config/imagemin.js +++ b/web-ui/config/imagemin.js @@ -16,10 +16,17 @@ */ const imagemin = require('imagemin'); +const imageminSvgo = require('imagemin-svgo'); -imagemin(['app/images/*.{gif,jpg,png,svg}'], - 'dist/public/images' -).then(files => { +imagemin(['app/images/*.{gif,jpg,png,svg}'], 'dist/public/images', { + use: [ + imageminSvgo({ + plugins: [ + {removeViewBox: false} + ] + }) + ] +}).then(files => { console.log('Images list:') files.map(function(file) { console.log(file.path); }); }); -- cgit v1.2.3 From 5fbfde0e465539c5e8a03764a695cc45a85b1ca2 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 23 Feb 2017 16:48:20 -0300 Subject: [#907] Minifies png images with @thaissiqueira --- web-ui/config/imagemin.js | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'web-ui/config') diff --git a/web-ui/config/imagemin.js b/web-ui/config/imagemin.js index 40c84f1c..a01f1dac 100644 --- a/web-ui/config/imagemin.js +++ b/web-ui/config/imagemin.js @@ -17,6 +17,7 @@ const imagemin = require('imagemin'); const imageminSvgo = require('imagemin-svgo'); +const imageminPngquant = require('imagemin-pngquant'); imagemin(['app/images/*.{gif,jpg,png,svg}'], 'dist/public/images', { use: [ @@ -24,7 +25,8 @@ imagemin(['app/images/*.{gif,jpg,png,svg}'], 'dist/public/images', { plugins: [ {removeViewBox: false} ] - }) + }), + imageminPngquant() ] }).then(files => { console.log('Images list:') -- cgit v1.2.3 From 1a1999cc129fe4d9046a22146deca6838a6fb1d5 Mon Sep 17 00:00:00 2001 From: Thais Siqueira Date: Wed, 1 Mar 2017 11:39:36 -0300 Subject: [#907] Puts autofocus on username field. with @anikarni --- web-ui/config/loaders-webpack.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'web-ui/config') diff --git a/web-ui/config/loaders-webpack.js b/web-ui/config/loaders-webpack.js index f5237dff..9009f9fd 100644 --- a/web-ui/config/loaders-webpack.js +++ b/web-ui/config/loaders-webpack.js @@ -3,7 +3,7 @@ module.exports = [ test: /\.js$/, exclude: /(node_modules|bower_components)/, loader: 'babel', - query: { presets: ['es2015', 'react']} + query: { presets: ['es2015', 'react', 'stage-0']} }, { test: /\.scss|css$/, -- cgit v1.2.3