From 3846c4d120a0b8a800dab4b0ff46ed5ed1996400 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 Aug 2014 15:30:08 -0300 Subject: [PATCH 1/9] Remove duplicate line (express) --- package.json | 1 - 1 file changed, 1 deletion(-) diff --git a/package.json b/package.json index bdb0562f2..cc4487302 100644 --- a/package.json +++ b/package.json @@ -54,7 +54,6 @@ "bitcore": "0.1.35", "node-cryptojs-aes": "0.4.0", "blanket": "1.1.6", - "express": "4.0.0", "grunt-mocha-test": "0.8.2", "grunt-shell": "0.6.4", "istanbul": "0.2.10", From 013d102513aa7337cb6016bdb5c3e18b51e536bf Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Wed, 20 Aug 2014 15:32:09 -0300 Subject: [PATCH 2/9] Small optimization for img tag --- views/copayers.html | 2 +- views/home.html | 2 +- views/import.html | 2 +- views/includes/peer-list.html | 6 ++++-- views/join.html | 2 +- views/open.html | 2 +- views/settings.html | 2 +- views/setup.html | 2 +- views/unsupported.html | 2 +- views/warning.html | 2 +- 10 files changed, 13 insertions(+), 11 deletions(-) diff --git a/views/copayers.html b/views/copayers.html index ed1d5128d..47851a4be 100644 --- a/views/copayers.html +++ b/views/copayers.html @@ -2,7 +2,7 @@
- Copay + Copay
diff --git a/views/home.html b/views/home.html index 463f5ebbf..9d3d48aa1 100644 --- a/views/home.html +++ b/views/home.html @@ -1,7 +1,7 @@
- Copay + Copay
diff --git a/views/import.html b/views/import.html index 101b5aa04..627e1b92c 100644 --- a/views/import.html +++ b/views/import.html @@ -5,7 +5,7 @@
- Copay + Copay
diff --git a/views/includes/peer-list.html b/views/includes/peer-list.html index c46f04dab..5316c6ae5 100644 --- a/views/includes/peer-list.html +++ b/views/includes/peer-list.html @@ -23,7 +23,8 @@ ng-if="!hasVideo(copayer)" ng-class="isConnected(copayer) ? 'online' : 'offline'" src="./img/satoshi.gif" - alt="{{copayer}}"> + alt="{{copayer}}" + width="70"> Me {{copayer.nick}} @@ -43,7 +44,8 @@ ng-if="!hasVideo(copayer)" ng-class="isConnected(copayer) ? 'online' : 'offline'" src="./img/satoshi.gif" - alt="{{copayer}}"> + alt="{{copayer}}" + width="70"> - - - - - - - - - - - - - - - - - - - + + - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - + diff --git a/package.json b/package.json index cc4487302..97ce1a198 100644 --- a/package.json +++ b/package.json @@ -48,6 +48,9 @@ "express": "4.0.0", "github-releases": "0.2.0", "grunt-browserify": "2.0.8", + "grunt-contrib-concat": "0.5.0", + "grunt-contrib-cssmin": "0.10.0", + "grunt-contrib-uglify": "^0.5.1", "grunt-contrib-watch": "0.5.3", "grunt-markdown": "0.5.0", "browser-pack": "2.0.1", From c8ea3cd7e527609ad2b24bf564bc64634fd9083b Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 Aug 2014 16:08:12 -0300 Subject: [PATCH 8/9] Updated README with updated command to compile Copay. --- README.md | 6 +++++- 1 file changed, 5 insertions(+), 1 deletion(-) diff --git a/README.md b/README.md index e95cad119..b3015af0a 100644 --- a/README.md +++ b/README.md @@ -32,7 +32,11 @@ Build Copay: ``` npm install bower install -grunt shell --target=dev +grunt +``` +For production environments: +``` +grunt prod ``` Open Copay: From 427fbbfa84f9170e060cbd6de12bcedb9c7b25c4 Mon Sep 17 00:00:00 2001 From: Gustavo Maximiliano Cortez Date: Thu, 21 Aug 2014 16:49:04 -0300 Subject: [PATCH 9/9] Grunt: added more action to watch mode --- Gruntfile.js | 28 +++++++++++++++++++--------- 1 file changed, 19 insertions(+), 9 deletions(-) diff --git a/Gruntfile.js b/Gruntfile.js index 55afb060a..747f418a7 100644 --- a/Gruntfile.js +++ b/Gruntfile.js @@ -40,18 +40,24 @@ module.exports = function(grunt) { }, scripts: { files: [ - 'js/models/**/*.js', - '!*.html', - '!**/node_modules/**', - '!lib/**js', - '!browser/vendor-bundle.js', - '!js/copayBundle.js' + 'js/models/**/*.js' ], - tasks: ['shell'] + tasks: ['shell:dev'] }, css: { files: ['css/src/*.css'], - tasks: ['cssmin'] + tasks: ['cssmin:copay'] + }, + main: { + files: [ + 'js/app.js', + 'js/directives.js', + 'js/filters.js', + 'js/routes.js', + 'js/services/*.js', + 'js/controllers/*.js' + ], + tasks: ['concat:main'] } }, mochaTest: { @@ -113,9 +119,13 @@ module.exports = function(grunt) { } }, cssmin: { - combine: { + copay: { files: { 'css/copay.min.css': ['css/src/*.css'], + } + }, + vendors: { + files: { 'css/vendors.min.css': ['css/foundation.min.css', 'css/foundation-icons.css', 'lib/angular/angular-csp.css'] } }