From 161f21eb57fe8ac9d6f0149223c23bc35a37f81d Mon Sep 17 00:00:00 2001 From: bkellam Date: Thu, 27 Feb 2025 13:25:24 -0800 Subject: [PATCH] Make login and onboarding mobile friendly --- .../connectionCreationForms/secretCombobox.tsx | 2 +- .../onboard/components/connectCodeHost.tsx | 2 +- .../app/[domain]/onboard/components/inviteTeam.tsx | 2 +- packages/web/src/app/[domain]/onboard/page.tsx | 4 ++-- .../web/src/app/login/components/loginForm.tsx | 8 ++++---- packages/web/src/app/login/page.tsx | 2 +- .../src/app/onboard/components/orgCreateForm.tsx | 14 +++++++++----- packages/web/src/app/onboard/page.tsx | 4 ++-- 8 files changed, 21 insertions(+), 17 deletions(-) diff --git a/packages/web/src/app/[domain]/components/connectionCreationForms/secretCombobox.tsx b/packages/web/src/app/[domain]/components/connectionCreationForms/secretCombobox.tsx index 2fa64010..0ba03e16 100644 --- a/packages/web/src/app/[domain]/components/connectionCreationForms/secretCombobox.tsx +++ b/packages/web/src/app/[domain]/components/connectionCreationForms/secretCombobox.tsx @@ -252,7 +252,7 @@ const ImportSecretDialog = ({ open, onOpenChange, onSecretCreated, codeHostType onOpenChange={onOpenChange} > Import a secret diff --git a/packages/web/src/app/[domain]/onboard/components/connectCodeHost.tsx b/packages/web/src/app/[domain]/onboard/components/connectCodeHost.tsx index 0e20fe41..9a402fee 100644 --- a/packages/web/src/app/[domain]/onboard/components/connectCodeHost.tsx +++ b/packages/web/src/app/[domain]/onboard/components/connectCodeHost.tsx @@ -83,7 +83,7 @@ interface CodeHostSelectionProps { const CodeHostSelection = ({ onSelect }: CodeHostSelectionProps) => { return ( -
+
{ }, [onComplete, form, captureEvent]); return ( - +
diff --git a/packages/web/src/app/[domain]/onboard/page.tsx b/packages/web/src/app/[domain]/onboard/page.tsx index df773b5b..fdeb5c68 100644 --- a/packages/web/src/app/[domain]/onboard/page.tsx +++ b/packages/web/src/app/[domain]/onboard/page.tsx @@ -41,8 +41,8 @@ export default async function Onboard({ params, searchParams }: OnboardProps) { const lastRequiredStep = OnboardingSteps.Checkout; return ( -
- +
+ {step === OnboardingSteps.ConnectCodeHost && ( <> +
-

Sign in to your account

+

Sign in to your account

- + {error && (
{errorMessage} diff --git a/packages/web/src/app/login/page.tsx b/packages/web/src/app/login/page.tsx index c113fa0a..8723ea1a 100644 --- a/packages/web/src/app/login/page.tsx +++ b/packages/web/src/app/login/page.tsx @@ -27,7 +27,7 @@ export default async function Login({ searchParams }: LoginProps) { }); return ( -
+
) => { + setIsLoading(true); const response = await createOrg(data.name, data.domain); if (isServiceError(response)) { toast({ @@ -60,9 +61,12 @@ export function OrgCreateForm() { captureEvent('wa_onboard_org_create_fail', { error: response.errorCode, }) + setIsLoading(false); } else { router.push(`/${data.domain}/onboard`); - captureEvent('wa_onboard_org_create_success', {}) + captureEvent('wa_onboard_org_create_success', {}); + // @note: we don't want to set isLoading to false here since we want to show the loading + // spinner until the page is redirected. } }, [router, toast, captureEvent]); @@ -113,8 +117,8 @@ export function OrgCreateForm() { )} /> - diff --git a/packages/web/src/app/onboard/page.tsx b/packages/web/src/app/onboard/page.tsx index 9bb08c81..3cc2ddfa 100644 --- a/packages/web/src/app/onboard/page.tsx +++ b/packages/web/src/app/onboard/page.tsx @@ -12,14 +12,14 @@ export default async function Onboarding() { } return ( -
+
- +
); }