Merge branch 'master' into architecture

2026-07-17 16:50:22 +00:00 · 2015-11-17 14:56:21 +01:00 · 2015-11-17 14:56:21 +01:00 · 780bf9150a
commit 780bf9150a
parent 78f8258fa1 a2428babfd
9 changed files with 104 additions and 0 deletions
--- a/.babelrc
+++ b/.babelrc
@ -0,0 +1,3 @@
+{
+  "stage": 0
+}
--- a/.gitignore
+++ b/.gitignore
@ -0,0 +1,2 @@
+node_modules
+build/transloadit-js-client.*
--- a/.travis.yml
+++ b/.travis.yml
@ -0,0 +1,34 @@
+language: node_js
+
+node_js:
+  - 4.2.2
+
+before_script:
+  - "npm run-script build"
+
+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
+
+notifications:
+  slack:
+    secure: L3iQQE8sZ0ik1Z26gPoNMiIam9EOEwYhraHCY60Jk/wmfH6SW/727yKXpgcb/yayx37rUZplvoO7H8e05ISxTJKSepEeqbBUIBQs48S8hr+FHk0VPtpP4HGxqaITRLm+mI1coPRvfISxzrB8d240oup6muhC9Ws4/LXi6v8miyIOs2zoYmGxd56TrUeON3UYlKt6dMava0V4bugARzrafN/tfyI9ccqbHzQLBspQvBI61DzZ5I2vnWpkjfWgIHz9Fl4VzXHqMXwjuTUEu8ibA12b3dHZiJEAoqeb9Oj9QcLPbstPLhlNTZZaOrfiFtwLctI2rFh37slDpAfk5idv3ycxcoG5rbCxgyg5i6dpQqrqHxnyglgHg2/nZ+YA5okeS7nJJNtU/4S6AFRWOUUWMVVY0VBEV+8w+uurl0PDy80RUY3uyK64qAgQ8U0M81/Ys1oyWyn78TqHcbby7V2Ws5I9Yakrq8D+mdfsWYCio8F6LXHSwJ0mt2FanJtdDvpPk9sAwsXZN0n8xhELt5TiRp3bzVIQ0IPUgF54dTG9/zWRvC1P4TFaFU/2fg73ZEUC5aWJoFMnLSZjbZvp5gwpCVd0MjSBk80nF9dHYcavIgJ0wMGI3BMb8Nn6+T11Gw/ycr7OGU4NMkj7i8vSFgKF74piWZyiNW8orkMN6XZgM+o=
+    template:
+      - "%{repository}#%{build_number} (%{branch} - %{commit} : %{author}): %{message}"
+      - "Change view : %{compare_url}"
+      - "Build details : %{build_url}"
+      - "Review : http://hackathon.transloadit.com.s3.amazonaws.com/transloadit-js-client/%{branch}/index.html"
--- a/build/.empty
+++ b/build/.empty
--- a/build/favicon.ico
+++ b/build/favicon.ico
--- a/build/index.html
+++ b/build/index.html
@ -0,0 +1,31 @@
+<html>
+  <head>
+    <title>
+      Loading..
+    </title>
+    <link rel="shortcut icon" href="./favicon.ico">
+    <link rel="stylesheet" href="./transloadit-js-client.css" type="text/css" />
+  </head>
+  <body>
+    <h1>
+      Loading..
+    </h1>
+
+    <footer>
+      <hr />
+      <ul>
+        <li><a href="https://travis-ci.org/transloadit/transloadit-js-client">Travis</a></li>
+        <li><a href="https://github.com/transloadit/transloadit-js-client">GitHub</a></li>
+      </ul>
+    </footer>
+  </body>
+  <script src="./transloadit-js-client.js"></script>
+  <script>
+    var branch  = location.pathname.split('/')[2];
+    var elTitle = document.querySelector('title');
+    var elH1    = document.querySelector('h1');
+    var title   = 'You are reviewing the latest push of branch: ' + branch;
+    elTitle.innerHTML = title;
+    elH1.innerHTML    = title;
+  </script>
+</html>
--- a/js/lib/transloadit-js-client.js
+++ b/js/lib/transloadit-js-client.js
--- a/package.json
+++ b/package.json
@ -0,0 +1,34 @@
+{
+  "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-client.js -o build/transloadit-js-client.js -t [ babelify ]",
+    "build:css": "node-sass --include-path scss scss/index.scss build/transloadit-js-client.css",
+    "watch": "npm run watch:js & npm run watch:css",
+    "watch:js": "watchify js/lib/transloadit-js-client.js -do build/transloadit-js-client.js",
+    "watch:css": "nodemon -e scss -x \"npm run build:css\"",
+    "test": "echo \"Error: no test specified\" && exit 1",
+    "preview": "npm run build & http-server ./build -d -o "
+  },
+  "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",
+    "http-server": "^0.8.5"
+  }
+}
--- a/scss/index.scss
+++ b/scss/index.scss