From de7aa87effaa60e6cebbf38a28785eef91398655 Mon Sep 17 00:00:00 2001 From: Harry Hedger Date: Mon, 16 Nov 2015 13:03:04 -0500 Subject: [PATCH 01/11] Added build and watch scripts for js/css using browserify, babelify, node-sass, nodemon, watchify --- .babelrc | 3 +++ .gitignore | 3 +++ build/.empty | 0 js/lib/transloadit-js-sdk.js | 0 package.json | 32 ++++++++++++++++++++++++++++++++ scss/index.scss | 0 6 files changed, 38 insertions(+) create mode 100644 .babelrc create mode 100644 .gitignore create mode 100644 build/.empty create mode 100644 js/lib/transloadit-js-sdk.js create mode 100644 package.json create mode 100644 scss/index.scss diff --git a/.babelrc b/.babelrc new file mode 100644 index 000000000..b0b9a96ef --- /dev/null +++ b/.babelrc @@ -0,0 +1,3 @@ +{ + "stage": 0 +} diff --git a/.gitignore b/.gitignore new file mode 100644 index 000000000..8e6026968 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +node_modules +build/transloadit2.css +build/transloadit-js-sdk.js diff --git a/build/.empty b/build/.empty new file mode 100644 index 000000000..e69de29bb diff --git a/js/lib/transloadit-js-sdk.js b/js/lib/transloadit-js-sdk.js new file mode 100644 index 000000000..e69de29bb diff --git a/package.json b/package.json new file mode 100644 index 000000000..73009fce1 --- /dev/null +++ b/package.json @@ -0,0 +1,32 @@ +{ + "name": "transloadit-js-client", + "version": "0.0.0", + "description": "Transloadit JS Client", + "main": "index.js", + "scripts": { + "build": "npm run build:js && npm run build:css", + "build:js": "browserify js/lib/transloadit-js-sdk.js -o build/transloadit-js-sdk.js -t [ babelify ]", + "build:css": "node-sass --include-path scss scss/index.scss build/transloadit2.css", + "watch": "npm run watch:js & npm run watch:css", + "watch:js": "watchify js/lib/transloadit-js-sdk.js -do build/transloadit-js-sdk.js", + "watch:css": "nodemon -e scss -x \"npm run build:css\"", + "test": "echo \"Error: no test specified\" && exit 1" + }, + "repository": { + "type": "git", + "url": "git+https://github.com/transloadit/transloadit-js-client.git" + }, + "author": "", + "license": "ISC", + "bugs": { + "url": "https://github.com/transloadit/transloadit-js-client/issues" + }, + "homepage": "https://github.com/transloadit/transloadit-js-client#readme", + "devDependencies": { + "babelify": "^6.4.0", + "browserify": "^12.0.1", + "node-sass": "^3.4.2", + "nodemon": "^1.8.1", + "watchify": "^3.6.1" + } +} diff --git a/scss/index.scss b/scss/index.scss new file mode 100644 index 000000000..e69de29bb From edaa77663f9d247fa477eabb6bde185d7ce20037 Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Tue, 17 Nov 2015 11:28:56 +0100 Subject: [PATCH 02/11] Deploy to s3 bucket --- .travis.yml | 23 +++++++++++++++++++++++ build/index.html | 9 +++++++++ 2 files changed, 32 insertions(+) create mode 100644 .travis.yml create mode 100644 build/index.html diff --git a/.travis.yml b/.travis.yml new file mode 100644 index 000000000..04ada4e44 --- /dev/null +++ b/.travis.yml @@ -0,0 +1,23 @@ +language: node_js + +node_js: +- 4.2.2 + +before_script: echo "Build the project : )" + +script: echo "Tested : )" + +deploy: + acl : public_read + bucket : hackathon.transloadit.com + cache_control : no-cache + local-dir : build + provider : s3 + skip_cleanup : true + upload-dir : transloadit-js-client/$TRAVIS_BRANCH + access_key_id : AKIAI45MV2S7O67ZPLXA + secret_access_key: + secure: k+T/4s49gdbNftD8HSyfUU2UoF1His/11Fu5YcZjUTfjtroqozqf7JV7nW7hB86wkHzXamS/0SlsEhC/P7bgJ3jnrzQfoSFZDr3lJSMBsiVqwzTnyltqrerWqZQNYvcdu9sUOH6UCOpVjKZYB71k84gmgeSmPlyyH0ukziYex/bhs3qyaaix8GkyP58C9Z2PssIew6s/mVNYveidgWdMe3OxMVvfwYHlZ8euJ8QDvGWlKj/9Hh3W/BW6BcTmnzZONf8c4me0C0gZ6HbLtYCfkUB1r1mvKRiLviOOnFHzmNhM/7a+srgaPgY8CF0dQ7dO1wN5k8ClrF33jytFWz2R4ZZgzKzWxYgZ7tisqTjhBlbcKBDJNw05Y6bu7Fiyyw7HY1/mibK+Fu7Rfvt6ZBjDVJtmXiLSMT2vD1rMLUa+MyDCIyG2iNARThbj0aQbrkVjviYYXqG/2vQjKWlqJ9Sus0v0Y/jqkVwpviohGd2F2iPEqBexLYgBaxU/LgTBTYAKJ0SzKosRAW4dYxm6dnWABV1v7oxIUJAKvt51haNGqTO4a87UzAHa4ND2nZBYLWdKoGCKWmV3DBtI/ha2Re6gO2HoK95S3ZRV8hfT3Nzt2wONNtiObuuv7U+osh62wvX5Rj0XHb/sV3vopjJpanmm+zYWtI/+k/+453XNMOIXmBA= + on: + repo: transloadit/transloadit-js-client + all_branches: true diff --git a/build/index.html b/build/index.html new file mode 100644 index 000000000..cc28c7fe6 --- /dev/null +++ b/build/index.html @@ -0,0 +1,9 @@ + + + + + + + + + From 30777230ea00cd20bd5129a84c5af0222b127607 Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Tue, 17 Nov 2015 11:30:48 +0100 Subject: [PATCH 03/11] Quote values --- .travis.yml | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/.travis.yml b/.travis.yml index 04ada4e44..eb977a2e6 100644 --- a/.travis.yml +++ b/.travis.yml @@ -3,9 +3,9 @@ language: node_js node_js: - 4.2.2 -before_script: echo "Build the project : )" +before_script: "echo 'Build the project : )'" -script: echo "Tested : )" +script: "echo 'Tested : )'" deploy: acl : public_read From 322cfc0c1d4d5aadb04b6287f1a66d38dbfae089 Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Tue, 17 Nov 2015 11:36:23 +0100 Subject: [PATCH 04/11] Show branch in title --- build/index.html | 15 ++++++++++++++- 1 file changed, 14 insertions(+), 1 deletion(-) diff --git a/build/index.html b/build/index.html index cc28c7fe6..56f1661d0 100644 --- a/build/index.html +++ b/build/index.html @@ -1,9 +1,22 @@ - + + If you see this, JavaScript threw an error + +

+ If you see this, JavaScript threw an error +

+ From 239210d265cbfb622a55e33a61ff35fab28167c0 Mon Sep 17 00:00:00 2001 From: Kevin van Zonneveld Date: Tue, 17 Nov 2015 11:42:43 +0100 Subject: [PATCH 05/11] Add a footer with convenience links --- build/index.html | 8 ++++++++ 1 file changed, 8 insertions(+) diff --git a/build/index.html b/build/index.html index 56f1661d0..1469958a1 100644 --- a/build/index.html +++ b/build/index.html @@ -9,6 +9,14 @@ If you see this, JavaScript threw an error + +