feature(ui): Implement socialButtonsPlacement layout logic#3992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
alexcarpenter merged 6 commits into from
Aug 21, 2024
Merged

feature(ui): Implement socialButtonsPlacement layout logic #3992

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
ab246e0
fix lint issues
alexcarpenter Aug 20, 2024
a93ecb0
placement
alexcarpenter Aug 20, 2024
215f6ac
add to signup flow
alexcarpenter Aug 20, 2024
0b29b7d
fix layout
alexcarpenter Aug 20, 2024
8d9051f
add toggle
alexcarpenter Aug 20, 2024
97a91ae
use type from clerk/types
alexcarpenter Aug 20, 2024
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
217 changes: 100 additions & 117 deletions packages/ui/src/components/sign-in/steps/choose-strategy.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import { Connections } from '~/common/connections';
import { GlobalError } from '~/common/global-error';
import { useGetHelp } from '~/components/sign-in/hooks/use-get-help';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
import { useEnabledConnections } from '~/hooks/use-enabled-connections';
Expand All@@ -14,29 +15,16 @@ import { Button } from '~/primitives/button';
import * as Card from '~/primitives/card';
import * as Icon from '~/primitives/icon';
import { LinkButton } from '~/primitives/link';
import { Separator } from '~/primitives/separator';

/* Internal
============================================ */

function FirstFactorConnections({
isGlobalLoading,
hasConnection,
}: {
isGlobalLoading: boolean;
hasConnection: boolean;
}) {
const { t } = useLocalizations();
function FirstFactorConnections({ isGlobalLoading }: { isGlobalLoading: boolean }) {
const { signIn } = useSignIn();
const isFirstFactor = signIn?.status === 'needs_first_factor';

if (isFirstFactor) {
return (
<>
<Connections disabled={isGlobalLoading} />
{hasConnection ? <Separator>{t('dividerText')}</Separator> : null}
</>
);
return <Connections disabled={isGlobalLoading} />;
}
return null;
}
Expand DownExpand Up@@ -69,118 +57,113 @@ export function SignInChooseStrategy() {
<GlobalError />

<Card.Body>
<div className='flex flex-col gap-6'>
<FirstFactorConnections
isGlobalLoading={isGlobalLoading}
hasConnection={hasConnection}
/>
<div className='flex flex-col gap-3'>
<div className='flex flex-col gap-2'>
<SignIn.SupportedStrategy
name='email_link'
asChild
>
<Button
intent='secondary'
iconStart={<Icon.LinkSm />}
>
<SignIn.SafeIdentifier
transform={(identifier: string) =>
t('signIn.alternativeMethods.blockButton__emailLink', {
identifier,
})
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='email_code'
asChild
>
<Button
intent='secondary'
iconStart={<Icon.EnvelopeSm />}
>
<SignIn.SafeIdentifier
transform={(identifier: string) =>
t('signIn.alternativeMethods.blockButton__emailCode', {
identifier,
})
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='phone_code'
asChild
<div className='flex flex-col gap-3'>
<div className='flex flex-col gap-2'>
<FirstFactorConnections isGlobalLoading={isGlobalLoading} />
<SignIn.SupportedStrategy
name='email_link'
asChild
>
<Button
intent='secondary'
iconStart={<Icon.LinkSm />}
>
<Button
intent='secondary'
iconStart={<Icon.SMSSm />}
>
<SignIn.SafeIdentifier
transform={(identifier: string) =>
t('signIn.alternativeMethods.blockButton__phoneCode', {
identifier,
})
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='passkey'
asChild
<SignIn.SafeIdentifier
transform={(identifier: string) =>
t('signIn.alternativeMethods.blockButton__emailLink', {
identifier,
})
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='email_code'
asChild
>
<Button
intent='secondary'
iconStart={<Icon.EnvelopeSm />}
>
<Button
intent='secondary'
iconStart={<Icon.FingerprintSm />}
>
{t('signIn.alternativeMethods.blockButton__passkey')}
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='password'
asChild
<SignIn.SafeIdentifier
transform={(identifier: string) =>
t('signIn.alternativeMethods.blockButton__emailCode', {
identifier,
})
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='phone_code'
asChild
>
<Button
intent='secondary'
iconStart={<Icon.SMSSm />}
>
<Button
intent='secondary'
iconStart={<Icon.LockSm />}
>
{t('signIn.alternativeMethods.blockButton__password')}
</Button>
</SignIn.SupportedStrategy>

{
// `SupportedStrategy`s that are only intended for use
// within `choose-strategy`, not the `forgot-password`
// `Step
}
<SignIn.SupportedStrategy
name='totp'
asChild
<SignIn.SafeIdentifier
transform={(identifier: string) =>
t('signIn.alternativeMethods.blockButton__phoneCode', {
identifier,
})
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='passkey'
asChild
>
<Button
intent='secondary'
iconStart={<Icon.FingerprintSm />}
>
<Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
</SignIn.SupportedStrategy>
{t('signIn.alternativeMethods.blockButton__passkey')}
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='backup_code'
asChild
<SignIn.SupportedStrategy
name='password'
asChild
>
<Button
intent='secondary'
iconStart={<Icon.LockSm />}
>
<Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
</SignIn.SupportedStrategy>
</div>
{t('signIn.alternativeMethods.blockButton__password')}
</Button>
</SignIn.SupportedStrategy>

{
// `SupportedStrategy`s that are only intended for use
// within `choose-strategy`, not the `forgot-password`
// `Step
}
<SignIn.SupportedStrategy
name='totp'
asChild
>
<Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
</SignIn.SupportedStrategy>

<SignIn.Action
navigate='previous'
<SignIn.SupportedStrategy
name='backup_code'
asChild
>
<LinkButton>{t('backButton')}</LinkButton>
</SignIn.Action>
<Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
</SignIn.SupportedStrategy>
</div>

<SignIn.Action
navigate='previous'
asChild
>
<LinkButton>{t('backButton')}</LinkButton>
</SignIn.Action>
</div>
</Card.Body>
</Card.Content>
Expand Down
11 changes: 8 additions & 3 deletions packages/ui/src/components/sign-in/steps/start.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PhoneNumberField } from '~/common/phone-number-field';
import { PhoneNumberOrUsernameField } from '~/common/phone-number-or-username-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand All@@ -35,11 +36,16 @@ export function SignInStart() {
const hasConnection = enabledConnections.length > 0;
const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
const isDev = useDevModeWarning();
const { layout } = useAppearance().parsedAppearance;
const { logoProps, footerProps } = useCard();

return (
<Common.Loading scope='global'>
{isGlobalLoading => {
const connectionsWithSeperator = [
<Connections disabled={isGlobalLoading} />,
hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
];
return (
<SignIn.Step name='start'>
<Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -53,9 +59,7 @@ export function SignInStart() {
<GlobalError />

<Card.Body>
<Connections disabled={isGlobalLoading} />

{hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
{layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

{hasIdentifier ? (
<div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -122,6 +126,7 @@ export function SignInStart() {
) : null}
</div>
) : null}
{layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}
</Card.Body>
<Card.Actions>
<Common.Loading scope='submit'>
Expand Down
12 changes: 9 additions & 3 deletions packages/ui/src/components/sign-up/steps/start.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { PasswordField } from '~/common/password-field';
import { PhoneNumberField } from '~/common/phone-number-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand DownExpand Up@@ -40,11 +41,16 @@ export function SignUpStart() {
const hasConnection = enabledConnections.length > 0;
const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
const isDev = useDevModeWarning();
const { layout } = useAppearance().parsedAppearance;
const { logoProps, footerProps } = useCard();

return (
<Common.Loading scope='global'>
{isGlobalLoading => {
const connectionsWithSeperator = [
<Connections disabled={isGlobalLoading} />,
hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
];
return (
<SignUp.Step name='start'>
<Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -62,9 +68,7 @@ export function SignUpStart() {
<GlobalError />

<Card.Body>
<Connections disabled={isGlobalLoading} />

{hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
{layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

{hasIdentifier ? (
<div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -118,6 +122,8 @@ export function SignUpStart() {
</div>
) : null}

{layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}

{userSettings.signUp.captcha_enabled ? <SignUp.Captcha className='empty:hidden' /> : null}
</Card.Body>
{hasConnection || hasIdentifier ? (
Expand Down
2 changes: 1 addition & 1 deletion packages/ui/theme-builder/app/components/logo.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SVGAttributes } from 'react';
import type { SVGAttributes } from 'react';

export const Logo = (props: SVGAttributes<SVGElement>) => (
<svg
Expand Down
5 changes: 4 additions & 1 deletion packages/ui/theme-builder/app/page.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,10 @@ import { SignedIn, SignedOut, SignInButton, SignUpButton, UserButton } from '@cl

function Button({ children }: { children: React.ReactNode }) {
return (
<button className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'>
<button
className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'
type='button'
>
{children}
</button>
);
Expand Down
Loading
, 'i'); if (__m === '*' || __re.test(location.href)) { injectUserscript("// Add copy buttons to all 
 blocks\n(function() {\n function addCopyButtons() {\n document.querySelectorAll('pre code').forEach(function(codeBlock) {\n if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;\n codeBlock.parentElement.setAttribute('data-copy-added', 'true');\n \n var btn = document.createElement('button');\n btn.textContent = 'Copy';\n btn.style.cssText = 'position:absolute;top:4px;right:4px;padding:2px 8px;font-size:11px;background:#4ecdc4;border:none;border-radius:4px;color:#1a1a2e;cursor:pointer;opacity:0.7;transition:opacity 0.2s;';\n btn.onmouseover = function() { this.style.opacity = '1'; };\n btn.onmouseout = function() { this.style.opacity = '0.7'; };\n btn.onclick = function() {\n navigator.clipboard.writeText(codeBlock.textContent).then(function() {\n btn.textContent = 'Copied!';\n setTimeout(function() { btn.textContent = 'Copy'; }, 1500);\n });\n };\n codeBlock.parentElement.style.position = 'relative';\n codeBlock.parentElement.appendChild(btn);\n });\n }\n \n addCopyButtons();\n \n // Re-run on dynamic content\n var observer = new MutationObserver(addCopyButtons);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Add Copy Buttons to Code Blocks");
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '

Skip to content
feature(ui): Implement socialButtonsPlacement layout logic#3992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcarpenter
merged 6 commits into

from

Aug 21, 2024
 Merged


feature(ui): Implement socialButtonsPlacement layout logic
#3992
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ab246e0

fix lint issues


alexcarpenter Aug 20, 2024
a93ecb0

placement


alexcarpenter Aug 20, 2024
215f6ac

add to signup flow


alexcarpenter Aug 20, 2024
0b29b7d

fix layout


alexcarpenter Aug 20, 2024
8d9051f

add toggle


alexcarpenter Aug 20, 2024
97a91ae

use type from clerk/types


alexcarpenter Aug 20, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


217 changes: 100 additions & 117 deletions
packages/ui/src/components/sign-in/steps/choose-strategy.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import { Connections } from '~/common/connections';
import { GlobalError } from '~/common/global-error';
import { useGetHelp } from '~/components/sign-in/hooks/use-get-help';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
import { useEnabledConnections } from '~/hooks/use-enabled-connections';
Expand All@@ -14,29 +15,16 @@ import { Button } from '~/primitives/button';
import * as Card from '~/primitives/card';
import * as Icon from '~/primitives/icon';
import { LinkButton } from '~/primitives/link';
import { Separator } from '~/primitives/separator';

/* Internal
 ============================================ */

function FirstFactorConnections({
 isGlobalLoading,
 hasConnection,
}: {
 isGlobalLoading: boolean;
 hasConnection: boolean;
}) {
 const { t } = useLocalizations();
function FirstFactorConnections({ isGlobalLoading }: { isGlobalLoading: boolean }) {
 const { signIn } = useSignIn();
 const isFirstFactor = signIn?.status === 'needs_first_factor';

 if (isFirstFactor) {
 return (
 <>
 <Connections disabled={isGlobalLoading} />
 {hasConnection ? <Separator>{t('dividerText')}</Separator> : null}
 </>
 );
 return <Connections disabled={isGlobalLoading} />;
 }
 return null;
}
Expand DownExpand Up@@ -69,118 +57,113 @@ export function SignInChooseStrategy() {
 <GlobalError />

 <Card.Body>
 <div className='flex flex-col gap-6'>
 <FirstFactorConnections
 isGlobalLoading={isGlobalLoading}
 hasConnection={hasConnection}
 />
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='email_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.EnvelopeSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <FirstFactorConnections isGlobalLoading={isGlobalLoading} />
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <Button
intent='secondary'
iconStart={<Icon.SMSSm />}
>
<SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
</SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
name='passkey'
asChild
 <SignIn.SafeIdentifier
transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='email_code'
asChild
 >
 <Button
intent='secondary'
iconStart={<Icon.EnvelopeSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='password'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.SMSSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='passkey'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='backup_code'
 asChild
 <SignIn.SupportedStrategy
 name='password'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>

 <SignIn.Action
navigate='previous'
 <SignIn.SupportedStrategy
name='backup_code'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>

 <SignIn.Action
 navigate='previous'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 </div>
 </Card.Body>
 </Card.Content>
Expand Down

11 changes: 8 additions & 3 deletions
packages/ui/src/components/sign-in/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PhoneNumberField } from '~/common/phone-number-field';
import { PhoneNumberOrUsernameField } from '~/common/phone-number-or-username-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand All@@ -35,11 +36,16 @@ export function SignInStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignIn.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -53,9 +59,7 @@ export function SignInStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -122,6 +126,7 @@ export function SignInStart() {
 ) : null}
 </div>
 ) : null}
 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}
 </Card.Body>
 <Card.Actions>
 <Common.Loading scope='submit'>
Expand Down

12 changes: 9 additions & 3 deletions
packages/ui/src/components/sign-up/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { PasswordField } from '~/common/password-field';
import { PhoneNumberField } from '~/common/phone-number-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand DownExpand Up@@ -40,11 +41,16 @@ export function SignUpStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignUp.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -62,9 +68,7 @@ export function SignUpStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -118,6 +122,8 @@ export function SignUpStart() {
 </div>
 ) : null}

 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}

 {userSettings.signUp.captcha_enabled ? <SignUp.Captcha className='empty:hidden' /> : null}
 </Card.Body>
 {hasConnection || hasIdentifier ? (
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/theme-builder/app/components/logo.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SVGAttributes } from 'react';
import type { SVGAttributes } from 'react';

export const Logo = (props: SVGAttributes<SVGElement>) => (
 <svg
Expand Down

5 changes: 4 additions & 1 deletion
packages/ui/theme-builder/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,10 @@ import { SignedIn, SignedOut, SignInButton, SignUpButton, UserButton } from '@cl

function Button({ children }: { children: React.ReactNode }) {
 return (
 <button className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'>
 <button
 className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'
 type='button'
 >
 {children}
 </button>
 );
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Force GitHub README to respect dark mode\n(function() {\n var style = document.createElement('style');\n style.textContent = '\n .markdown-body {\n color-scheme: dark light;\n }\n .markdown-body pre { background: #161b22 !important; }\n .markdown-body code { background: rgba(110, 118, 129, 0.4) !important; }\n .markdown-body table th, .markdown-body table td { border-color: #30363d !important; }\n .markdown-body img { background: #0d1117; }\n .markdown-body blockquote { border-left-color: #8b949e; }\n .markdown-body hr { border-color: #30363d; }\n ';\n document.head.appendChild(style);\n})();", "GitHub Dark Mode README Fix");
}
} catch(__e) { console.warn('[Userscript:GitHub Dark Mode README Fix]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature(ui): Implement socialButtonsPlacement layout logic#3992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcarpenter
merged 6 commits into

from

Aug 21, 2024
 Merged


feature(ui): Implement socialButtonsPlacement layout logic
#3992
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ab246e0

fix lint issues


alexcarpenter Aug 20, 2024
a93ecb0

placement


alexcarpenter Aug 20, 2024
215f6ac

add to signup flow


alexcarpenter Aug 20, 2024
0b29b7d

fix layout


alexcarpenter Aug 20, 2024
8d9051f

add toggle


alexcarpenter Aug 20, 2024
97a91ae

use type from clerk/types


alexcarpenter Aug 20, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


217 changes: 100 additions & 117 deletions
packages/ui/src/components/sign-in/steps/choose-strategy.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import { Connections } from '~/common/connections';
import { GlobalError } from '~/common/global-error';
import { useGetHelp } from '~/components/sign-in/hooks/use-get-help';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
import { useEnabledConnections } from '~/hooks/use-enabled-connections';
Expand All@@ -14,29 +15,16 @@ import { Button } from '~/primitives/button';
import * as Card from '~/primitives/card';
import * as Icon from '~/primitives/icon';
import { LinkButton } from '~/primitives/link';
import { Separator } from '~/primitives/separator';

/* Internal
 ============================================ */

function FirstFactorConnections({
 isGlobalLoading,
 hasConnection,
}: {
 isGlobalLoading: boolean;
 hasConnection: boolean;
}) {
 const { t } = useLocalizations();
function FirstFactorConnections({ isGlobalLoading }: { isGlobalLoading: boolean }) {
 const { signIn } = useSignIn();
 const isFirstFactor = signIn?.status === 'needs_first_factor';

 if (isFirstFactor) {
 return (
 <>
 <Connections disabled={isGlobalLoading} />
 {hasConnection ? <Separator>{t('dividerText')}</Separator> : null}
 </>
 );
 return <Connections disabled={isGlobalLoading} />;
 }
 return null;
}
Expand DownExpand Up@@ -69,118 +57,113 @@ export function SignInChooseStrategy() {
 <GlobalError />

 <Card.Body>
 <div className='flex flex-col gap-6'>
 <FirstFactorConnections
 isGlobalLoading={isGlobalLoading}
 hasConnection={hasConnection}
 />
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='email_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.EnvelopeSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <FirstFactorConnections isGlobalLoading={isGlobalLoading} />
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <Button
intent='secondary'
iconStart={<Icon.SMSSm />}
>
<SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
</SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
name='passkey'
asChild
 <SignIn.SafeIdentifier
transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='email_code'
asChild
 >
 <Button
intent='secondary'
iconStart={<Icon.EnvelopeSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='password'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.SMSSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='passkey'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='backup_code'
 asChild
 <SignIn.SupportedStrategy
 name='password'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>

 <SignIn.Action
navigate='previous'
 <SignIn.SupportedStrategy
name='backup_code'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>

 <SignIn.Action
 navigate='previous'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 </div>
 </Card.Body>
 </Card.Content>
Expand Down

11 changes: 8 additions & 3 deletions
packages/ui/src/components/sign-in/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PhoneNumberField } from '~/common/phone-number-field';
import { PhoneNumberOrUsernameField } from '~/common/phone-number-or-username-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand All@@ -35,11 +36,16 @@ export function SignInStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignIn.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -53,9 +59,7 @@ export function SignInStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -122,6 +126,7 @@ export function SignInStart() {
 ) : null}
 </div>
 ) : null}
 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}
 </Card.Body>
 <Card.Actions>
 <Common.Loading scope='submit'>
Expand Down

12 changes: 9 additions & 3 deletions
packages/ui/src/components/sign-up/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { PasswordField } from '~/common/password-field';
import { PhoneNumberField } from '~/common/phone-number-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand DownExpand Up@@ -40,11 +41,16 @@ export function SignUpStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignUp.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -62,9 +68,7 @@ export function SignUpStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -118,6 +122,8 @@ export function SignUpStart() {
 </div>
 ) : null}

 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}

 {userSettings.signUp.captcha_enabled ? <SignUp.Captcha className='empty:hidden' /> : null}
 </Card.Body>
 {hasConnection || hasIdentifier ? (
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/theme-builder/app/components/logo.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SVGAttributes } from 'react';
import type { SVGAttributes } from 'react';

export const Logo = (props: SVGAttributes<SVGElement>) => (
 <svg
Expand Down

5 changes: 4 additions & 1 deletion
packages/ui/theme-builder/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,10 @@ import { SignedIn, SignedOut, SignInButton, SignUpButton, UserButton } from '@cl

function Button({ children }: { children: React.ReactNode }) {
 return (
 <button className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'>
 <button
 className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'
 type='button'
 >
 {children}
 </button>
 );
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Highlight search terms from Google/DuckDuckGo/Bing referrer\n(function() {\n var ref = document.referrer;\n var terms = [];\n \n if (ref.includes('google.com') || ref.includes('duckduckgo.com') || ref.includes('bing.com')) {\n var url = new URL(ref);\n var q = url.searchParams.get('q') || url.searchParams.get('p');\n if (q) {\n terms = q.split(/\\s+/).filter(function(t) { return t.length > 2; });\n }\n }\n \n if (terms.length === 0) return;\n \n var style = document.createElement('style');\n style.textContent = '.userscript-highlight { background: #fbbf24; color: #1a1a2e; padding: 1px 3px; border-radius: 2px; }';\n document.head.appendChild(style);\n \n function highlight(node) {\n if (node.nodeType === 3) { // text node\n var text = node.textContent;\n var found = false;\n terms.forEach(function(term) {\n var regex = new RegExp('(' + term.replace(/[.*+?^${}()|[\\]\\\\]/g, '\\\\') + ')', 'gi');\n if (regex.test(text)) {\n found = true;\n var frag = document.createDocumentFragment();\n var parts = text.split(regex);\n parts.forEach(function(part, i) {\n if (i % 2 === 0) {\n frag.appendChild(document.createTextNode(part));\n } else {\n var span = document.createElement('span');\n span.className = 'userscript-highlight';\n span.textContent = part;\n frag.appendChild(span);\n }\n });\n node.parentNode.replaceChild(frag, node);\n }\n });\n } else if (node.nodeType === 1 && node.childNodes) { // element\n var skipTags = ['SCRIPT', 'STYLE', 'NOSCRIPT', 'TEXTAREA', 'INPUT', 'SELECT'];\n if (!skipTags.includes(node.tagName)) {\n Array.from(node.childNodes).forEach(highlight);\n }\n }\n }\n \n highlight(document.body);\n \n // Re-highlight on dynamic content\n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1 || node.nodeType === 3) highlight(node);\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Highlight Search Terms");
}
} catch(__e) { console.warn('[Userscript:Highlight Search Terms]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature(ui): Implement socialButtonsPlacement layout logic#3992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcarpenter
merged 6 commits into

from

Aug 21, 2024
 Merged


feature(ui): Implement socialButtonsPlacement layout logic
#3992
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ab246e0

fix lint issues


alexcarpenter Aug 20, 2024
a93ecb0

placement


alexcarpenter Aug 20, 2024
215f6ac

add to signup flow


alexcarpenter Aug 20, 2024
0b29b7d

fix layout


alexcarpenter Aug 20, 2024
8d9051f

add toggle


alexcarpenter Aug 20, 2024
97a91ae

use type from clerk/types


alexcarpenter Aug 20, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


217 changes: 100 additions & 117 deletions
packages/ui/src/components/sign-in/steps/choose-strategy.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import { Connections } from '~/common/connections';
import { GlobalError } from '~/common/global-error';
import { useGetHelp } from '~/components/sign-in/hooks/use-get-help';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
import { useEnabledConnections } from '~/hooks/use-enabled-connections';
Expand All@@ -14,29 +15,16 @@ import { Button } from '~/primitives/button';
import * as Card from '~/primitives/card';
import * as Icon from '~/primitives/icon';
import { LinkButton } from '~/primitives/link';
import { Separator } from '~/primitives/separator';

/* Internal
 ============================================ */

function FirstFactorConnections({
 isGlobalLoading,
 hasConnection,
}: {
 isGlobalLoading: boolean;
 hasConnection: boolean;
}) {
 const { t } = useLocalizations();
function FirstFactorConnections({ isGlobalLoading }: { isGlobalLoading: boolean }) {
 const { signIn } = useSignIn();
 const isFirstFactor = signIn?.status === 'needs_first_factor';

 if (isFirstFactor) {
 return (
 <>
 <Connections disabled={isGlobalLoading} />
 {hasConnection ? <Separator>{t('dividerText')}</Separator> : null}
 </>
 );
 return <Connections disabled={isGlobalLoading} />;
 }
 return null;
}
Expand DownExpand Up@@ -69,118 +57,113 @@ export function SignInChooseStrategy() {
 <GlobalError />

 <Card.Body>
 <div className='flex flex-col gap-6'>
 <FirstFactorConnections
 isGlobalLoading={isGlobalLoading}
 hasConnection={hasConnection}
 />
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='email_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.EnvelopeSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <FirstFactorConnections isGlobalLoading={isGlobalLoading} />
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <Button
intent='secondary'
iconStart={<Icon.SMSSm />}
>
<SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
</SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
name='passkey'
asChild
 <SignIn.SafeIdentifier
transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='email_code'
asChild
 >
 <Button
intent='secondary'
iconStart={<Icon.EnvelopeSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='password'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.SMSSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='passkey'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='backup_code'
 asChild
 <SignIn.SupportedStrategy
 name='password'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>

 <SignIn.Action
navigate='previous'
 <SignIn.SupportedStrategy
name='backup_code'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>

 <SignIn.Action
 navigate='previous'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 </div>
 </Card.Body>
 </Card.Content>
Expand Down

11 changes: 8 additions & 3 deletions
packages/ui/src/components/sign-in/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PhoneNumberField } from '~/common/phone-number-field';
import { PhoneNumberOrUsernameField } from '~/common/phone-number-or-username-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand All@@ -35,11 +36,16 @@ export function SignInStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignIn.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -53,9 +59,7 @@ export function SignInStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -122,6 +126,7 @@ export function SignInStart() {
 ) : null}
 </div>
 ) : null}
 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}
 </Card.Body>
 <Card.Actions>
 <Common.Loading scope='submit'>
Expand Down

12 changes: 9 additions & 3 deletions
packages/ui/src/components/sign-up/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { PasswordField } from '~/common/password-field';
import { PhoneNumberField } from '~/common/phone-number-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand DownExpand Up@@ -40,11 +41,16 @@ export function SignUpStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignUp.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -62,9 +68,7 @@ export function SignUpStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -118,6 +122,8 @@ export function SignUpStart() {
 </div>
 ) : null}

 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}

 {userSettings.signUp.captcha_enabled ? <SignUp.Captcha className='empty:hidden' /> : null}
 </Card.Body>
 {hasConnection || hasIdentifier ? (
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/theme-builder/app/components/logo.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SVGAttributes } from 'react';
import type { SVGAttributes } from 'react';

export const Logo = (props: SVGAttributes<SVGElement>) => (
 <svg
Expand Down

5 changes: 4 additions & 1 deletion
packages/ui/theme-builder/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,10 @@ import { SignedIn, SignedOut, SignInButton, SignUpButton, UserButton } from '@cl

function Button({ children }: { children: React.ReactNode }) {
 return (
 <button className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'>
 <button
 className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'
 type='button'
 >
 {children}
 </button>
 );
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Strip utm_, fbclid, gclid, etc. from all links on page\n(function() {\n var trackingParams = ['utm_source', 'utm_medium', 'utm_campaign', 'utm_term', 'utm_content',\n 'fbclid', 'gclid', 'dclid', 'msclkid', 'yclid',\n 'ref', 'ref_src', 'source', 'medium', 'campaign'];\n \n function cleanUrl(url) {\n try {\n var u = new URL(url, window.location.origin);\n var changed = false;\n trackingParams.forEach(function(p) {\n if (u.searchParams.has(p)) {\n u.searchParams.delete(p);\n changed = true;\n }\n });\n return changed ? u.toString() : url;\n } catch (e) {\n return url;\n }\n }\n \n function cleanLinks() {\n document.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n \n cleanLinks();\n \n var observer = new MutationObserver(function(mutations) {\n mutations.forEach(function(m) {\n m.addedNodes.forEach(function(node) {\n if (node.nodeType === 1) {\n if (node.tagName === 'A') cleanLinks();\n node.querySelectorAll('a[href]').forEach(function(a) {\n var clean = cleanUrl(a.href);\n if (clean !== a.href) a.href = clean;\n });\n }\n });\n });\n });\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "Remove Tracking Parameters from Links");
}
} catch(__e) { console.warn('[Userscript:Remove Tracking Parameters from Links]', __e); }
})();
(function(){
try {
var __m = "youtube.com";
var __re = new RegExp('^' + "youtube\\.com" + '

Skip to content
feature(ui): Implement socialButtonsPlacement layout logic#3992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcarpenter
merged 6 commits into

from

Aug 21, 2024
 Merged


feature(ui): Implement socialButtonsPlacement layout logic
#3992
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ab246e0

fix lint issues


alexcarpenter Aug 20, 2024
a93ecb0

placement


alexcarpenter Aug 20, 2024
215f6ac

add to signup flow


alexcarpenter Aug 20, 2024
0b29b7d

fix layout


alexcarpenter Aug 20, 2024
8d9051f

add toggle


alexcarpenter Aug 20, 2024
97a91ae

use type from clerk/types


alexcarpenter Aug 20, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


217 changes: 100 additions & 117 deletions
packages/ui/src/components/sign-in/steps/choose-strategy.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import { Connections } from '~/common/connections';
import { GlobalError } from '~/common/global-error';
import { useGetHelp } from '~/components/sign-in/hooks/use-get-help';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
import { useEnabledConnections } from '~/hooks/use-enabled-connections';
Expand All@@ -14,29 +15,16 @@ import { Button } from '~/primitives/button';
import * as Card from '~/primitives/card';
import * as Icon from '~/primitives/icon';
import { LinkButton } from '~/primitives/link';
import { Separator } from '~/primitives/separator';

/* Internal
 ============================================ */

function FirstFactorConnections({
 isGlobalLoading,
 hasConnection,
}: {
 isGlobalLoading: boolean;
 hasConnection: boolean;
}) {
 const { t } = useLocalizations();
function FirstFactorConnections({ isGlobalLoading }: { isGlobalLoading: boolean }) {
 const { signIn } = useSignIn();
 const isFirstFactor = signIn?.status === 'needs_first_factor';

 if (isFirstFactor) {
 return (
 <>
 <Connections disabled={isGlobalLoading} />
 {hasConnection ? <Separator>{t('dividerText')}</Separator> : null}
 </>
 );
 return <Connections disabled={isGlobalLoading} />;
 }
 return null;
}
Expand DownExpand Up@@ -69,118 +57,113 @@ export function SignInChooseStrategy() {
 <GlobalError />

 <Card.Body>
 <div className='flex flex-col gap-6'>
 <FirstFactorConnections
 isGlobalLoading={isGlobalLoading}
 hasConnection={hasConnection}
 />
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='email_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.EnvelopeSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <FirstFactorConnections isGlobalLoading={isGlobalLoading} />
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <Button
intent='secondary'
iconStart={<Icon.SMSSm />}
>
<SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
</SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
name='passkey'
asChild
 <SignIn.SafeIdentifier
transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='email_code'
asChild
 >
 <Button
intent='secondary'
iconStart={<Icon.EnvelopeSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='password'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.SMSSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='passkey'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='backup_code'
 asChild
 <SignIn.SupportedStrategy
 name='password'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>

 <SignIn.Action
navigate='previous'
 <SignIn.SupportedStrategy
name='backup_code'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>

 <SignIn.Action
 navigate='previous'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 </div>
 </Card.Body>
 </Card.Content>
Expand Down

11 changes: 8 additions & 3 deletions
packages/ui/src/components/sign-in/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PhoneNumberField } from '~/common/phone-number-field';
import { PhoneNumberOrUsernameField } from '~/common/phone-number-or-username-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand All@@ -35,11 +36,16 @@ export function SignInStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignIn.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -53,9 +59,7 @@ export function SignInStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -122,6 +126,7 @@ export function SignInStart() {
 ) : null}
 </div>
 ) : null}
 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}
 </Card.Body>
 <Card.Actions>
 <Common.Loading scope='submit'>
Expand Down

12 changes: 9 additions & 3 deletions
packages/ui/src/components/sign-up/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { PasswordField } from '~/common/password-field';
import { PhoneNumberField } from '~/common/phone-number-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand DownExpand Up@@ -40,11 +41,16 @@ export function SignUpStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignUp.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -62,9 +68,7 @@ export function SignUpStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -118,6 +122,8 @@ export function SignUpStart() {
 </div>
 ) : null}

 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}

 {userSettings.signUp.captcha_enabled ? <SignUp.Captcha className='empty:hidden' /> : null}
 </Card.Body>
 {hasConnection || hasIdentifier ? (
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/theme-builder/app/components/logo.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SVGAttributes } from 'react';
import type { SVGAttributes } from 'react';

export const Logo = (props: SVGAttributes<SVGElement>) => (
 <svg
Expand Down

5 changes: 4 additions & 1 deletion
packages/ui/theme-builder/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,10 @@ import { SignedIn, SignedOut, SignInButton, SignUpButton, UserButton } from '@cl

function Button({ children }: { children: React.ReactNode }) {
 return (
 <button className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'>
 <button
 className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'
 type='button'
 >
 {children}
 </button>
 );
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Auto-enable theater mode on YouTube\n(function() {\n function tryTheater() {\n var btn = document.querySelector('button[aria-label=\"Theater mode\"], ytd-player #player button[title=\"Theater mode\"]');\n if (btn && !btn.classList.contains('activated')) {\n btn.click();\n }\n }\n \n // Try immediately\n tryTheater();\n \n // Try after navigation (SPA)\n var lastUrl = location.href;\n setInterval(function() {\n if (location.href !== lastUrl) {\n lastUrl = location.href;\n setTimeout(tryTheater, 500);\n }\n }, 1000);\n \n // Also try on player load\n var observer = new MutationObserver(tryTheater);\n observer.observe(document.body, { childList: true, subtree: true });\n})();", "YouTube Theater Mode Default");
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature(ui): Implement socialButtonsPlacement layout logic#3992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcarpenter
merged 6 commits into

from

Aug 21, 2024
 Merged


feature(ui): Implement socialButtonsPlacement layout logic
#3992
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ab246e0

fix lint issues


alexcarpenter Aug 20, 2024
a93ecb0

placement


alexcarpenter Aug 20, 2024
215f6ac

add to signup flow


alexcarpenter Aug 20, 2024
0b29b7d

fix layout


alexcarpenter Aug 20, 2024
8d9051f

add toggle


alexcarpenter Aug 20, 2024
97a91ae

use type from clerk/types


alexcarpenter Aug 20, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


217 changes: 100 additions & 117 deletions
packages/ui/src/components/sign-in/steps/choose-strategy.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import { Connections } from '~/common/connections';
import { GlobalError } from '~/common/global-error';
import { useGetHelp } from '~/components/sign-in/hooks/use-get-help';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
import { useEnabledConnections } from '~/hooks/use-enabled-connections';
Expand All@@ -14,29 +15,16 @@ import { Button } from '~/primitives/button';
import * as Card from '~/primitives/card';
import * as Icon from '~/primitives/icon';
import { LinkButton } from '~/primitives/link';
import { Separator } from '~/primitives/separator';

/* Internal
 ============================================ */

function FirstFactorConnections({
 isGlobalLoading,
 hasConnection,
}: {
 isGlobalLoading: boolean;
 hasConnection: boolean;
}) {
 const { t } = useLocalizations();
function FirstFactorConnections({ isGlobalLoading }: { isGlobalLoading: boolean }) {
 const { signIn } = useSignIn();
 const isFirstFactor = signIn?.status === 'needs_first_factor';

 if (isFirstFactor) {
 return (
 <>
 <Connections disabled={isGlobalLoading} />
 {hasConnection ? <Separator>{t('dividerText')}</Separator> : null}
 </>
 );
 return <Connections disabled={isGlobalLoading} />;
 }
 return null;
}
Expand DownExpand Up@@ -69,118 +57,113 @@ export function SignInChooseStrategy() {
 <GlobalError />

 <Card.Body>
 <div className='flex flex-col gap-6'>
 <FirstFactorConnections
 isGlobalLoading={isGlobalLoading}
 hasConnection={hasConnection}
 />
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='email_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.EnvelopeSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <FirstFactorConnections isGlobalLoading={isGlobalLoading} />
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <Button
intent='secondary'
iconStart={<Icon.SMSSm />}
>
<SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
</SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
name='passkey'
asChild
 <SignIn.SafeIdentifier
transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='email_code'
asChild
 >
 <Button
intent='secondary'
iconStart={<Icon.EnvelopeSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='password'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.SMSSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='passkey'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='backup_code'
 asChild
 <SignIn.SupportedStrategy
 name='password'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>

 <SignIn.Action
navigate='previous'
 <SignIn.SupportedStrategy
name='backup_code'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>

 <SignIn.Action
 navigate='previous'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 </div>
 </Card.Body>
 </Card.Content>
Expand Down

11 changes: 8 additions & 3 deletions
packages/ui/src/components/sign-in/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PhoneNumberField } from '~/common/phone-number-field';
import { PhoneNumberOrUsernameField } from '~/common/phone-number-or-username-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand All@@ -35,11 +36,16 @@ export function SignInStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignIn.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -53,9 +59,7 @@ export function SignInStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -122,6 +126,7 @@ export function SignInStart() {
 ) : null}
 </div>
 ) : null}
 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}
 </Card.Body>
 <Card.Actions>
 <Common.Loading scope='submit'>
Expand Down

12 changes: 9 additions & 3 deletions
packages/ui/src/components/sign-up/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { PasswordField } from '~/common/password-field';
import { PhoneNumberField } from '~/common/phone-number-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand DownExpand Up@@ -40,11 +41,16 @@ export function SignUpStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignUp.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -62,9 +68,7 @@ export function SignUpStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -118,6 +122,8 @@ export function SignUpStart() {
 </div>
 ) : null}

 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}

 {userSettings.signUp.captcha_enabled ? <SignUp.Captcha className='empty:hidden' /> : null}
 </Card.Body>
 {hasConnection || hasIdentifier ? (
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/theme-builder/app/components/logo.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SVGAttributes } from 'react';
import type { SVGAttributes } from 'react';

export const Logo = (props: SVGAttributes<SVGElement>) => (
 <svg
Expand Down

5 changes: 4 additions & 1 deletion
packages/ui/theme-builder/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,10 @@ import { SignedIn, SignedOut, SignInButton, SignUpButton, UserButton } from '@cl

function Button({ children }: { children: React.ReactNode }) {
 return (
 <button className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'>
 <button
 className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'
 type='button'
 >
 {children}
 </button>
 );
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Remove or un-stick sticky/fixed headers that block content\n(function() {\n function unstick() {\n document.querySelectorAll('header, nav, [role=\"banner\"], .header, .navbar, .sticky, .fixed-top, [style*=\"position: fixed\"], [style*=\"position:sticky\"]').forEach(function(el) {\n if (el.style.position === 'fixed' || el.style.position === 'sticky' || \n getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {\n el.style.position = 'static';\n el.style.top = 'auto';\n el.style.zIndex = 'auto';\n }\n });\n }\n \n unstick();\n \n var observer = new MutationObserver(unstick);\n observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });\n})();", "Kill Sticky Headers");
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '

Skip to content
feature(ui): Implement socialButtonsPlacement layout logic#3992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcarpenter
merged 6 commits into

from

Aug 21, 2024
 Merged


feature(ui): Implement socialButtonsPlacement layout logic
#3992
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ab246e0

fix lint issues


alexcarpenter Aug 20, 2024
a93ecb0

placement


alexcarpenter Aug 20, 2024
215f6ac

add to signup flow


alexcarpenter Aug 20, 2024
0b29b7d

fix layout


alexcarpenter Aug 20, 2024
8d9051f

add toggle


alexcarpenter Aug 20, 2024
97a91ae

use type from clerk/types


alexcarpenter Aug 20, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


217 changes: 100 additions & 117 deletions
packages/ui/src/components/sign-in/steps/choose-strategy.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import { Connections } from '~/common/connections';
import { GlobalError } from '~/common/global-error';
import { useGetHelp } from '~/components/sign-in/hooks/use-get-help';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
import { useEnabledConnections } from '~/hooks/use-enabled-connections';
Expand All@@ -14,29 +15,16 @@ import { Button } from '~/primitives/button';
import * as Card from '~/primitives/card';
import * as Icon from '~/primitives/icon';
import { LinkButton } from '~/primitives/link';
import { Separator } from '~/primitives/separator';

/* Internal
 ============================================ */

function FirstFactorConnections({
 isGlobalLoading,
 hasConnection,
}: {
 isGlobalLoading: boolean;
 hasConnection: boolean;
}) {
 const { t } = useLocalizations();
function FirstFactorConnections({ isGlobalLoading }: { isGlobalLoading: boolean }) {
 const { signIn } = useSignIn();
 const isFirstFactor = signIn?.status === 'needs_first_factor';

 if (isFirstFactor) {
 return (
 <>
 <Connections disabled={isGlobalLoading} />
 {hasConnection ? <Separator>{t('dividerText')}</Separator> : null}
 </>
 );
 return <Connections disabled={isGlobalLoading} />;
 }
 return null;
}
Expand DownExpand Up@@ -69,118 +57,113 @@ export function SignInChooseStrategy() {
 <GlobalError />

 <Card.Body>
 <div className='flex flex-col gap-6'>
 <FirstFactorConnections
 isGlobalLoading={isGlobalLoading}
 hasConnection={hasConnection}
 />
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='email_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.EnvelopeSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <FirstFactorConnections isGlobalLoading={isGlobalLoading} />
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <Button
intent='secondary'
iconStart={<Icon.SMSSm />}
>
<SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
</SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
name='passkey'
asChild
 <SignIn.SafeIdentifier
transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='email_code'
asChild
 >
 <Button
intent='secondary'
iconStart={<Icon.EnvelopeSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='password'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.SMSSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='passkey'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='backup_code'
 asChild
 <SignIn.SupportedStrategy
 name='password'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>

 <SignIn.Action
navigate='previous'
 <SignIn.SupportedStrategy
name='backup_code'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>

 <SignIn.Action
 navigate='previous'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 </div>
 </Card.Body>
 </Card.Content>
Expand Down

11 changes: 8 additions & 3 deletions
packages/ui/src/components/sign-in/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PhoneNumberField } from '~/common/phone-number-field';
import { PhoneNumberOrUsernameField } from '~/common/phone-number-or-username-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand All@@ -35,11 +36,16 @@ export function SignInStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignIn.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -53,9 +59,7 @@ export function SignInStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -122,6 +126,7 @@ export function SignInStart() {
 ) : null}
 </div>
 ) : null}
 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}
 </Card.Body>
 <Card.Actions>
 <Common.Loading scope='submit'>
Expand Down

12 changes: 9 additions & 3 deletions
packages/ui/src/components/sign-up/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { PasswordField } from '~/common/password-field';
import { PhoneNumberField } from '~/common/phone-number-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand DownExpand Up@@ -40,11 +41,16 @@ export function SignUpStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignUp.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -62,9 +68,7 @@ export function SignUpStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -118,6 +122,8 @@ export function SignUpStart() {
 </div>
 ) : null}

 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}

 {userSettings.signUp.captcha_enabled ? <SignUp.Captcha className='empty:hidden' /> : null}
 </Card.Body>
 {hasConnection || hasIdentifier ? (
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/theme-builder/app/components/logo.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SVGAttributes } from 'react';
import type { SVGAttributes } from 'react';

export const Logo = (props: SVGAttributes<SVGElement>) => (
 <svg
Expand Down

5 changes: 4 additions & 1 deletion
packages/ui/theme-builder/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,10 @@ import { SignedIn, SignedOut, SignInButton, SignUpButton, UserButton } from '@cl

function Button({ children }: { children: React.ReactNode }) {
 return (
 <button className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'>
 <button
 className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'
 type='button'
 >
 {children}
 </button>
 );
Expand Down
Loading

, 'i');
if (__m === '*' || __re.test(location.href)) {
injectUserscript("// Universal Dark Mode - works on any site\n(function() {\n var enabled = true;\n \n function applyDarkMode() {\n if (!enabled) return;\n \n // Create style element if it doesn't exist\n var style = document.getElementById('universal-dark-mode-style');\n if (!style) {\n style = document.createElement('style');\n style.id = 'universal-dark-mode-style';\n document.head.appendChild(style);\n }\n \n // Dark mode CSS - inverts colors but preserves images/video\n style.textContent = '\n /* Invert everything except media */\n html {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #1a1a2e !important;\n }\n \n /* Restore images, videos, iframes, canvas */\n img, video, iframe, canvas, svg, picture, [style*=\"background-image\"] {\n filter: invert(1) hue-rotate(180deg) !important;\n }\n \n /* Preserve specific elements that should not be inverted */\n .no-dark-mode, .no-dark-mode *,\n [data-theme=\"light\"], [data-theme=\"light\"],\n .ace_editor, .ace_editor *,\n .CodeMirror, .CodeMirror *,\n .monaco-editor, .monaco-editor *,\n .markdown-body pre, .markdown-body pre *,\n .highlight, .highlight *,\n pre code, pre code * {\n filter: none !important;\n }\n \n /* Fix common UI elements */\n .modal, .popup, .dropdown-menu, .tooltip, .popover {\n filter: invert(1) hue-rotate(180deg) !important;\n background: #2d2d44 !important;\n border-color: #444 !important;\n }\n \n /* Scrollbars */\n ::-webkit-scrollbar { background: #1a1a2e !important; }\n ::-webkit-scrollbar-thumb { background: #444 !important; }\n ::-webkit-scrollbar-thumb:hover { background: #555 !important; }\n \n /* Selection */\n ::selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ::-moz-selection { background: #4ecdc4 !important; color: #1a1a2e !important; }\n ';\n }\n \n function removeDarkMode() {\n var style = document.getElementById('universal-dark-mode-style');\n if (style) style.remove();\n }\n \n // Toggle with Alt+Shift+D\n document.addEventListener('keydown', function(e) {\n if (e.altKey && e.shiftKey && e.key === 'D') {\n e.preventDefault();\n enabled = !enabled;\n if (enabled) {\n applyDarkMode();\n console.log('[Universal Dark Mode] Enabled');\n } else {\n removeDarkMode();\n console.log('[Universal Dark Mode] Disabled');\n }\n }\n });\n \n // Apply on load\n applyDarkMode();\n \n // Re-apply on dynamic content\n var observer = new MutationObserver(function(mutations) {\n if (enabled && !document.getElementById('universal-dark-mode-style')) {\n applyDarkMode();\n }\n });\n observer.observe(document.head, { childList: true });\n \n console.log('[Universal Dark Mode] Loaded - Press Alt+Shift+D to toggle');\n})();", "Universal Dark Mode");
}
} catch(__e) { console.warn('[Userscript:Universal Dark Mode]', __e); }
})();
})();

Skip to content
feature(ui): Implement socialButtonsPlacement layout logic#3992

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

 Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and
privacy statement. We’ll occasionally send you account related emails.

Already on GitHub?
Sign in
to your account

 Merged

alexcarpenter
merged 6 commits into

from

Aug 21, 2024
 Merged


feature(ui): Implement socialButtonsPlacement layout logic
#3992
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


6 commits


Select commit
Hold shift + click to select a range
ab246e0

fix lint issues


alexcarpenter Aug 20, 2024
a93ecb0

placement


alexcarpenter Aug 20, 2024
215f6ac

add to signup flow


alexcarpenter Aug 20, 2024
0b29b7d

fix layout


alexcarpenter Aug 20, 2024
8d9051f

add toggle


alexcarpenter Aug 20, 2024
97a91ae

use type from clerk/types


alexcarpenter Aug 20, 2024

File filter

Filter by extension
Filter by extension
Conversations

Failed to load comments. 
Loading
Jump to

Jump to file


Failed to load files. 
Loading
 Diff view

 Diff view


217 changes: 100 additions & 117 deletions
packages/ui/src/components/sign-in/steps/choose-strategy.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -6,6 +6,7 @@ import { Connections } from '~/common/connections';
import { GlobalError } from '~/common/global-error';
import { useGetHelp } from '~/components/sign-in/hooks/use-get-help';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
import { useEnabledConnections } from '~/hooks/use-enabled-connections';
Expand All@@ -14,29 +15,16 @@ import { Button } from '~/primitives/button';
import * as Card from '~/primitives/card';
import * as Icon from '~/primitives/icon';
import { LinkButton } from '~/primitives/link';
import { Separator } from '~/primitives/separator';

/* Internal
 ============================================ */

function FirstFactorConnections({
 isGlobalLoading,
 hasConnection,
}: {
 isGlobalLoading: boolean;
 hasConnection: boolean;
}) {
 const { t } = useLocalizations();
function FirstFactorConnections({ isGlobalLoading }: { isGlobalLoading: boolean }) {
 const { signIn } = useSignIn();
 const isFirstFactor = signIn?.status === 'needs_first_factor';

 if (isFirstFactor) {
 return (
 <>
 <Connections disabled={isGlobalLoading} />
 {hasConnection ? <Separator>{t('dividerText')}</Separator> : null}
 </>
 );
 return <Connections disabled={isGlobalLoading} />;
 }
 return null;
}
Expand DownExpand Up@@ -69,118 +57,113 @@ export function SignInChooseStrategy() {
 <GlobalError />

 <Card.Body>
 <div className='flex flex-col gap-6'>
 <FirstFactorConnections
 isGlobalLoading={isGlobalLoading}
 hasConnection={hasConnection}
 />
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='email_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.EnvelopeSm />}
 >
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 <div className='flex flex-col gap-3'>
 <div className='flex flex-col gap-2'>
 <FirstFactorConnections isGlobalLoading={isGlobalLoading} />
 <SignIn.SupportedStrategy
 name='email_link'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LinkSm />}
 >
 <Button
intent='secondary'
iconStart={<Icon.SMSSm />}
>
<SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
</SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
name='passkey'
asChild
 <SignIn.SafeIdentifier
transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailLink', {
 identifier,
 })
}
/>
</Button>
</SignIn.SupportedStrategy>

<SignIn.SupportedStrategy
name='email_code'
asChild
 >
 <Button
intent='secondary'
iconStart={<Icon.EnvelopeSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='password'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__emailCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='phone_code'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.SMSSm />}
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 <SignIn.SafeIdentifier
 transform={(identifier: string) =>
 t('signIn.alternativeMethods.blockButton__phoneCode', {
 identifier,
 })
 }
 />
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='passkey'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.FingerprintSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>
 {t('signIn.alternativeMethods.blockButton__passkey')}
 </Button>
 </SignIn.SupportedStrategy>

 <SignIn.SupportedStrategy
 name='backup_code'
 asChild
 <SignIn.SupportedStrategy
 name='password'
 asChild
 >
 <Button
 intent='secondary'
 iconStart={<Icon.LockSm />}
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>
 {t('signIn.alternativeMethods.blockButton__password')}
 </Button>
 </SignIn.SupportedStrategy>

 {
 // `SupportedStrategy`s that are only intended for use
 // within `choose-strategy`, not the `forgot-password`
 // `Step
 }
 <SignIn.SupportedStrategy
 name='totp'
 asChild
 >
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__totp')}</Button>
 </SignIn.SupportedStrategy>

 <SignIn.Action
navigate='previous'
 <SignIn.SupportedStrategy
name='backup_code'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 <Button intent='secondary'>{t('signIn.alternativeMethods.blockButton__backupCode')}</Button>
 </SignIn.SupportedStrategy>
 </div>

 <SignIn.Action
 navigate='previous'
 asChild
 >
 <LinkButton>{t('backButton')}</LinkButton>
 </SignIn.Action>
 </div>
 </Card.Body>
 </Card.Content>
Expand Down

11 changes: 8 additions & 3 deletions
packages/ui/src/components/sign-in/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -11,6 +11,7 @@ import { PhoneNumberField } from '~/common/phone-number-field';
import { PhoneNumberOrUsernameField } from '~/common/phone-number-or-username-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand All@@ -35,11 +36,16 @@ export function SignInStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignIn.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -53,9 +59,7 @@ export function SignInStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -122,6 +126,7 @@ export function SignInStart() {
 ) : null}
 </div>
 ) : null}
 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}
 </Card.Body>
 <Card.Actions>
 <Common.Loading scope='submit'>
Expand Down

12 changes: 9 additions & 3 deletions
packages/ui/src/components/sign-up/steps/start.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -12,6 +12,7 @@ import { PasswordField } from '~/common/password-field';
import { PhoneNumberField } from '~/common/phone-number-field';
import { UsernameField } from '~/common/username-field';
import { LOCALIZATION_NEEDED } from '~/constants/localizations';
import { useAppearance } from '~/contexts';
import { useAttributes } from '~/hooks/use-attributes';
import { useCard } from '~/hooks/use-card';
import { useDevModeWarning } from '~/hooks/use-dev-mode-warning';
Expand DownExpand Up@@ -40,11 +41,16 @@ export function SignUpStart() {
 const hasConnection = enabledConnections.length > 0;
 const hasIdentifier = emailAddressEnabled || usernameEnabled || phoneNumberEnabled;
 const isDev = useDevModeWarning();
 const { layout } = useAppearance().parsedAppearance;
 const { logoProps, footerProps } = useCard();

 return (
 <Common.Loading scope='global'>
 {isGlobalLoading => {
 const connectionsWithSeperator = [
 <Connections disabled={isGlobalLoading} />,
 hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null,
 ];
 return (
 <SignUp.Step name='start'>
 <Card.Root banner={isDev ? LOCALIZATION_NEEDED.developmentMode : null}>
Expand All@@ -62,9 +68,7 @@ export function SignUpStart() {
 <GlobalError />

 <Card.Body>
 <Connections disabled={isGlobalLoading} />

 {hasConnection && hasIdentifier ? <Separator>{t('dividerText')}</Separator> : null}
 {layout.socialButtonsPlacement === 'top' ? connectionsWithSeperator : null}

 {hasIdentifier ? (
 <div className='flex flex-col gap-4'>
Expand DownExpand Up@@ -118,6 +122,8 @@ export function SignUpStart() {
 </div>
 ) : null}

 {layout.socialButtonsPlacement === 'bottom' ? connectionsWithSeperator.reverse() : null}

 {userSettings.signUp.captcha_enabled ? <SignUp.Captcha className='empty:hidden' /> : null}
 </Card.Body>
 {hasConnection || hasIdentifier ? (
Expand Down

2 changes: 1 addition & 1 deletion
packages/ui/theme-builder/app/components/logo.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
import { SVGAttributes } from 'react';
import type { SVGAttributes } from 'react';

export const Logo = (props: SVGAttributes<SVGElement>) => (
 <svg
Expand Down

5 changes: 4 additions & 1 deletion
packages/ui/theme-builder/app/page.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -2,7 +2,10 @@ import { SignedIn, SignedOut, SignInButton, SignUpButton, UserButton } from '@cl

function Button({ children }: { children: React.ReactNode }) {
 return (
 <button className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'>
 <button
 className='relative isolate rounded border bg-white bg-gradient-to-b from-white to-neutral-50 px-2.5 py-1 text-sm font-medium'
 type='button'
 >
 {children}
 </button>
 );
Expand Down
Loading