From 537796e1a01009e8873673b091e2b47cfa73d4bc Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Mon, 5 Dec 2022 17:41:39 +0000 Subject: [PATCH 01/17] fix: copy not working on http --- src/lib/components/copy.svelte | 51 +++++++++++++++++++++++++++------- 1 file changed, 41 insertions(+), 10 deletions(-) diff --git a/src/lib/components/copy.svelte b/src/lib/components/copy.svelte index 1f0e5dfd8..e9272af34 100644 --- a/src/lib/components/copy.svelte +++ b/src/lib/components/copy.svelte @@ -9,23 +9,54 @@ let content = 'Click to copy'; - const copy = async () => { + async function securedCopy() { try { await navigator.clipboard.writeText(value); + } catch { + return false; + } + + return true; + } + + function unsecuredCopy() { + const textArea = document.createElement('textarea'); + textArea.value = value; + document.body.appendChild(textArea); + textArea.focus(); + textArea.select(); + + let success = true; + try { + document.execCommand('copy'); + } catch { + success = false; + } finally { + document.body.removeChild(textArea); + } + + return success; + } + + async function copy() { + // Because of how JS works, unsecuredCopy only runs if securedCopy fails + const success = (await securedCopy()) || unsecuredCopy(); + + if (success) { content = 'Copied'; - } catch (error) { + } else { addNotification({ - message: error.message, + message: 'Unable to copy to clipboard', type: 'error' }); - } finally { - if (event) { - trackEvent('click_id_tag', { - name: event - }); - } } - }; + + if (event) { + trackEvent('click_id_tag', { + name: event + }); + } + } Date: Tue, 6 Dec 2022 16:44:28 +0000 Subject: [PATCH 02/17] refactor: update copy comment --- src/lib/components/copy.svelte | 3 ++- 1 file changed, 2 insertions(+), 1 deletion(-) diff --git a/src/lib/components/copy.svelte b/src/lib/components/copy.svelte index e9272af34..2bfa61ddd 100644 --- a/src/lib/components/copy.svelte +++ b/src/lib/components/copy.svelte @@ -39,7 +39,8 @@ } async function copy() { - // Because of how JS works, unsecuredCopy only runs if securedCopy fails + // securedCopy works only in HTTPS environment. + // unsecuredCopy works in HTTP and only runs if securedCopy fails. const success = (await securedCopy()) || unsecuredCopy(); if (success) { From 15372038c2ad241a3022f1ff2c182c15151c8adb Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 6 Dec 2022 17:02:46 +0000 Subject: [PATCH 03/17] fix: incorrect origin for non-web platforms --- .../platforms/wizard/apple/step1.svelte | 6 ++-- .../platforms/wizard/flutter/step1.svelte | 35 ++++++++++++------- 2 files changed, 25 insertions(+), 16 deletions(-) diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte index 08052981f..49cdcd687 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/apple/step1.svelte @@ -41,9 +41,9 @@ projectId, platform, $createPlatform.name, + $createPlatform.key, undefined, - undefined, - $createPlatform.hostname + undefined ); $createPlatform.$id = response.$id; @@ -95,6 +95,6 @@ placeholder="com.company.appname" tooltip="You can find your Bundle Identifier in the General tab for your app's primary target in Xcode." required - bind:value={$createPlatform.hostname} /> + bind:value={$createPlatform.key} /> diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte index df6f60ad0..a638b0d60 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte @@ -97,9 +97,9 @@ projectId, platform, $createPlatform.name, + platform !== Platform.Web ? $createPlatform.key : undefined, undefined, - undefined, - $createPlatform.hostname + platform === Platform.Web ? $createPlatform.hostname : undefined ); $createPlatform.$id = response.$id; @@ -160,15 +160,16 @@ placeholder={placeholder[platform].name} required bind:value={$createPlatform.name} /> -
- - {#if platform === Platform.Web} + {#if platform === Platform.Web} +
+ +
{#each suggestions as suggestion} {/each}
- {/if} -
+
+ {:else} + + {/if} From 19af6d3d6a93be297cf3ed514acf04e14e74f885 Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Tue, 6 Dec 2022 18:02:09 +0000 Subject: [PATCH 04/17] fix: falsy default values not registering on create attribute --- .../collection-[collection]/attributes/+page.svelte | 2 +- .../collection-[collection]/attributes/float.svelte | 2 +- .../collection-[collection]/attributes/integer.svelte | 2 +- 3 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte index 1b7c7501e..391bc4e9e 100644 --- a/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte +++ b/src/routes/console/project-[project]/databases/database-[database]/collection-[collection]/attributes/+page.svelte @@ -65,7 +65,7 @@ {attribute.type} - {attribute.default ? attribute.default : '-'} + {attribute.default !== null ? attribute.default : '-'} Date: Wed, 7 Dec 2022 10:22:52 +0000 Subject: [PATCH 05/17] Fix Gitpod hostname suggestion --- .../overview/platforms/wizard/flutter/step1.svelte | 2 +- .../overview/platforms/wizard/web/step1.svelte | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte index df6f60ad0..530a4cd0a 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/flutter/step1.svelte @@ -25,7 +25,7 @@ let platform: Platform = Platform.Android; const projectId = $page.params.project; - const suggestions = ['*.vercel.app', '*.netlify.app', '*.gitpod.app']; + const suggestions = ['*.vercel.app', '*.netlify.app', '*.gitpod.io']; const placeholder: Record< Platform, { diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte index aa1ff28ea..5a3e555da 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/web/step1.svelte @@ -12,7 +12,7 @@ import Dark from './dark.svg'; const projectId = $page.params.project; - const suggestions = ['*.vercel.app', '*.netlify.app', '*.gitpod.app']; + const suggestions = ['*.vercel.app', '*.netlify.app', '*.gitpod.io']; $wizard.media = $app.themeInUse === 'dark' ? Dark : Light; async function beforeSubmit() { From b7b6fd7ebe4d47ee8f72a6403cda519a2fe788ec Mon Sep 17 00:00:00 2001 From: Arman Date: Wed, 7 Dec 2022 14:52:37 +0100 Subject: [PATCH 06/17] fix: accept invite while logged in --- src/lib/layout/unauthenticated.svelte | 3 ++- src/routes/+layout.svelte | 7 ++++++- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/src/lib/layout/unauthenticated.svelte b/src/lib/layout/unauthenticated.svelte index 62d9e923b..1028e4f0a 100644 --- a/src/lib/layout/unauthenticated.svelte +++ b/src/lib/layout/unauthenticated.svelte @@ -4,6 +4,7 @@ import LoginDark from '$lib/images/login/login-dark-mode.svg'; import { app } from '$lib/stores/app'; import { base } from '$app/paths'; + import { user } from '$lib/stores/user'; const technologies = [ 'js', @@ -25,7 +26,7 @@ diff --git a/src/routes/+layout.svelte b/src/routes/+layout.svelte index 43965143d..bdaa9a1ad 100644 --- a/src/routes/+layout.svelte +++ b/src/routes/+layout.svelte @@ -49,11 +49,16 @@ if (!$page.url.pathname.startsWith('/auth')) { const acceptedRoutes = ['/login', '/register', '/recover', '/invite']; if ($user) { - if (!$page.url.pathname.startsWith('/console')) { + if ( + !$page.url.pathname.startsWith('/console') && + !$page.url.pathname.startsWith('/invite') + ) { + console.log('test'); await goto(`${base}/console`, { replaceState: true }); } + loading.set(false); } else { if (acceptedRoutes.includes($page.url.pathname)) { await goto(`${base}${$page.url.pathname}${$page.url.search}`); From e5f5e370fe4710b8f03a5d781f8db5efbc01208f Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 7 Dec 2022 18:07:54 +0000 Subject: [PATCH 07/17] fix: change android package name field to use key instead of hostname --- .../overview/platforms/[platform]/android.svelte | 14 +++++++------- .../overview/platforms/wizard/android/step1.svelte | 8 ++++---- 2 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte index ebcd4ce21..b3d93c638 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte @@ -10,10 +10,10 @@ import { project } from '../../../store'; import { platform } from './store'; - let hostname: string = null; + let packageName: string = null; onMount(() => { - hostname ??= $platform.hostname; + packageName ??= $platform.key; }); const updateHostname = async () => { @@ -22,9 +22,9 @@ $project.$id, $platform.$id, $platform.name, - $platform.key, + packageName, $platform.store, - hostname + $platform.hostname ); invalidate(Dependencies.PLATFORM); trackEvent('submit_platform_update', { @@ -52,16 +52,16 @@ - + diff --git a/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte b/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte index 2ff8ac01c..7971b24e6 100644 --- a/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte +++ b/src/routes/console/project-[project]/overview/platforms/wizard/android/step1.svelte @@ -31,9 +31,9 @@ projectId, 'android', $createPlatform.name, + $createPlatform.key, undefined, - undefined, - $createPlatform.hostname + undefined ); $createPlatform.$id = platform.$id; @@ -50,11 +50,11 @@ required bind:value={$createPlatform.name} /> + bind:value={$createPlatform.key} /> From a14a60fe50addb14c69a35e4b6489826044826df Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Wed, 7 Dec 2022 18:09:42 +0000 Subject: [PATCH 08/17] refactor: rename android overview fields --- .../overview/platforms/[platform]/android.svelte | 12 ++++++------ 1 file changed, 6 insertions(+), 6 deletions(-) diff --git a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte index b3d93c638..fa23169a1 100644 --- a/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte +++ b/src/routes/console/project-[project]/overview/platforms/[platform]/android.svelte @@ -10,10 +10,10 @@ import { project } from '../../../store'; import { platform } from './store'; - let packageName: string = null; + let key: string = null; onMount(() => { - packageName ??= $platform.key; + key ??= $platform.key; }); const updateHostname = async () => { @@ -22,7 +22,7 @@ $project.$id, $platform.$id, $platform.name, - packageName, + key, $platform.store, $platform.hostname ); @@ -52,16 +52,16 @@ - + From 9b7895c11de4772b8ccd1847198482ce4e4e020d Mon Sep 17 00:00:00 2001 From: tglide <26071571+TGlide@users.noreply.github.com> Date: Fri, 9 Dec 2022 11:44:38 +0000 Subject: [PATCH 09/17] refactor: add copy helper & fix copyInput --- src/lib/components/copy.svelte | 38 +++-------------------------- src/lib/components/copyInput.svelte | 14 ++++++----- src/lib/helpers/copy.ts | 36 +++++++++++++++++++++++++++ 3 files changed, 48 insertions(+), 40 deletions(-) create mode 100644 src/lib/helpers/copy.ts diff --git a/src/lib/components/copy.svelte b/src/lib/components/copy.svelte index 2bfa61ddd..0e859e79c 100644 --- a/src/lib/components/copy.svelte +++ b/src/lib/components/copy.svelte @@ -2,6 +2,7 @@ import { trackEvent } from '$lib/actions/analytics'; import { tooltip } from '$lib/actions/tooltip'; import { clickOnEnter } from '$lib/helpers/a11y'; + import { copy } from '$lib/helpers/copy'; import { addNotification } from '$lib/stores/notifications'; export let value: string; @@ -9,39 +10,8 @@ let content = 'Click to copy'; - async function securedCopy() { - try { - await navigator.clipboard.writeText(value); - } catch { - return false; - } - - return true; - } - - function unsecuredCopy() { - const textArea = document.createElement('textarea'); - textArea.value = value; - document.body.appendChild(textArea); - textArea.focus(); - textArea.select(); - - let success = true; - try { - document.execCommand('copy'); - } catch { - success = false; - } finally { - document.body.removeChild(textArea); - } - - return success; - } - - async function copy() { - // securedCopy works only in HTTPS environment. - // unsecuredCopy works in HTTP and only runs if securedCopy fails. - const success = (await securedCopy()) || unsecuredCopy(); + async function handleClick() { + const success = await copy(value); if (success) { content = 'Copied'; @@ -61,7 +31,7 @@ setTimeout(() => (content = 'Click to copy'))} use:tooltip={{ diff --git a/src/lib/components/copyInput.svelte b/src/lib/components/copyInput.svelte index 65bd6bb81..b06f1ae36 100644 --- a/src/lib/components/copyInput.svelte +++ b/src/lib/components/copyInput.svelte @@ -1,5 +1,6 @@