From 4e233bf2f06e28f212a6497cd0f70e02725644b8 Mon Sep 17 00:00:00 2001 From: Artur Paikin Date: Thu, 11 Nov 2021 11:42:45 +0000 Subject: [PATCH 1/4] website: Update /support and docs about Transloadit-hosted Companion (#3243) * update considering the new Transloadit Community plan * link to Community plan * Use smart apostrophe --- website/src/support.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/website/src/support.md b/website/src/support.md index b16e8a6505..504c687ccf 100644 --- a/website/src/support.md +++ b/website/src/support.md @@ -21,8 +21,8 @@ This approach is new, we may make changes as we learn. Here are the current opti | Support on Uppy client | best effort | General Guidance | Guidance based on your use case and circumstances, code & operational reviews | | Support on Transloadit-hosted Companion & Tus | best effort | General Guidance | Guidance based on your use case and circumstances, code & operational reviews | | Support on self-hosted Companion & Tus | best effort | - | yes | -| Access to Transloadit-hosted Companion & Tus | - | yes | yes | -| Access to Transloadit’s encoding features | - | 10GB included | 0GB - unlimited | +| Access to Transloadit-hosted Companion & Tus | yes (with a free Transloadit Community plan) | yes | yes | +| Access to Transloadit’s encoding features | yes | 10GB included | 0GB - unlimited | | Guaranteed response times within office hours | - | <= 3 days | <= 8h - 32h | | 1-on-1 access to core developers | - | 1h | 1h - 20h | | Health & Status | - | Access to Personal Transloadit Dashboard | Access to Personal Transloadit Dashboard. Proactive monitoring & notifications | From e27ee0bb13fc5fc007a83cd854c7bce06b429158 Mon Sep 17 00:00:00 2001 From: Ash Allen Date: Mon, 15 Nov 2021 10:13:12 +0000 Subject: [PATCH 2/4] Fix typo in `docs/drag-drop.md` (#3319) --- website/src/docs/drag-drop.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/website/src/docs/drag-drop.md b/website/src/docs/drag-drop.md index 1e432aea79..f5f142189f 100644 --- a/website/src/docs/drag-drop.md +++ b/website/src/docs/drag-drop.md @@ -39,7 +39,7 @@ const { DragDrop } = Uppy ## CSS -The `@uppy/drag-drop` plugin includes some basi c styles, like shown in the [example](/examples/dragdrop). You can also choose not to use it and provide your own styles instead. +The `@uppy/drag-drop` plugin includes some basic styles, like shown in the [example](/examples/dragdrop). You can also choose not to use it and provide your own styles instead. ```js import '@uppy/core/dist/style.css' From 6add4ef0318b2a4a28428c982ec07194030fc61c Mon Sep 17 00:00:00 2001 From: Merlijn Vos Date: Mon, 15 Nov 2021 10:15:52 +0000 Subject: [PATCH 3/4] Status bar error state improvements (#3299) - Show error state of status bar if there is only _one_ failed file instead of _all_ failed files. Used to be stuck in the uploading state when a file failed. - Add "x of x files uploaded" below "Upload failed" for extra context. - Improve the error details button styling in the statusbar - Improve the error details button styling in the file info card. Now placed next to the file name. - Set status bar state to complete if the user manually removes the failed files. --- .../src/components/FileItem/FileInfo/index.js | 17 +++--- .../components/FileItem/FileInfo/index.scss | 9 +++ .../src/components/FileItem/index.scss | 11 ++-- packages/@uppy/status-bar/src/Components.js | 55 +++++++++---------- packages/@uppy/status-bar/src/StatusBar.js | 19 ++++--- packages/@uppy/status-bar/src/index.js | 6 +- packages/@uppy/status-bar/src/locale.js | 1 + packages/@uppy/status-bar/src/style.scss | 5 ++ 8 files changed, 72 insertions(+), 51 deletions(-) diff --git a/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.js b/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.js index c9c974b286..b7d08afd05 100644 --- a/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.js +++ b/packages/@uppy/dashboard/src/components/FileItem/FileInfo/index.js @@ -77,7 +77,7 @@ const ErrorButton = ({ file, onClick }) => { if (file.error) { return ( + + - ) } diff --git a/packages/@uppy/status-bar/src/StatusBar.js b/packages/@uppy/status-bar/src/StatusBar.js index 7f52cbeee6..b5ab955e81 100644 --- a/packages/@uppy/status-bar/src/StatusBar.js +++ b/packages/@uppy/status-bar/src/StatusBar.js @@ -139,7 +139,7 @@ function StatusBar (props) { && !hidePauseResumeButton && uploadState === STATE_UPLOADING - const showRetryBtn = error && !hideRetryButton + const showRetryBtn = error && !isAllComplete && !hideRetryButton const showDoneBtn = doneButtonHandler && uploadState === STATE_COMPLETE @@ -171,15 +171,18 @@ function StatusBar (props) { switch (uploadState) { case STATE_PREPROCESSING: case STATE_POSTPROCESSING: - return ( - - ) + return case STATE_COMPLETE: return case STATE_ERROR: - return + return ( + + ) case STATE_UPLOADING: return ( - {(recoveredState || showUploadBtn) ? ( + {recoveredState || showUploadBtn ? ( Date: Mon, 15 Nov 2021 17:40:58 +0100 Subject: [PATCH 4/4] website: update documents that were out of date (#3317) Those changes were auto-generated using `yarn web:build`. --- .github/ISSUE_TEMPLATE/integration_help.md | 8 ++++---- website/src/disc.html | 2 +- .../uppy/layout/partials/frontpage-code-sample.html | 2 +- 3 files changed, 6 insertions(+), 6 deletions(-) diff --git a/.github/ISSUE_TEMPLATE/integration_help.md b/.github/ISSUE_TEMPLATE/integration_help.md index 1e4d62f655..22cbdf54f5 100644 --- a/.github/ISSUE_TEMPLATE/integration_help.md +++ b/.github/ISSUE_TEMPLATE/integration_help.md @@ -5,10 +5,10 @@ about: Do you need assistance with building the Uppy client in your bundler, or labels: Not Accepted, Triage --- -Transloadit is providing Uppy free of charge. If you want, you can self-host all of its components and never pay us a dime. There are docs and tests, and your Bug Reports and Feature Requests are always welcome on GitHub. +Transloadit is providing Uppy free of charge. If you want, you can self-host all its components and never pay us a dime. You can access docs and tests, and your Bug Reports and Feature Requests are always welcome on GitHub. -There is also a different category of support that we like to call Integration Help: assistance to make things work for your environment, that have already been reported as working for the larger community. +We offer also a different category of support that we like to call Integration Help: help to make things work for your environment, that have already been reported as working for the larger community. -As much as we at Transloadit would like to provide detailed Integration Help to every non-paying user, Uppy has reached a point where this is no longer sustainable for our small crew. If we end up investing our time in a million different apps that use Uppy, as long as there is no money flowing back, we won't be able to ramp up our team to meet the demand. This would spread the team ever thinner and eventually grind development to a halt. +As much as we at Transloadit would like to provide detailed Integration Help to every non-paying user, Uppy has reached a point where this is no longer sustainable for our small crew. If we end up investing our time in a million different apps that use Uppy, as long as no money is flowing back, we won’t be able to ramp up our team to meet the demand. This would spread the team ever thinner and eventually grind development to a halt. -That is not where we want to be. So, in order to offer enthusiasts, businesses, and enterprises assistance in a sustainable way, we're providing community-based Integration Help for free at . If you are unable to solve your problem with help of the Uppy community, we offer paid Integration Help via . +That is not where we want to be. So, to offer enthusiasts, businesses, and enterprises help in a sustainable way, we’re providing community-based Integration Help for free at . If you are unable to solve your problem with help of the Uppy community, we offer paid Integration Help via . diff --git a/website/src/disc.html b/website/src/disc.html index 921854ac25..e8b65855ba 100644 --- a/website/src/disc.html +++ b/website/src/disc.html @@ -18,7 +18,7 @@
- +