Skip to content

armgit / macro

Public Imported from GitHub
0

Macro is a unified workspace for teams: email, chat, docs, tasks, agents, calls, and CRM — @-linked together with shared AI memory.

feat(auth): restyle sign-in to match the new onboarding (#7972)

Jacob Beckerman5773ab526ab1
diff --git a/apps/web/src/features/auth/components/email-form.tsx b/apps/web/src/features/auth/components/email-form.tsx
index 4c5100d60d..63d587cbf0 100644
--- a/apps/web/src/features/auth/components/email-form.tsx
+++ b/apps/web/src/features/auth/components/email-form.tsx
@@ -1,8 +1,7 @@
import ArrowLeft from '@phosphor/arrow-left.svg';
import ArrowRight from '@phosphor/arrow-right.svg';
-import { Button } from '@ui';
import { Show } from 'solid-js';
-import { FormError, FormInput } from './form-fields';
+import { AuthButton, FormError, FormInput } from './form-fields';
export function EmailForm(props: {
email: string;
@@ -43,19 +42,14 @@ export function EmailForm(props: {
/>
</Show>
<FormError message={props.error} />
- <Button variant="cta" size="xl" type="submit" disabled={props.sending}>
+ <AuthButton type="submit" disabled={props.sending}>
Continue
- <ArrowRight class="size-5" />
- </Button>
- <Button
- variant="outline"
- size="xl"
- class="bg-surface"
- onClick={props.onBack}
- >
- <ArrowLeft class="size-5" />
+ <ArrowRight class="size-5 shrink-0" />
+ </AuthButton>
+ <AuthButton variant="secondary" onClick={props.onBack}>
+ <ArrowLeft class="size-5 shrink-0" />
Back to sign in
- </Button>
+ </AuthButton>
</form>
);
}
diff --git a/apps/web/src/features/auth/components/form-fields.tsx b/apps/web/src/features/auth/components/form-fields.tsx
index 2e7a817184..0430dca304 100644
--- a/apps/web/src/features/auth/components/form-fields.tsx
+++ b/apps/web/src/features/auth/components/form-fields.tsx
@@ -1,4 +1,5 @@
-import { onCleanup, onMount, Show } from 'solid-js';
+import { cn } from '@ui/utils/classname';
+import { type JSX, onCleanup, onMount, Show, splitProps } from 'solid-js';
export function FormInput(props: {
id: string;
@@ -37,7 +38,7 @@ export function FormInput(props: {
required={props.required ?? true}
autocomplete={props.id}
onInput={(event) => props.onInput(event.currentTarget.value)}
- class="ln-input w-full px-4 py-3 rounded-lg border border-edge bg-surface text-sm text-ink placeholder:text-ink-placeholder focus:border-accent focus:outline-none transition-colors user-invalid:border-failure"
+ class="obf-input w-full rounded-2xl border border-edge bg-input px-4 py-3 text-sm text-ink placeholder:text-ink-placeholder transition-colors focus:border-ink/40 focus:outline-none user-invalid:border-failure"
/>
);
}
@@ -51,3 +52,25 @@ export function FormError(props: { message?: string }) {
</Show>
);
}
+
+/** Onboarding's pill buttons: filled for the main action, outlined otherwise. */
+export function AuthButton(
+ props: JSX.ButtonHTMLAttributes<HTMLButtonElement> & {
+ variant?: 'primary' | 'secondary';
+ }
+) {
+ const [local, rest] = splitProps(props, ['variant', 'class', 'type']);
+ return (
+ <button
+ type={local.type ?? 'button'}
+ class={cn(
+ 'flex min-h-14 w-full items-center justify-center gap-3 rounded-full px-6 py-3.5 text-base font-medium transition-[opacity,background-color] focus-visible:outline-2 focus-visible:outline-offset-4 focus-visible:outline-ink disabled:opacity-40',
+ local.variant === 'secondary'
+ ? 'border border-edge text-ink hover:bg-ink/5'
+ : 'bg-ink text-surface hover:opacity-90',
+ local.class
+ )}
+ {...rest}
+ />
+ );
+}
diff --git a/apps/web/src/features/auth/components/login-card.tsx b/apps/web/src/features/auth/components/login-card.tsx
index e04a6f9059..889e92539f 100644
--- a/apps/web/src/features/auth/components/login-card.tsx
+++ b/apps/web/src/features/auth/components/login-card.tsx
@@ -1,72 +1,62 @@
-import { NoiseBackground } from '@core/component/NoiseBackground';
-import LogoIcon from '@icon/macro-logo.svg';
+import { MacroMarkIcon } from '@app/features/onboarding/components/macro-mark-icon';
+import { OnboardingShell } from '@app/features/onboarding/components/onboarding-shell';
import { type JSX, Show } from 'solid-js';
-/** The centered sign-in card: brand header, the active step, legal footer. */
+/** The centered sign-in card, framed and styled like onboarding's slides. */
export function LoginCard(props: {
/** The header yields to the on-screen keyboard on phones. */
compact: boolean;
children: JSX.Element;
}) {
return (
- <div class="flex items-center justify-center size-full overflow-hidden relative">
- <style>{
- /*css*/ `
- @keyframes ln-card-in {
- from { opacity: 0; transform: translateY(14px) scale(0.985); }
- to { opacity: 1; transform: translateY(0) scale(1); }
- }
- .ln-card { animation: ln-card-in 520ms cubic-bezier(0.22, 1, 0.36, 1) both; }
-
- /* Override browser autofill yellow with our surface/ink palette */
- .ln-input:-webkit-autofill,
- .ln-input:-webkit-autofill:hover,
- .ln-input:-webkit-autofill:focus,
- .ln-input:-webkit-autofill:active {
- -webkit-box-shadow: 0 0 0 1000px var(--color-surface) inset;
- -webkit-text-fill-color: var(--color-ink);
- caret-color: var(--color-ink);
- transition: background-color 5000s ease-in-out 0s;
- }
- `
- }</style>
-
- <NoiseBackground />
-
- <div class="relative z-10 w-full max-w-sm sm:max-w-lg ln-card">
- <div class="px-4 sm:px-8 flex flex-col gap-12">
- <div class="flex flex-col gap-8">
- <Show when={!props.compact}>
- <div class="flex flex-col gap-1.5">
- <LogoIcon class="mb-2 size-9 text-accent" />
- <h1 class="font-semibold tracking-tight text-ink text-2xl">
- Welcome to Macro
- </h1>
- <p class="text-sm text-ink-muted">The open source workspace</p>
- </div>
- </Show>
- {props.children}
- </div>
-
- <div class="text-center text-xs text-ink/50 wrap-break-word">
- By continuing, you agree to our{' '}
- <a
- class="text-link hover:text-link-hover visited:text-link-visited underline underline-offset-2 focus-visible:text-link-hover"
- href="/terms"
- >
- terms
- </a>{' '}
- and{' '}
- <a
- class="text-link hover:text-link-hover visited:text-link-visited underline underline-offset-2 focus-visible:text-link-hover"
- href="/privacy"
- >
- privacy policy
- </a>
- .
+ <OnboardingShell>
+ <div class="mx-auto flex w-full max-w-sm flex-col items-center text-center">
+ <Show when={!props.compact}>
+ <div
+ aria-hidden="true"
+ class="flex size-16 items-center justify-center rounded-[18px] text-ink"
+ style={{
+ background:
+ 'var(--onboarding-intro-background, linear-gradient(145deg, #171717, #090909 65%))',
+ 'box-shadow':
+ 'var(--onboarding-intro-shadow, inset .5px .5px 1px #ffffff1c, inset -.5px -.5px 1px #0008, 0 1px 1px #131313, 0 4px 10px #0005)',
+ }}
+ >
+ <MacroMarkIcon class="h-[22px] w-8" />
</div>
+ <h1
+ tabindex="-1"
+ class="mt-8 font-[Roboto_Slab_Variable] text-[30px] font-[315] leading-[1.2] tracking-[-.025em] outline-none [text-wrap:balance] sm:text-[36px]"
+ >
+ Welcome to Macro
+ </h1>
+ <p class="mt-4 font-[Inter_Variable] text-sm leading-6 text-ink-muted sm:text-[15px]">
+ The open source workspace
+ </p>
+ </Show>
+ <div
+ class={props.compact ? 'w-full text-left' : 'mt-9 w-full text-left'}
+ >
+ {props.children}
</div>
+ <p class="mt-8 text-xs leading-5 text-ink-extra-muted [text-wrap:balance]">
+ By continuing, you agree to our{' '}
+ <a
+ href="/terms"
+ class="underline underline-offset-2 hover:text-ink-muted"
+ >
+ terms
+ </a>{' '}
+ and{' '}
+ <a
+ href="/privacy"
+ class="underline underline-offset-2 hover:text-ink-muted"
+ >
+ privacy policy
+ </a>
+ .
+ </p>
</div>
- </div>
+ </OnboardingShell>
);
}
diff --git a/apps/web/src/features/auth/components/login-picker.tsx b/apps/web/src/features/auth/components/login-picker.tsx
index bfca54de41..7a8f44a0a8 100644
--- a/apps/web/src/features/auth/components/login-picker.tsx
+++ b/apps/web/src/features/auth/components/login-picker.tsx
@@ -1,7 +1,7 @@
import IconApple from '@icon/macro-apple.svg';
import IconGoogle from '@icon/macro-google.svg';
-import { Button } from '@ui';
import { Show } from 'solid-js';
+import { AuthButton } from './form-fields';
export function LoginPicker(props: {
/** Sign in with Apple is required for App Store review and iOS-only. */
@@ -12,29 +12,25 @@ export function LoginPicker(props: {
}) {
return (
<div class="flex flex-col gap-3">
- <Button variant="cta" size="xl" autofocus onClick={props.onGoogle}>
- <IconGoogle class="size-fit" />
+ <AuthButton autofocus onClick={props.onGoogle}>
+ <IconGoogle
+ viewBox="0 0 24 24"
+ class="size-5 shrink-0"
+ fill="currentColor"
+ stroke="none"
+ aria-hidden="true"
+ />
Continue with Google
- </Button>
+ </AuthButton>
<Show when={props.showApple}>
- <Button
- variant="outline"
- size="xl"
- class="bg-surface"
- onClick={props.onApple}
- >
- <IconApple class="size-fit" />
+ <AuthButton variant="secondary" onClick={props.onApple}>
+ <IconApple class="size-5 shrink-0" aria-hidden="true" />
Continue with Apple
- </Button>
+ </AuthButton>
</Show>
- <Button
- variant="outline"
- size="xl"
- class="bg-surface"
- onClick={props.onEmail}
- >
+ <AuthButton variant="secondary" onClick={props.onEmail}>
Continue with email
- </Button>
+ </AuthButton>
</div>
);
}
diff --git a/apps/web/src/features/auth/components/otp-input.tsx b/apps/web/src/features/auth/components/otp-input.tsx
index 634c1a6d05..1d935b1dd6 100644
--- a/apps/web/src/features/auth/components/otp-input.tsx
+++ b/apps/web/src/features/auth/components/otp-input.tsx
@@ -70,7 +70,7 @@ export function OtpInput(props: {
{(_, index) => (
<div
class={cn(
- 'flex h-13 flex-1 items-center justify-center rounded-lg border bg-surface text-lg font-medium tabular-nums text-ink transition-colors',
+ 'flex h-13 flex-1 items-center justify-center rounded-2xl border bg-input text-lg font-medium tabular-nums text-ink transition-colors',
focused() && index === activeIndex()
? 'border-accent'
: 'border-edge'
diff --git a/apps/web/src/features/auth/components/verify-form.tsx b/apps/web/src/features/auth/components/verify-form.tsx
index 82c137865e..2129e2f612 100644
--- a/apps/web/src/features/auth/components/verify-form.tsx
+++ b/apps/web/src/features/auth/components/verify-form.tsx
@@ -1,8 +1,7 @@
import ArrowLeft from '@phosphor/arrow-left.svg';
import ArrowRight from '@phosphor/arrow-right.svg';
-import { Button } from '@ui';
import { Show } from 'solid-js';
-import { FormError } from './form-fields';
+import { AuthButton, FormError } from './form-fields';
import { OtpInput } from './otp-input';
export function VerifyForm(props: {
@@ -50,19 +49,14 @@ export function VerifyForm(props: {
</button>
</p>
<FormError message={props.error} />
- <Button variant="cta" size="xl" type="submit" disabled={!props.canVerify}>
+ <AuthButton type="submit" disabled={!props.canVerify}>
Verify
- <ArrowRight class="size-5" />
- </Button>
- <Button
- variant="outline"
- size="xl"
- class="bg-surface"
- onClick={props.onBack}
- >
- <ArrowLeft class="size-5" />
+ <ArrowRight class="size-5 shrink-0" />
+ </AuthButton>
+ <AuthButton variant="secondary" onClick={props.onBack}>
+ <ArrowLeft class="size-5 shrink-0" />
Change email
- </Button>
+ </AuthButton>
</form>
);
}