diff --git a/README.md b/README.md index 214f5356c..65c8d884d 100644 --- a/README.md +++ b/README.md @@ -11,16 +11,16 @@ Uppy is a sleek, modular JavaScript file uploader that integrates seamlessly wit - **Preview** and edit metadata with a nice interface; - **Upload** to the final destination, optionally process/encode - + **[Read the docs](https://uppy.io/docs)** | **[Try Uppy](https://uppy.io/examples/dashboard/)** + + Uppy is being developed by the folks at [Transloadit](https://transloadit.com), a versatile file encoding service. ## Example -Uppy UI Demo: modal dialog with a few selected files and an upload button - Code used in the above example: ```js diff --git a/assets/uppy-demo-oct-2018.gif b/assets/uppy-demo-oct-2018.gif new file mode 100644 index 000000000..2902fdecb Binary files /dev/null and b/assets/uppy-demo-oct-2018.gif differ diff --git a/assets/uppy-demo-oct-2018.mov b/assets/uppy-demo-oct-2018.mov new file mode 100644 index 000000000..2a758a4aa Binary files /dev/null and b/assets/uppy-demo-oct-2018.mov differ diff --git a/assets/uppy-demo-oct-2018.mov-palette.png b/assets/uppy-demo-oct-2018.mov-palette.png new file mode 100644 index 000000000..b8af19f62 Binary files /dev/null and b/assets/uppy-demo-oct-2018.mov-palette.png differ diff --git a/assets/uppy-demo-oct-2018.mp4 b/assets/uppy-demo-oct-2018.mp4 new file mode 100644 index 000000000..9efad1e14 Binary files /dev/null and b/assets/uppy-demo-oct-2018.mp4 differ diff --git a/assets/uppy-demo2.mov-palette.png b/assets/uppy-demo2.mov-palette.png index 554051ceb..5784dc20d 100644 Binary files a/assets/uppy-demo2.mov-palette.png and b/assets/uppy-demo2.mov-palette.png differ diff --git a/bin/to-gif.sh b/bin/to-gif.sh index 3f0970304..a9e23bde2 100755 --- a/bin/to-gif.sh +++ b/bin/to-gif.sh @@ -12,7 +12,7 @@ __root="$(cd "$(dirname "${__dir}")" && pwd)" width=600 speed=0.7 -input="${__root}/assets/uppy-demo2.mov" +input="${__root}/assets/uppy-demo-oct-2018.mov" base="$(basename "${input}")" output="${__root}/assets/${base}.gif" @@ -29,4 +29,4 @@ ffmpeg \ "${output}" du -hs "${output}" -open -a 'Google Chrome' "${output}" \ No newline at end of file +open -a 'Google Chrome' "${output}" diff --git a/website/_config.yml b/website/_config.yml index ad490a334..59198dd26 100644 --- a/website/_config.yml +++ b/website/_config.yml @@ -13,12 +13,12 @@ logo_large: /images/logos/uppy-dog-full.svg logo_medium: /images/logos/uppy-dog-head-arrow.svg logo_icon: /images/logos/uppy-dog-head-arrow.png description: > - Sleek, modular file uploader that integrates seamlessly with any framework. - It fetches files from local disk, Google Drive, Dropbox, Instagram, remote URLs, cameras and other exciting locations, and then uploads them to the final destination. + Sleek, modular file uploader that integrates seamlessly with any website or app. + It fetches files from local disk, Google Drive, Dropbox, Instagram, remote URLs, cameras etc, and then uploads them to the final destination. It’s fast, easy to use and let's you worry about more important problems than building a file uploader. descriptionWho: > Uppy is brought to you by the people - behind Transloadit and as such will have first class support + behind Transloadit, and as such will have first class support for adding their uploading and encoding backend, but this is opt-in, and you can just as easily roll your own. author: Transloadit diff --git a/website/src/_data/design_goals.yml b/website/src/_data/design_goals.yml index 646b01082..2ca453e23 100644 --- a/website/src/_data/design_goals.yml +++ b/website/src/_data/design_goals.yml @@ -1,12 +1,12 @@ - "Lightweight / easy on dependencies" + - "Small core, modular architecture. Everything is a plugin" - "ES6, with transpiled ES5 versions available" - "Usable as a bundle straight from a CDN, as well as a module to import" - "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)" + - "Compatible with React (Native) (work on React Native in progress)" - "Works great on mobile" - - "Small core, modular architecture. Everything is a plugin" - "Works great with Transloadit. Works great without" - "Offering sugared shortcuts for novice users (presets)" diff --git a/website/src/api-usage-example.js b/website/src/api-usage-example.js index 3364dc238..def262d53 100644 --- a/website/src/api-usage-example.js +++ b/website/src/api-usage-example.js @@ -1,9 +1,17 @@ import Uppy from '@uppy/core' import Dashboard from '@uppy/dashboard' +import Instagram from '@uppy/instagram' import Tus from '@uppy/tus' Uppy() - .use(Dashboard, { trigger: '#select-files' }) + .use(Dashboard, { + trigger: '#select-files', + showProgressDetails: true + }) + .use(Instagram, { + target: Dashboard, + serverUrl: 'https://companion.uppy.io' + }) .use(Tus, { endpoint: 'https://master.tus.io/files/' }) .on('complete', (result) => { console.log('Upload result:', result) diff --git a/website/src/frontpage-code-sample.ejs b/website/src/frontpage-code-sample.ejs index ffb600527..6d8bb2a5e 100644 --- a/website/src/frontpage-code-sample.ejs +++ b/website/src/frontpage-code-sample.ejs @@ -6,7 +6,7 @@ You can `npm run web:update:frontpage:code:sample` to render this code snippet a save it as a layout partial --> {% codeblock lang:bash %} -$ npm install uppy +$ npm install @uppy/core @uppy/dashboard @uppy/instagram @uppy/tus {% endcodeblock %} {% include_code lang:js ../api-usage-example.js %} diff --git a/website/src/images/uppy-demo-oct-2018.mp4 b/website/src/images/uppy-demo-oct-2018.mp4 new file mode 100644 index 000000000..9efad1e14 Binary files /dev/null and b/website/src/images/uppy-demo-oct-2018.mp4 differ diff --git a/website/themes/uppy/layout/index.ejs b/website/themes/uppy/layout/index.ejs index e02a6e610..a79286bc5 100644 --- a/website/themes/uppy/layout/index.ejs +++ b/website/themes/uppy/layout/index.ejs @@ -24,8 +24,8 @@
@@ -42,8 +42,8 @@
- -

Work in progress

+ +

What is Uppy

<%- config.description %>

@@ -86,18 +86,26 @@