From 5171580969cd7c0c9454083d1c30cf0dc6b0319c Mon Sep 17 00:00:00 2001 From: Ives van Hoorne Date: Wed, 15 Jun 2022 10:48:19 +0200 Subject: [PATCH 1/6] fix projects config (#6747) --- .codesandbox/{project.json => tasks.json} | 12 ++++-------- 1 file changed, 4 insertions(+), 8 deletions(-) rename .codesandbox/{project.json => tasks.json} (74%) diff --git a/.codesandbox/project.json b/.codesandbox/tasks.json similarity index 74% rename from .codesandbox/project.json rename to .codesandbox/tasks.json index d6a64032b93..a7345e47e39 100644 --- a/.codesandbox/project.json +++ b/.codesandbox/tasks.json @@ -1,10 +1,4 @@ { - "previews": { - "3000": { - "name": "Application", - "command": "yarn start:fast" - } - }, "tasks": { "setup": { "name": "Install Dependencies", @@ -16,11 +10,13 @@ }, "app:fast": { "name": "Application (fast)", - "command": "yarn start:fast" + "command": "yarn start:fast", + "runAtStart": true }, "app:home:fast": { "name": "Application home (fast)", - "command": "yarn start:home:fast" + "command": "yarn start:home:fast", + "runAtStart": true } }, "setupTasks": [ From 153e81393dc39ff16d9b2660e7569bc66b2bd075 Mon Sep 17 00:00:00 2001 From: Ives van Hoorne Date: Wed, 15 Jun 2022 13:07:15 +0200 Subject: [PATCH 2/6] make proxy an option (#6748) * make proxy an option * Update RegistryForm.tsx * . * update --- .../Settings/TeamSettings/RegistryForm.tsx | 26 ++++++++++++++++++- 1 file changed, 25 insertions(+), 1 deletion(-) diff --git a/packages/app/src/app/pages/Dashboard/Content/routes/Settings/TeamSettings/RegistryForm.tsx b/packages/app/src/app/pages/Dashboard/Content/routes/Settings/TeamSettings/RegistryForm.tsx index c47031a1ff9..a64ed472942 100644 --- a/packages/app/src/app/pages/Dashboard/Content/routes/Settings/TeamSettings/RegistryForm.tsx +++ b/packages/app/src/app/pages/Dashboard/Content/routes/Settings/TeamSettings/RegistryForm.tsx @@ -10,6 +10,7 @@ import { Icon, Link, Tooltip, + Switch, } from '@codesandbox/components'; import { AuthType, @@ -94,6 +95,9 @@ export const RegistryForm = ({ const [scopes, setScopes] = React.useState( registry?.enabledScopes || [] ); + const [proxyEnabled, setProxyEnabled] = React.useState( + registry?.proxyEnabled + ); const addScope = () => { setScopes(oldScopes => [...oldScopes, '']); @@ -118,7 +122,7 @@ export const RegistryForm = ({ enabledScopes: scopes.filter(s => s !== ''), registryAuthType: authenticationType, registryUrl, - proxyEnabled: true, + proxyEnabled, }); // We make sure to always show one input field @@ -200,6 +204,26 @@ export const RegistryForm = ({ setAuthKey={setAuthKey} disabled={disabled} /> + +
+ + { + setProxyEnabled(s => !s); + }} + on={proxyEnabled} + disabled={disabled} + /> + + + Disabling the proxy will allow you to use the registry behind + a VPN, but will expose the auth token to the browser and + require a CORS setup. + +
Date: Wed, 15 Jun 2022 14:26:19 +0100 Subject: [PATCH 3/6] Changing Pro user downgrade link Updating link to fit with newer web layout --- packages/homepage/content/docs/1-x-faqs.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/homepage/content/docs/1-x-faqs.md b/packages/homepage/content/docs/1-x-faqs.md index 7a5656dc048..d91ef434dac 100644 --- a/packages/homepage/content/docs/1-x-faqs.md +++ b/packages/homepage/content/docs/1-x-faqs.md @@ -132,6 +132,6 @@ resolve it. For example: ## How do I cancel my Pro or Patron plan? -For Pro users, you can cancel your subscription on the -[Pro page](https://codesandbox.io/pro). For legacy Patron users, you can cancel +For Pro users, you can downgrade your plan on the +[Settings page](https://codesandbox.io/dashboard/settings). For legacy Patron users, you can cancel your subscription on the [Patron page](https://codesandbox.io/patron). From 5a1c23359e2e180459796fb79ab28226ee131c32 Mon Sep 17 00:00:00 2001 From: James <91065484+JamesACS@users.noreply.github.com> Date: Wed, 15 Jun 2022 14:28:17 +0100 Subject: [PATCH 4/6] Updating spacing/wording --- packages/homepage/content/docs/1-x-faqs.md | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/packages/homepage/content/docs/1-x-faqs.md b/packages/homepage/content/docs/1-x-faqs.md index d91ef434dac..1fb72f2039e 100644 --- a/packages/homepage/content/docs/1-x-faqs.md +++ b/packages/homepage/content/docs/1-x-faqs.md @@ -133,5 +133,7 @@ resolve it. For example: ## How do I cancel my Pro or Patron plan? For Pro users, you can downgrade your plan on the -[Settings page](https://codesandbox.io/dashboard/settings). For legacy Patron users, you can cancel -your subscription on the [Patron page](https://codesandbox.io/patron). +[Settings page](https://codesandbox.io/dashboard/settings). + +If you're on one of our legacy Patron plans you can cancel +your subscription on the [Patron page](https://codesandbox.io/patron). From fd72f18c6a80bc415484ecde180b1c799278d084 Mon Sep 17 00:00:00 2001 From: James <91065484+JamesACS@users.noreply.github.com> Date: Wed, 15 Jun 2022 14:32:42 +0100 Subject: [PATCH 5/6] Updating wording and instructions Altered header, added Personal/Team distinction for easy searching --- packages/homepage/content/docs/1-x-faqs.md | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/packages/homepage/content/docs/1-x-faqs.md b/packages/homepage/content/docs/1-x-faqs.md index 1fb72f2039e..2784ef89a05 100644 --- a/packages/homepage/content/docs/1-x-faqs.md +++ b/packages/homepage/content/docs/1-x-faqs.md @@ -130,9 +130,9 @@ the code from being automatically executed enabling you to edit your code to resolve it. For example: [https://codesandbox.io/s/new?runonclick=1](https://codesandbox.io/s/new?runonclick=1) -## How do I cancel my Pro or Patron plan? +## How do I cancel my Personal Pro, Team Pro or Patron plan? -For Pro users, you can downgrade your plan on the +For Pro users, once you've logged in you can downgrade your plan on the [Settings page](https://codesandbox.io/dashboard/settings). If you're on one of our legacy Patron plans you can cancel From 7b7a460b1d9f5342ce47611889c28caafafbe846 Mon Sep 17 00:00:00 2001 From: James <91065484+JamesACS@users.noreply.github.com> Date: Wed, 15 Jun 2022 14:59:26 +0100 Subject: [PATCH 6/6] Wording revision --- packages/homepage/content/docs/1-x-faqs.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/packages/homepage/content/docs/1-x-faqs.md b/packages/homepage/content/docs/1-x-faqs.md index 2784ef89a05..492dedb0181 100644 --- a/packages/homepage/content/docs/1-x-faqs.md +++ b/packages/homepage/content/docs/1-x-faqs.md @@ -132,7 +132,7 @@ resolve it. For example: ## How do I cancel my Personal Pro, Team Pro or Patron plan? -For Pro users, once you've logged in you can downgrade your plan on the +For Team Pro & Personal Pro users, once you've logged in you can downgrade your plan on the [Settings page](https://codesandbox.io/dashboard/settings). If you're on one of our legacy Patron plans you can cancel