diff --git a/.gitignore b/.gitignore index f5d387b74..8132e6056 100644 --- a/.gitignore +++ b/.gitignore @@ -13,3 +13,5 @@ website/public/ website/.deploy*/ website/src/_drafts website/themes/uppy/source/js/uppy.js + +npm-debug.log* diff --git a/bin/build-umd b/bin/build-umd index dc9bb98c4..fb6f28c85 100755 --- a/bin/build-umd +++ b/bin/build-umd @@ -16,7 +16,6 @@ OUTDIR="dist" TRANSFORMS="[ babelify ]" FLAGS="-t [ babelify ] --standalone Uppy" -rm -rf $OUTDIR -mkdir $OUTDIR +mkdir -p "${OUTDIR}" browserify $SRC $FLAGS > $OUTDIR/$OUT diff --git a/package.json b/package.json index 83253c958..1acd56701 100644 --- a/package.json +++ b/package.json @@ -16,6 +16,7 @@ "test": "bin/test", "test:unit": "./node_modules/.bin/babel-node test/core.spec.js", "watch": "nodemon --watch src --ext scss,js -x \"npm run build && node website/update.js\"", + "watch:all": "parallelshell \"npm run watch\" \"npm run web\"", "watch:css": "nodemon --watch src --ext scss -x \"npm run build && node website/update.js\"", "watch:examples": "cd website && node build-examples.js watch", "watch:js": "nodemon --watch src --ext js -x \"npm run build && node website/update.js\"", @@ -58,6 +59,7 @@ "zuul": "^3.7.2" }, "dependencies": { + "parallelshell": "^2.0.0", "superagent": "^1.5.0", "tus-js-client": "^1.1.3" } diff --git a/website/_config.yml b/website/_config.yml index 92e8e3f05..082b19405 100644 --- a/website/_config.yml +++ b/website/_config.yml @@ -20,9 +20,9 @@ logo_large: /images/uppy.svg logo_medium: /images/uppy.svg logo_icon: /images/uppy.png description_primary: > - JavaScript file uploader that fetches files from Dropbox, Instagram, local disk, remote URLs, and other exciting locations. - Plugin-based architecture, first-class support for resumable uploads via tus.io - and custom encoding backends make it very extensible and robust. + Uppy is (going to be) a JavaScript file uploader that fetches files from Dropbox, Instagram, local disk, remote URLs, and other exciting locations. + It has a Plugin-based architecture, first-class support for resumable uploads via tus.io + and custom encoding backends, making it very extensible and robust. description_secondary: > Uppy (almost as cute as a puppy) is brought to you by the people behind Transloadit and as such has first class support for adding their uploading and encoding backend, but this is opt-in, and you can just as easily diff --git a/website/documentation.js b/website/documentation.js index 19e71283a..4e733b876 100644 --- a/website/documentation.js +++ b/website/documentation.js @@ -21,15 +21,3 @@ documentation('../src/index.js', {order: docOrder}, function (err, comments) { console.info(chalk.green('✓ documentation generated')); }); }); - -// var remark = require('remark'); -// var inputMarkdownContent = fs.readFileSync('src/api/docs.md', 'utf-8'); -// var docjsReadme = require('documentation-readme/lib/plugin'); -// remark().use(docjsReadme, { -// section: 'Uppy Core & Plugins', // inject into the ## Usage section of the input doc -// documentationArgs: [ '../src/index.js' ] -// }).process(inputMarkdownContent, function (err, vfile, content) { -// fs.writeFileSync('src/api/docs.md', content); -// // console.log(content); -// console.log('documentation generated'); -// }); diff --git a/website/src/_data/design_goals.yml b/website/src/_data/design_goals.yml index 6b4c4683e..eabe27f29 100644 --- a/website/src/_data/design_goals.yml +++ b/website/src/_data/design_goals.yml @@ -4,6 +4,7 @@ - "Resumable file uploads via the open tus standard" - "Robust: retries for all-the-things, avoid showing ‘weird errors’" - "Themable UI with a beautiful default" + - "i18n support: Easily switch languages or supply your own copy" - "Compatible with React (Native)" - "Works great on mobile" - "Small core, modular architecture. Everything is a plugin" diff --git a/website/src/guide/contributing.md b/website/src/guide/contributing.md index 10411c919..0712b3d1b 100644 --- a/website/src/guide/contributing.md +++ b/website/src/guide/contributing.md @@ -31,23 +31,12 @@ It's recommended to exclude `./website/public/` from your editor if you want eff For local previews on http://127.0.0.1:4000 type: ```bash -npm run web +npm run watch:all ``` -If you want to work on Uppy itself, and see its changes reflected in the website, open a new tab and type: +This will watch the website, as well as Uppy, as the examples, and rebuild everything and refresh your browser as files change. -```bash -npm run watch -# Or if you're only interested in one of these: -npm run watch:js -npm run watch:css -``` - -For example, if you'd like to work on the Multipart Form example, - -Run: `npm run watch` and in new tab: `npm run web` - -Then: +Then, to work on e.g. the Multipart example, you'd edit the following files: ```bash atom src/core/Core.js \ @@ -57,7 +46,7 @@ atom src/core/Core.js \ website/src/examples/multipart/app.es6 ``` -And open +And open in your webbrowser. ## CSS Guidelines diff --git a/website/themes/uppy/layout/example.ejs b/website/themes/uppy/layout/example.ejs index 964f5aebb..698431205 100644 --- a/website/themes/uppy/layout/example.ejs +++ b/website/themes/uppy/layout/example.ejs @@ -1,5 +1,5 @@ <%- partial('partials/sidebar', { type: page.type, index: page.index }) %> -
+

<%- page.title %> Example

diff --git a/website/themes/uppy/layout/layout.ejs b/website/themes/uppy/layout/layout.ejs index b1e37d58e..348f2aad7 100644 --- a/website/themes/uppy/layout/layout.ejs +++ b/website/themes/uppy/layout/layout.ejs @@ -17,15 +17,12 @@
- +