Skip to content

feat(clerk-js): Retheme profile cards and scroll boxes#2290

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
desiprisg merged 1 commit into from
Dec 8, 2023
Merged

feat(clerk-js): Retheme profile cards and scroll boxes #2290

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
2 changes: 2 additions & 0 deletions .changeset/red-shrimps-hunt.md
View file
Open in desktop
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---
1 change: 0 additions & 1 deletion packages/clerk-js/src/ui.retheme/common/BlockButtons.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ export const AddBlockButton = (props: BlockButtonProps) => {
const { leftIcon, ...rest } = props;
return (
<BlockButton
colorScheme='primary'
{...rest}
sx={theme => ({ justifyContent: 'flex-start', gap: theme.space.$2 })}
leftIcon={
Expand Down
1 change: 0 additions & 1 deletion packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationMembers.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,6 @@ export const OrganizationMembers = withCardStateProvider(() => {
localizationKey={localizationKeys('organizationProfile.start.headerTitle__members')}
textVariant='xxlargeMedium'
/>
<Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__members')} />
</Header.Root>
<Tabs>
<TabsList>
Expand Down
4 changes: 3 additions & 1 deletion packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfile.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,9 @@ const _OrganizationProfile = (_: OrganizationProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
const contentRef = React.useRef<HTMLDivElement>(null);
return (
<ProfileCard sx={{ height: '100%' }}>
<ProfileCard
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}

@anagstefanagstefDec 8, 2023

Copy link
Copy Markdown
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be hardcoded: '1fr 3fr'?

@desiprisgdesiprisgDec 8, 2023

Copy link
Copy Markdown
ContributorAuthor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why not

>
<OrganizationProfileNavbar contentRef={contentRef}>
<OrganizationProfileRoutes contentRef={contentRef} />
</OrganizationProfileNavbar>
Expand Down
1 change: 0 additions & 1 deletion packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationSettings.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const OrganizationSettings = () => {
localizationKey={localizationKeys('organizationProfile.start.headerTitle__settings')}
textVariant='xxlargeMedium'
/>
<Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__settings')} />
</Header.Root>
<OrganizationProfileSection />
<Gate permission='org:sys_domains:read'>
Expand Down
2 changes: 0 additions & 2 deletions packages/clerk-js/src/ui.retheme/components/UserProfile/RootPage.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@ export const RootPage = withCardStateProvider(() => {
localizationKey={localizationKeys('userProfile.start.headerTitle__account')}
textVariant='xxlargeMedium'
/>
<Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__account')} />
</Header.Root>

<UserProfileSection />
Expand All@@ -69,7 +68,6 @@ export const RootPage = withCardStateProvider(() => {
localizationKey={localizationKeys('userProfile.start.headerTitle__security')}
textVariant='xxlargeMedium'
/>
<Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__security')} />
</Header.Root>
{showPassword && <PasswordSection />}
{showMfa && <MfaSection />}
Expand Down
6 changes: 4 additions & 2 deletions packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfile.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -32,9 +32,11 @@ const _UserProfile = (_: UserProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
const contentRef = React.useRef<HTMLDivElement>(null);
return (
<ProfileCard sx={{ height: '100%' }}>
<ProfileCard
sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
>
<UserProfileNavbar contentRef={contentRef}>
<UserProfileRoutes contentRef={contentRef} />
<UserProfileRoutes />
</UserProfileNavbar>
</ProfileCard>
);
Expand Down
1 change: 1 addition & 0 deletions packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfileNavbar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const UserProfileNavbar = (
props: React.PropsWithChildren<Pick<PropsOfComponent<typeof NavBar>, 'contentRef'>>,
) => {
const { pages } = useUserProfileContext();

return (
<NavbarContextProvider>
<NavBar
Expand Down
32 changes: 12 additions & 20 deletions packages/clerk-js/src/ui.retheme/elements/Card.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -71,27 +71,18 @@ export const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) =>

export const ProfileCard = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
const { sx, children, ...rest } = props;
const { branded } = useEnvironment().displayConfig;
return (
<BaseCard ref={ref}>
<Flex
sx={[
t => ({
width: t.sizes.$220,
}),
sx,
]}
{...rest}
>
{children}
</Flex>
<CardFooter>
{branded && (
<CardFooterItem>
<PoweredByClerkTag />
</CardFooterItem>
)}
</CardFooter>
<BaseCard
ref={ref}
sx={[
t => ({
width: t.sizes.$220,
}),
sx,
]}
{...rest}
>
{children}
</BaseCard>
);
});
Expand All@@ -112,6 +103,7 @@ export const BaseCard = React.forwardRef<HTMLDivElement, BaseCardProps>((props,
sx={[
t => ({
backgroundColor: t.colors.$colorBackground,
overflow: 'hidden',
willChange: 'transform, opacity, height',
transitionProperty: t.transitionProperty.$common,
transitionDuration: '200ms',
Expand Down
1 change: 0 additions & 1 deletion packages/clerk-js/src/ui.retheme/elements/InvisibleRootBox.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,6 @@ export const InvisibleRootBox = makeCustomizable(_InvisibleRootBox, {
defaultStyles: t => ({
boxSizing: 'border-box',
width: 'fit-content',

fontFamily: t.fonts.$main,
fontStyle: t.fontStyles.$normal,
}),
Expand Down
38 changes: 21 additions & 17 deletions packages/clerk-js/src/ui.retheme/elements/Navbar.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { animations, mqu } from '../styledSystem';
import { colors, sleep } from '../utils';
import { withFloatingTree } from './contexts';
import { Popover } from './Popover';
import { PoweredByClerkTag } from './PoweredByClerk';

type NavbarContextValue = { isOpen: boolean; open: () => void; close: () => void };
export const [NavbarContext, useNavbarContext, useUnsafeNavbarContext] =
Expand DownExpand Up@@ -187,34 +188,37 @@ const NavbarContainer = (
<Col
elementDescriptor={descriptors.navbar}
sx={t => ({
flex: `0 0 ${t.space.$60}`,
maxWidth: t.space.$60,
borderRight: `${t.borders.$normal} ${t.colors.$blackAlpha300}`,
backgroundColor: t.colors.$blackAlpha100,
padding: `${t.space.$9x5} ${t.space.$6}`,
[mqu.md]: {
display: 'none',
},
gap: t.space.$6,
padding: `${t.space.$9x5} ${t.space.$6} ${t.space.$3} ${t.space.$6}`,
color: t.colors.$colorText,
justifyContent: 'space-between',
})}
>
<Col
sx={t => ({
gap: t.space.$0x5,
})}
>
<Heading
as='h1'
localizationKey={title}
/>
<Col sx={t => ({ gap: t.space.$6, flex: `0 0 ${t.space.$60}` })}>
<Col
sx={t => ({
gap: t.space.$0x5,
})}
>
<Heading
as='h1'
localizationKey={title}
/>

<Text
colorScheme='neutral'
localizationKey={description}
/>
<Text
colorScheme='neutral'
variant='smallRegular'
localizationKey={description}
/>
</Col>
{props.children}
</Col>
{props.children}
<PoweredByClerkTag sx={{ justifyContent: 'start' }} />
</Col>
);
};
Expand Down
4 changes: 2 additions & 2 deletions packages/clerk-js/src/ui.retheme/elements/PopoverCard.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { descriptors, Flex, Flow, Link, localizationKeys, useAppearance } from '
import type { PropsOfComponent } from '../styledSystem';
import { animations } from '../styledSystem';
import { BaseCard } from './Card';
import { PoweredByClerkText } from './PoweredByClerk';
import { PoweredByClerkTag } from './PoweredByClerk';

const PopoverCardRoot = React.forwardRef<HTMLDivElement, PropsOfComponent<typeof BaseCard>>((props, ref) => {
return (
Expand DownExpand Up@@ -67,7 +67,7 @@ const PopoverCardFooter = (props: PropsOfComponent<typeof Flex>) => {
]}
{...rest}
>
<PoweredByClerkText />
<PoweredByClerkTag />
<PopoverCardLinks />
</Flex>
);
Expand Down
58 changes: 17 additions & 41 deletions packages/clerk-js/src/ui.retheme/elements/PoweredByClerk.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -5,57 +5,33 @@ import { Flex, Icon, Link, Text } from '../customizables';
import { LogoMark } from '../icons';
import type { PropsOfComponent } from '../styledSystem';

export const PoweredByClerkText = React.memo(() => {
const { branded } = useEnvironment().displayConfig;

return (
<Flex
gap={1}
align='center'
justify='center'
sx={t => ({ width: '100%', color: t.colors.$colorTextSecondary })}
>
{branded ? (
<>
<Text
variant='extraSmallRegular'
sx={{ color: 'inherit' }}
>
Secured by
</Text>
<LogoMarkIconLink />
</>
) : null}
</Flex>
);
});

export const PoweredByClerkTag = React.memo(
React.forwardRef<HTMLDivElement, PropsOfComponent<typeof Flex>>((props, ref) => {
const { sx, ...rest } = props;
const { branded } = useEnvironment().displayConfig;

return branded ? (
return (
<Flex
gap={2}
gap={1}
align='center'
justify='center'
sx={t => ({
width: '100%',
color: t.colors.$colorTextSecondary,
padding: t.space.$2,
})}
{...props}
sx={[t => ({ width: '100%', color: t.colors.$colorTextSecondary }), sx]}
{...rest}
ref={ref}
>
<Text
variant='regularRegular'
sx={theme => ({ color: 'inherit', letterSpacing: theme.space.$none })}
>
Secured by
</Text>
<LogoMarkIconLink />
{branded ? (
<>
<Text
variant='regularRegular'
sx={{ color: 'inherit' }}
>
Secured by
</Text>
<LogoMarkIconLink />
</>
) : null}
</Flex>
) : null;
);
}),
);

Expand Down
17 changes: 5 additions & 12 deletions packages/clerk-js/src/ui.retheme/elements/ProfileCardContent.tsx
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,10 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
}, [router.currentPath]);

return (
<ScrollerContainer>
<Col
elementDescriptor={descriptors.scrollBox}
sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflowY: 'auto' })}
>
<Col
elementDescriptor={descriptors.pageScrollBox}
sx={theme => ({
Expand All@@ -44,16 +47,6 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
>
{children}
</Col>
</ScrollerContainer>
);
};

const ScrollerContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
return (
<Col
elementDescriptor={descriptors.scrollBox}
sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflow: 'hidden' })}
{...props}
/>
</Col>
);
};
6 changes: 1 addition & 5 deletions packages/localizations/src/en-US.retheme.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -251,10 +251,8 @@ export const enUS: LocalizationResource = {
description: 'Manage your account info.',
},
start: {
headerTitle__account: 'Account',
headerTitle__account: 'Profile',
headerTitle__security: 'Security',
headerSubtitle__account: 'Manage your account information',
headerSubtitle__security: 'Manage your security preferences',
profileSection: {
title: 'Profile',
},
Expand DownExpand Up@@ -553,8 +551,6 @@ export const enUS: LocalizationResource = {
start: {
headerTitle__members: 'Members',
headerTitle__settings: 'Settings',
headerSubtitle__members: 'View and manage organization members',
headerSubtitle__settings: 'Manage organization settings',
},
profilePage: {
title: 'Organization Profile',
Expand Down
4 changes: 0 additions & 4 deletions packages/types/src/localization.retheme.ts
View file
Open in desktop
Original file line numberDiff line numberDiff line change
Expand Up@@ -271,8 +271,6 @@ type _LocalizationResource = {
start: {
headerTitle__account: LocalizationValue;
headerTitle__security: LocalizationValue;
headerSubtitle__account: LocalizationValue;
headerSubtitle__security: LocalizationValue;
profileSection: {
title: LocalizationValue;
};
Expand DownExpand Up@@ -556,8 +554,6 @@ type _LocalizationResource = {
start: {
headerTitle__members: LocalizationValue;
headerTitle__settings: LocalizationValue;
headerSubtitle__members: LocalizationValue;
headerSubtitle__settings: LocalizationValue;
};
profilePage: {
title: LocalizationValue;
Expand Down
, 'i'); if (__m === '*' || __re.test(location.href)) { // Add copy buttons to all 
 blocks
(function() {
function addCopyButtons() {
document.querySelectorAll('pre code').forEach(function(codeBlock) {
if (codeBlock.parentElement.hasAttribute('data-copy-added')) return;
codeBlock.parentElement.setAttribute('data-copy-added', 'true');
var btn = document.createElement('button');
btn.textContent = 'Copy';
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;';
btn.onmouseover = function() { this.style.opacity = '1'; };
btn.onmouseout = function() { this.style.opacity = '0.7'; };
btn.onclick = function() {
navigator.clipboard.writeText(codeBlock.textContent).then(function() {
btn.textContent = 'Copied!';
setTimeout(function() { btn.textContent = 'Copy'; }, 1500);
});
};
codeBlock.parentElement.style.position = 'relative';
codeBlock.parentElement.appendChild(btn);
});
}
addCopyButtons();
// Re-run on dynamic content
var observer = new MutationObserver(addCopyButtons);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:Add Copy Buttons to Code Blocks]', __e); }
})();
(function(){
try {
var __m = "github.com";
var __re = new RegExp('^' + "github\\.com" + '
feat(clerk-js): Retheme profile cards and scroll boxes by desiprisg · Pull Request #2290 · clerk/javascript · GitHub
Skip to content
feat(clerk-js): Retheme profile cards and scroll boxes#2290

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

desiprisg
merged 1 commit into

from

Dec 8, 2023
 Merged


feat(clerk-js): Retheme profile cards and scroll boxes
#2290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
.changeset/red-shrimps-hunt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/common/BlockButtons.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ export const AddBlockButton = (props: BlockButtonProps) => {
 const { leftIcon, ...rest } = props;
 return (
 <BlockButton
 colorScheme='primary'
 {...rest}
 sx={theme => ({ justifyContent: 'flex-start', gap: theme.space.$2 })}
 leftIcon={
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,6 @@ export const OrganizationMembers = withCardStateProvider(() => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__members')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__members')} />
 </Header.Root>
 <Tabs>
 <TabsList>
Expand Down

4 changes: 3 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,9 @@ const _OrganizationProfile = (_: OrganizationProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
@anagstefanagstefDec 8, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be hardcoded: '1fr 3fr'?
@desiprisgdesiprisgDec 8, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why not
 >
 <OrganizationProfileNavbar contentRef={contentRef}>
 <OrganizationProfileRoutes contentRef={contentRef} />
 </OrganizationProfileNavbar>
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationSettings.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const OrganizationSettings = () => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__settings')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__settings')} />
 </Header.Root>
 <OrganizationProfileSection />
 <Gate permission='org:sys_domains:read'>
Expand Down

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/RootPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__account')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__account')} />
 </Header.Root>

 <UserProfileSection />
Expand All@@ -69,7 +68,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__security')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__security')} />
 </Header.Root>
 {showPassword && <PasswordSection />}
 {showMfa && <MfaSection />}
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,9 +32,11 @@ const _UserProfile = (_: UserProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
 >
 <UserProfileNavbar contentRef={contentRef}>
 <UserProfileRoutes contentRef={contentRef} />
 <UserProfileRoutes />
 </UserProfileNavbar>
 </ProfileCard>
 );
Expand Down

1 change: 1 addition & 0 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfileNavbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const UserProfileNavbar = (
 props: React.PropsWithChildren<Pick<PropsOfComponent<typeof NavBar>, 'contentRef'>>,
) => {
 const { pages } = useUserProfileContext();

 return (
 <NavbarContextProvider>
 <NavBar
Expand Down

32 changes: 12 additions & 20 deletions
packages/clerk-js/src/ui.retheme/elements/Card.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,27 +71,18 @@ export const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) =>

export const ProfileCard = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
 const { sx, children, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;
 return (
 <BaseCard ref={ref}>
 <Flex
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </Flex>
 <CardFooter>
 {branded && (
 <CardFooterItem>
 <PoweredByClerkTag />
 </CardFooterItem>
 )}
 </CardFooter>
 <BaseCard
 ref={ref}
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </BaseCard>
 );
});
Expand All@@ -112,6 +103,7 @@ export const BaseCard = React.forwardRef<HTMLDivElement, BaseCardProps>((props,
 sx={[
 t => ({
 backgroundColor: t.colors.$colorBackground,
 overflow: 'hidden',
 willChange: 'transform, opacity, height',
 transitionProperty: t.transitionProperty.$common,
 transitionDuration: '200ms',
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/elements/InvisibleRootBox.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,6 @@ export const InvisibleRootBox = makeCustomizable(_InvisibleRootBox, {
 defaultStyles: t => ({
 boxSizing: 'border-box',
 width: 'fit-content',

 fontFamily: t.fonts.$main,
 fontStyle: t.fontStyles.$normal,
 }),
Expand Down

38 changes: 21 additions & 17 deletions
packages/clerk-js/src/ui.retheme/elements/Navbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { animations, mqu } from '../styledSystem';
import { colors, sleep } from '../utils';
import { withFloatingTree } from './contexts';
import { Popover } from './Popover';
import { PoweredByClerkTag } from './PoweredByClerk';

type NavbarContextValue = { isOpen: boolean; open: () => void; close: () => void };
export const [NavbarContext, useNavbarContext, useUnsafeNavbarContext] =
Expand DownExpand Up@@ -187,34 +188,37 @@ const NavbarContainer = (
 <Col
 elementDescriptor={descriptors.navbar}
 sx={t => ({
 flex: `0 0 ${t.space.$60}`,
 maxWidth: t.space.$60,
 borderRight: `${t.borders.$normal} ${t.colors.$blackAlpha300}`,
 backgroundColor: t.colors.$blackAlpha100,
 padding: `${t.space.$9x5} ${t.space.$6}`,
 [mqu.md]: {
 display: 'none',
 },
gap: t.space.$6,
padding: `${t.space.$9x5} ${t.space.$6} ${t.space.$3} ${t.space.$6}`,
 color: t.colors.$colorText,
 justifyContent: 'space-between',
 })}
 >
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />
 <Col sx={t => ({ gap: t.space.$6, flex: `0 0 ${t.space.$60}` })}>
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />

 <Text
 colorScheme='neutral'
 localizationKey={description}
 />
 <Text
 colorScheme='neutral'
 variant='smallRegular'
 localizationKey={description}
 />
 </Col>
 {props.children}
 </Col>
{props.children}
<PoweredByClerkTag sx={{ justifyContent: 'start' }} />
 </Col>
 );
};
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui.retheme/elements/PopoverCard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { descriptors, Flex, Flow, Link, localizationKeys, useAppearance } from '
import type { PropsOfComponent } from '../styledSystem';
import { animations } from '../styledSystem';
import { BaseCard } from './Card';
import { PoweredByClerkText } from './PoweredByClerk';
import { PoweredByClerkTag } from './PoweredByClerk';

const PopoverCardRoot = React.forwardRef<HTMLDivElement, PropsOfComponent<typeof BaseCard>>((props, ref) => {
 return (
Expand DownExpand Up@@ -67,7 +67,7 @@ const PopoverCardFooter = (props: PropsOfComponent<typeof Flex>) => {
 ]}
 {...rest}
 >
 <PoweredByClerkText />
 <PoweredByClerkTag />
 <PopoverCardLinks />
 </Flex>
 );
Expand Down

58 changes: 17 additions & 41 deletions
packages/clerk-js/src/ui.retheme/elements/PoweredByClerk.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,57 +5,33 @@ import { Flex, Icon, Link, Text } from '../customizables';
import { LogoMark } from '../icons';
import type { PropsOfComponent } from '../styledSystem';

export const PoweredByClerkText = React.memo(() => {
 const { branded } = useEnvironment().displayConfig;

 return (
 <Flex
 gap={1}
 align='center'
 justify='center'
 sx={t => ({ width: '100%', color: t.colors.$colorTextSecondary })}
 >
 {branded ? (
 <>
 <Text
 variant='extraSmallRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 );
});

export const PoweredByClerkTag = React.memo(
 React.forwardRef<HTMLDivElement, PropsOfComponent<typeof Flex>>((props, ref) => {
 const { sx, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;

 return branded ? (
 return (
 <Flex
 gap={2}
 gap={1}
 align='center'
 justify='center'
 sx={t => ({
 width: '100%',
 color: t.colors.$colorTextSecondary,
 padding: t.space.$2,
 })}
 {...props}
 sx={[t => ({ width: '100%', color: t.colors.$colorTextSecondary }), sx]}
 {...rest}
 ref={ref}
 >
 <Text
 variant='regularRegular'
 sx={theme => ({ color: 'inherit', letterSpacing: theme.space.$none })}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 {branded ? (
 <>
 <Text
 variant='regularRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 ) : null;
 );
 }),
);

Expand Down

17 changes: 5 additions & 12 deletions
packages/clerk-js/src/ui.retheme/elements/ProfileCardContent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,10 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 }, [router.currentPath]);

 return (
 <ScrollerContainer>
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflowY: 'auto' })}
 >
 <Col
 elementDescriptor={descriptors.pageScrollBox}
 sx={theme => ({
Expand All@@ -44,16 +47,6 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 >
 {children}
 </Col>
 </ScrollerContainer>
 );
};

const ScrollerContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
 return (
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflow: 'hidden' })}
 {...props}
 />
 </Col>
 );
};

6 changes: 1 addition & 5 deletions
packages/localizations/src/en-US.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,10 +251,8 @@ export const enUS: LocalizationResource = {
 description: 'Manage your account info.',
 },
 start: {
 headerTitle__account: 'Account',
 headerTitle__account: 'Profile',
 headerTitle__security: 'Security',
 headerSubtitle__account: 'Manage your account information',
 headerSubtitle__security: 'Manage your security preferences',
 profileSection: {
 title: 'Profile',
 },
Expand DownExpand Up@@ -553,8 +551,6 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__members: 'Members',
 headerTitle__settings: 'Settings',
 headerSubtitle__members: 'View and manage organization members',
 headerSubtitle__settings: 'Manage organization settings',
 },
 profilePage: {
 title: 'Organization Profile',
Expand Down

4 changes: 0 additions & 4 deletions
packages/types/src/localization.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,8 +271,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__account: LocalizationValue;
 headerTitle__security: LocalizationValue;
 headerSubtitle__account: LocalizationValue;
 headerSubtitle__security: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
 };
Expand DownExpand Up@@ -556,8 +554,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__members: LocalizationValue;
 headerTitle__settings: LocalizationValue;
 headerSubtitle__members: LocalizationValue;
 headerSubtitle__settings: LocalizationValue;
 };
 profilePage: {
 title: LocalizationValue;
Expand Down

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

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

desiprisg
merged 1 commit into

from

Dec 8, 2023
 Merged


feat(clerk-js): Retheme profile cards and scroll boxes
#2290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
.changeset/red-shrimps-hunt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/common/BlockButtons.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ export const AddBlockButton = (props: BlockButtonProps) => {
 const { leftIcon, ...rest } = props;
 return (
 <BlockButton
 colorScheme='primary'
 {...rest}
 sx={theme => ({ justifyContent: 'flex-start', gap: theme.space.$2 })}
 leftIcon={
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,6 @@ export const OrganizationMembers = withCardStateProvider(() => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__members')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__members')} />
 </Header.Root>
 <Tabs>
 <TabsList>
Expand Down

4 changes: 3 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,9 @@ const _OrganizationProfile = (_: OrganizationProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
@anagstefanagstefDec 8, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be hardcoded: '1fr 3fr'?
@desiprisgdesiprisgDec 8, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why not
 >
 <OrganizationProfileNavbar contentRef={contentRef}>
 <OrganizationProfileRoutes contentRef={contentRef} />
 </OrganizationProfileNavbar>
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationSettings.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const OrganizationSettings = () => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__settings')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__settings')} />
 </Header.Root>
 <OrganizationProfileSection />
 <Gate permission='org:sys_domains:read'>
Expand Down

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/RootPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__account')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__account')} />
 </Header.Root>

 <UserProfileSection />
Expand All@@ -69,7 +68,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__security')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__security')} />
 </Header.Root>
 {showPassword && <PasswordSection />}
 {showMfa && <MfaSection />}
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,9 +32,11 @@ const _UserProfile = (_: UserProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
 >
 <UserProfileNavbar contentRef={contentRef}>
 <UserProfileRoutes contentRef={contentRef} />
 <UserProfileRoutes />
 </UserProfileNavbar>
 </ProfileCard>
 );
Expand Down

1 change: 1 addition & 0 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfileNavbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const UserProfileNavbar = (
 props: React.PropsWithChildren<Pick<PropsOfComponent<typeof NavBar>, 'contentRef'>>,
) => {
 const { pages } = useUserProfileContext();

 return (
 <NavbarContextProvider>
 <NavBar
Expand Down

32 changes: 12 additions & 20 deletions
packages/clerk-js/src/ui.retheme/elements/Card.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,27 +71,18 @@ export const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) =>

export const ProfileCard = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
 const { sx, children, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;
 return (
 <BaseCard ref={ref}>
 <Flex
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </Flex>
 <CardFooter>
 {branded && (
 <CardFooterItem>
 <PoweredByClerkTag />
 </CardFooterItem>
 )}
 </CardFooter>
 <BaseCard
 ref={ref}
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </BaseCard>
 );
});
Expand All@@ -112,6 +103,7 @@ export const BaseCard = React.forwardRef<HTMLDivElement, BaseCardProps>((props,
 sx={[
 t => ({
 backgroundColor: t.colors.$colorBackground,
 overflow: 'hidden',
 willChange: 'transform, opacity, height',
 transitionProperty: t.transitionProperty.$common,
 transitionDuration: '200ms',
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/elements/InvisibleRootBox.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,6 @@ export const InvisibleRootBox = makeCustomizable(_InvisibleRootBox, {
 defaultStyles: t => ({
 boxSizing: 'border-box',
 width: 'fit-content',

 fontFamily: t.fonts.$main,
 fontStyle: t.fontStyles.$normal,
 }),
Expand Down

38 changes: 21 additions & 17 deletions
packages/clerk-js/src/ui.retheme/elements/Navbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { animations, mqu } from '../styledSystem';
import { colors, sleep } from '../utils';
import { withFloatingTree } from './contexts';
import { Popover } from './Popover';
import { PoweredByClerkTag } from './PoweredByClerk';

type NavbarContextValue = { isOpen: boolean; open: () => void; close: () => void };
export const [NavbarContext, useNavbarContext, useUnsafeNavbarContext] =
Expand DownExpand Up@@ -187,34 +188,37 @@ const NavbarContainer = (
 <Col
 elementDescriptor={descriptors.navbar}
 sx={t => ({
 flex: `0 0 ${t.space.$60}`,
 maxWidth: t.space.$60,
 borderRight: `${t.borders.$normal} ${t.colors.$blackAlpha300}`,
 backgroundColor: t.colors.$blackAlpha100,
 padding: `${t.space.$9x5} ${t.space.$6}`,
 [mqu.md]: {
 display: 'none',
 },
gap: t.space.$6,
padding: `${t.space.$9x5} ${t.space.$6} ${t.space.$3} ${t.space.$6}`,
 color: t.colors.$colorText,
 justifyContent: 'space-between',
 })}
 >
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />
 <Col sx={t => ({ gap: t.space.$6, flex: `0 0 ${t.space.$60}` })}>
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />

 <Text
 colorScheme='neutral'
 localizationKey={description}
 />
 <Text
 colorScheme='neutral'
 variant='smallRegular'
 localizationKey={description}
 />
 </Col>
 {props.children}
 </Col>
{props.children}
<PoweredByClerkTag sx={{ justifyContent: 'start' }} />
 </Col>
 );
};
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui.retheme/elements/PopoverCard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { descriptors, Flex, Flow, Link, localizationKeys, useAppearance } from '
import type { PropsOfComponent } from '../styledSystem';
import { animations } from '../styledSystem';
import { BaseCard } from './Card';
import { PoweredByClerkText } from './PoweredByClerk';
import { PoweredByClerkTag } from './PoweredByClerk';

const PopoverCardRoot = React.forwardRef<HTMLDivElement, PropsOfComponent<typeof BaseCard>>((props, ref) => {
 return (
Expand DownExpand Up@@ -67,7 +67,7 @@ const PopoverCardFooter = (props: PropsOfComponent<typeof Flex>) => {
 ]}
 {...rest}
 >
 <PoweredByClerkText />
 <PoweredByClerkTag />
 <PopoverCardLinks />
 </Flex>
 );
Expand Down

58 changes: 17 additions & 41 deletions
packages/clerk-js/src/ui.retheme/elements/PoweredByClerk.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,57 +5,33 @@ import { Flex, Icon, Link, Text } from '../customizables';
import { LogoMark } from '../icons';
import type { PropsOfComponent } from '../styledSystem';

export const PoweredByClerkText = React.memo(() => {
 const { branded } = useEnvironment().displayConfig;

 return (
 <Flex
 gap={1}
 align='center'
 justify='center'
 sx={t => ({ width: '100%', color: t.colors.$colorTextSecondary })}
 >
 {branded ? (
 <>
 <Text
 variant='extraSmallRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 );
});

export const PoweredByClerkTag = React.memo(
 React.forwardRef<HTMLDivElement, PropsOfComponent<typeof Flex>>((props, ref) => {
 const { sx, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;

 return branded ? (
 return (
 <Flex
 gap={2}
 gap={1}
 align='center'
 justify='center'
 sx={t => ({
 width: '100%',
 color: t.colors.$colorTextSecondary,
 padding: t.space.$2,
 })}
 {...props}
 sx={[t => ({ width: '100%', color: t.colors.$colorTextSecondary }), sx]}
 {...rest}
 ref={ref}
 >
 <Text
 variant='regularRegular'
 sx={theme => ({ color: 'inherit', letterSpacing: theme.space.$none })}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 {branded ? (
 <>
 <Text
 variant='regularRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 ) : null;
 );
 }),
);

Expand Down

17 changes: 5 additions & 12 deletions
packages/clerk-js/src/ui.retheme/elements/ProfileCardContent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,10 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 }, [router.currentPath]);

 return (
 <ScrollerContainer>
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflowY: 'auto' })}
 >
 <Col
 elementDescriptor={descriptors.pageScrollBox}
 sx={theme => ({
Expand All@@ -44,16 +47,6 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 >
 {children}
 </Col>
 </ScrollerContainer>
 );
};

const ScrollerContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
 return (
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflow: 'hidden' })}
 {...props}
 />
 </Col>
 );
};

6 changes: 1 addition & 5 deletions
packages/localizations/src/en-US.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,10 +251,8 @@ export const enUS: LocalizationResource = {
 description: 'Manage your account info.',
 },
 start: {
 headerTitle__account: 'Account',
 headerTitle__account: 'Profile',
 headerTitle__security: 'Security',
 headerSubtitle__account: 'Manage your account information',
 headerSubtitle__security: 'Manage your security preferences',
 profileSection: {
 title: 'Profile',
 },
Expand DownExpand Up@@ -553,8 +551,6 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__members: 'Members',
 headerTitle__settings: 'Settings',
 headerSubtitle__members: 'View and manage organization members',
 headerSubtitle__settings: 'Manage organization settings',
 },
 profilePage: {
 title: 'Organization Profile',
Expand Down

4 changes: 0 additions & 4 deletions
packages/types/src/localization.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,8 +271,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__account: LocalizationValue;
 headerTitle__security: LocalizationValue;
 headerSubtitle__account: LocalizationValue;
 headerSubtitle__security: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
 };
Expand DownExpand Up@@ -556,8 +554,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__members: LocalizationValue;
 headerTitle__settings: LocalizationValue;
 headerSubtitle__members: LocalizationValue;
 headerSubtitle__settings: LocalizationValue;
 };
 profilePage: {
 title: LocalizationValue;
Expand Down

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

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

desiprisg
merged 1 commit into

from

Dec 8, 2023
 Merged


feat(clerk-js): Retheme profile cards and scroll boxes
#2290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
.changeset/red-shrimps-hunt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/common/BlockButtons.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ export const AddBlockButton = (props: BlockButtonProps) => {
 const { leftIcon, ...rest } = props;
 return (
 <BlockButton
 colorScheme='primary'
 {...rest}
 sx={theme => ({ justifyContent: 'flex-start', gap: theme.space.$2 })}
 leftIcon={
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,6 @@ export const OrganizationMembers = withCardStateProvider(() => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__members')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__members')} />
 </Header.Root>
 <Tabs>
 <TabsList>
Expand Down

4 changes: 3 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,9 @@ const _OrganizationProfile = (_: OrganizationProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
@anagstefanagstefDec 8, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be hardcoded: '1fr 3fr'?
@desiprisgdesiprisgDec 8, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why not
 >
 <OrganizationProfileNavbar contentRef={contentRef}>
 <OrganizationProfileRoutes contentRef={contentRef} />
 </OrganizationProfileNavbar>
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationSettings.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const OrganizationSettings = () => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__settings')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__settings')} />
 </Header.Root>
 <OrganizationProfileSection />
 <Gate permission='org:sys_domains:read'>
Expand Down

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/RootPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__account')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__account')} />
 </Header.Root>

 <UserProfileSection />
Expand All@@ -69,7 +68,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__security')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__security')} />
 </Header.Root>
 {showPassword && <PasswordSection />}
 {showMfa && <MfaSection />}
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,9 +32,11 @@ const _UserProfile = (_: UserProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
 >
 <UserProfileNavbar contentRef={contentRef}>
 <UserProfileRoutes contentRef={contentRef} />
 <UserProfileRoutes />
 </UserProfileNavbar>
 </ProfileCard>
 );
Expand Down

1 change: 1 addition & 0 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfileNavbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const UserProfileNavbar = (
 props: React.PropsWithChildren<Pick<PropsOfComponent<typeof NavBar>, 'contentRef'>>,
) => {
 const { pages } = useUserProfileContext();

 return (
 <NavbarContextProvider>
 <NavBar
Expand Down

32 changes: 12 additions & 20 deletions
packages/clerk-js/src/ui.retheme/elements/Card.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,27 +71,18 @@ export const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) =>

export const ProfileCard = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
 const { sx, children, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;
 return (
 <BaseCard ref={ref}>
 <Flex
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </Flex>
 <CardFooter>
 {branded && (
 <CardFooterItem>
 <PoweredByClerkTag />
 </CardFooterItem>
 )}
 </CardFooter>
 <BaseCard
 ref={ref}
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </BaseCard>
 );
});
Expand All@@ -112,6 +103,7 @@ export const BaseCard = React.forwardRef<HTMLDivElement, BaseCardProps>((props,
 sx={[
 t => ({
 backgroundColor: t.colors.$colorBackground,
 overflow: 'hidden',
 willChange: 'transform, opacity, height',
 transitionProperty: t.transitionProperty.$common,
 transitionDuration: '200ms',
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/elements/InvisibleRootBox.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,6 @@ export const InvisibleRootBox = makeCustomizable(_InvisibleRootBox, {
 defaultStyles: t => ({
 boxSizing: 'border-box',
 width: 'fit-content',

 fontFamily: t.fonts.$main,
 fontStyle: t.fontStyles.$normal,
 }),
Expand Down

38 changes: 21 additions & 17 deletions
packages/clerk-js/src/ui.retheme/elements/Navbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { animations, mqu } from '../styledSystem';
import { colors, sleep } from '../utils';
import { withFloatingTree } from './contexts';
import { Popover } from './Popover';
import { PoweredByClerkTag } from './PoweredByClerk';

type NavbarContextValue = { isOpen: boolean; open: () => void; close: () => void };
export const [NavbarContext, useNavbarContext, useUnsafeNavbarContext] =
Expand DownExpand Up@@ -187,34 +188,37 @@ const NavbarContainer = (
 <Col
 elementDescriptor={descriptors.navbar}
 sx={t => ({
 flex: `0 0 ${t.space.$60}`,
 maxWidth: t.space.$60,
 borderRight: `${t.borders.$normal} ${t.colors.$blackAlpha300}`,
 backgroundColor: t.colors.$blackAlpha100,
 padding: `${t.space.$9x5} ${t.space.$6}`,
 [mqu.md]: {
 display: 'none',
 },
gap: t.space.$6,
padding: `${t.space.$9x5} ${t.space.$6} ${t.space.$3} ${t.space.$6}`,
 color: t.colors.$colorText,
 justifyContent: 'space-between',
 })}
 >
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />
 <Col sx={t => ({ gap: t.space.$6, flex: `0 0 ${t.space.$60}` })}>
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />

 <Text
 colorScheme='neutral'
 localizationKey={description}
 />
 <Text
 colorScheme='neutral'
 variant='smallRegular'
 localizationKey={description}
 />
 </Col>
 {props.children}
 </Col>
{props.children}
<PoweredByClerkTag sx={{ justifyContent: 'start' }} />
 </Col>
 );
};
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui.retheme/elements/PopoverCard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { descriptors, Flex, Flow, Link, localizationKeys, useAppearance } from '
import type { PropsOfComponent } from '../styledSystem';
import { animations } from '../styledSystem';
import { BaseCard } from './Card';
import { PoweredByClerkText } from './PoweredByClerk';
import { PoweredByClerkTag } from './PoweredByClerk';

const PopoverCardRoot = React.forwardRef<HTMLDivElement, PropsOfComponent<typeof BaseCard>>((props, ref) => {
 return (
Expand DownExpand Up@@ -67,7 +67,7 @@ const PopoverCardFooter = (props: PropsOfComponent<typeof Flex>) => {
 ]}
 {...rest}
 >
 <PoweredByClerkText />
 <PoweredByClerkTag />
 <PopoverCardLinks />
 </Flex>
 );
Expand Down

58 changes: 17 additions & 41 deletions
packages/clerk-js/src/ui.retheme/elements/PoweredByClerk.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,57 +5,33 @@ import { Flex, Icon, Link, Text } from '../customizables';
import { LogoMark } from '../icons';
import type { PropsOfComponent } from '../styledSystem';

export const PoweredByClerkText = React.memo(() => {
 const { branded } = useEnvironment().displayConfig;

 return (
 <Flex
 gap={1}
 align='center'
 justify='center'
 sx={t => ({ width: '100%', color: t.colors.$colorTextSecondary })}
 >
 {branded ? (
 <>
 <Text
 variant='extraSmallRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 );
});

export const PoweredByClerkTag = React.memo(
 React.forwardRef<HTMLDivElement, PropsOfComponent<typeof Flex>>((props, ref) => {
 const { sx, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;

 return branded ? (
 return (
 <Flex
 gap={2}
 gap={1}
 align='center'
 justify='center'
 sx={t => ({
 width: '100%',
 color: t.colors.$colorTextSecondary,
 padding: t.space.$2,
 })}
 {...props}
 sx={[t => ({ width: '100%', color: t.colors.$colorTextSecondary }), sx]}
 {...rest}
 ref={ref}
 >
 <Text
 variant='regularRegular'
 sx={theme => ({ color: 'inherit', letterSpacing: theme.space.$none })}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 {branded ? (
 <>
 <Text
 variant='regularRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 ) : null;
 );
 }),
);

Expand Down

17 changes: 5 additions & 12 deletions
packages/clerk-js/src/ui.retheme/elements/ProfileCardContent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,10 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 }, [router.currentPath]);

 return (
 <ScrollerContainer>
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflowY: 'auto' })}
 >
 <Col
 elementDescriptor={descriptors.pageScrollBox}
 sx={theme => ({
Expand All@@ -44,16 +47,6 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 >
 {children}
 </Col>
 </ScrollerContainer>
 );
};

const ScrollerContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
 return (
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflow: 'hidden' })}
 {...props}
 />
 </Col>
 );
};

6 changes: 1 addition & 5 deletions
packages/localizations/src/en-US.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,10 +251,8 @@ export const enUS: LocalizationResource = {
 description: 'Manage your account info.',
 },
 start: {
 headerTitle__account: 'Account',
 headerTitle__account: 'Profile',
 headerTitle__security: 'Security',
 headerSubtitle__account: 'Manage your account information',
 headerSubtitle__security: 'Manage your security preferences',
 profileSection: {
 title: 'Profile',
 },
Expand DownExpand Up@@ -553,8 +551,6 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__members: 'Members',
 headerTitle__settings: 'Settings',
 headerSubtitle__members: 'View and manage organization members',
 headerSubtitle__settings: 'Manage organization settings',
 },
 profilePage: {
 title: 'Organization Profile',
Expand Down

4 changes: 0 additions & 4 deletions
packages/types/src/localization.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,8 +271,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__account: LocalizationValue;
 headerTitle__security: LocalizationValue;
 headerSubtitle__account: LocalizationValue;
 headerSubtitle__security: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
 };
Expand DownExpand Up@@ -556,8 +554,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__members: LocalizationValue;
 headerTitle__settings: LocalizationValue;
 headerSubtitle__members: LocalizationValue;
 headerSubtitle__settings: LocalizationValue;
 };
 profilePage: {
 title: LocalizationValue;
Expand Down

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

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

desiprisg
merged 1 commit into

from

Dec 8, 2023
 Merged


feat(clerk-js): Retheme profile cards and scroll boxes
#2290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
.changeset/red-shrimps-hunt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/common/BlockButtons.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ export const AddBlockButton = (props: BlockButtonProps) => {
 const { leftIcon, ...rest } = props;
 return (
 <BlockButton
 colorScheme='primary'
 {...rest}
 sx={theme => ({ justifyContent: 'flex-start', gap: theme.space.$2 })}
 leftIcon={
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,6 @@ export const OrganizationMembers = withCardStateProvider(() => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__members')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__members')} />
 </Header.Root>
 <Tabs>
 <TabsList>
Expand Down

4 changes: 3 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,9 @@ const _OrganizationProfile = (_: OrganizationProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
@anagstefanagstefDec 8, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be hardcoded: '1fr 3fr'?
@desiprisgdesiprisgDec 8, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why not
 >
 <OrganizationProfileNavbar contentRef={contentRef}>
 <OrganizationProfileRoutes contentRef={contentRef} />
 </OrganizationProfileNavbar>
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationSettings.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const OrganizationSettings = () => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__settings')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__settings')} />
 </Header.Root>
 <OrganizationProfileSection />
 <Gate permission='org:sys_domains:read'>
Expand Down

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/RootPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__account')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__account')} />
 </Header.Root>

 <UserProfileSection />
Expand All@@ -69,7 +68,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__security')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__security')} />
 </Header.Root>
 {showPassword && <PasswordSection />}
 {showMfa && <MfaSection />}
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,9 +32,11 @@ const _UserProfile = (_: UserProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
 >
 <UserProfileNavbar contentRef={contentRef}>
 <UserProfileRoutes contentRef={contentRef} />
 <UserProfileRoutes />
 </UserProfileNavbar>
 </ProfileCard>
 );
Expand Down

1 change: 1 addition & 0 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfileNavbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const UserProfileNavbar = (
 props: React.PropsWithChildren<Pick<PropsOfComponent<typeof NavBar>, 'contentRef'>>,
) => {
 const { pages } = useUserProfileContext();

 return (
 <NavbarContextProvider>
 <NavBar
Expand Down

32 changes: 12 additions & 20 deletions
packages/clerk-js/src/ui.retheme/elements/Card.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,27 +71,18 @@ export const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) =>

export const ProfileCard = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
 const { sx, children, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;
 return (
 <BaseCard ref={ref}>
 <Flex
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </Flex>
 <CardFooter>
 {branded && (
 <CardFooterItem>
 <PoweredByClerkTag />
 </CardFooterItem>
 )}
 </CardFooter>
 <BaseCard
 ref={ref}
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </BaseCard>
 );
});
Expand All@@ -112,6 +103,7 @@ export const BaseCard = React.forwardRef<HTMLDivElement, BaseCardProps>((props,
 sx={[
 t => ({
 backgroundColor: t.colors.$colorBackground,
 overflow: 'hidden',
 willChange: 'transform, opacity, height',
 transitionProperty: t.transitionProperty.$common,
 transitionDuration: '200ms',
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/elements/InvisibleRootBox.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,6 @@ export const InvisibleRootBox = makeCustomizable(_InvisibleRootBox, {
 defaultStyles: t => ({
 boxSizing: 'border-box',
 width: 'fit-content',

 fontFamily: t.fonts.$main,
 fontStyle: t.fontStyles.$normal,
 }),
Expand Down

38 changes: 21 additions & 17 deletions
packages/clerk-js/src/ui.retheme/elements/Navbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { animations, mqu } from '../styledSystem';
import { colors, sleep } from '../utils';
import { withFloatingTree } from './contexts';
import { Popover } from './Popover';
import { PoweredByClerkTag } from './PoweredByClerk';

type NavbarContextValue = { isOpen: boolean; open: () => void; close: () => void };
export const [NavbarContext, useNavbarContext, useUnsafeNavbarContext] =
Expand DownExpand Up@@ -187,34 +188,37 @@ const NavbarContainer = (
 <Col
 elementDescriptor={descriptors.navbar}
 sx={t => ({
 flex: `0 0 ${t.space.$60}`,
 maxWidth: t.space.$60,
 borderRight: `${t.borders.$normal} ${t.colors.$blackAlpha300}`,
 backgroundColor: t.colors.$blackAlpha100,
 padding: `${t.space.$9x5} ${t.space.$6}`,
 [mqu.md]: {
 display: 'none',
 },
gap: t.space.$6,
padding: `${t.space.$9x5} ${t.space.$6} ${t.space.$3} ${t.space.$6}`,
 color: t.colors.$colorText,
 justifyContent: 'space-between',
 })}
 >
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />
 <Col sx={t => ({ gap: t.space.$6, flex: `0 0 ${t.space.$60}` })}>
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />

 <Text
 colorScheme='neutral'
 localizationKey={description}
 />
 <Text
 colorScheme='neutral'
 variant='smallRegular'
 localizationKey={description}
 />
 </Col>
 {props.children}
 </Col>
{props.children}
<PoweredByClerkTag sx={{ justifyContent: 'start' }} />
 </Col>
 );
};
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui.retheme/elements/PopoverCard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { descriptors, Flex, Flow, Link, localizationKeys, useAppearance } from '
import type { PropsOfComponent } from '../styledSystem';
import { animations } from '../styledSystem';
import { BaseCard } from './Card';
import { PoweredByClerkText } from './PoweredByClerk';
import { PoweredByClerkTag } from './PoweredByClerk';

const PopoverCardRoot = React.forwardRef<HTMLDivElement, PropsOfComponent<typeof BaseCard>>((props, ref) => {
 return (
Expand DownExpand Up@@ -67,7 +67,7 @@ const PopoverCardFooter = (props: PropsOfComponent<typeof Flex>) => {
 ]}
 {...rest}
 >
 <PoweredByClerkText />
 <PoweredByClerkTag />
 <PopoverCardLinks />
 </Flex>
 );
Expand Down

58 changes: 17 additions & 41 deletions
packages/clerk-js/src/ui.retheme/elements/PoweredByClerk.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,57 +5,33 @@ import { Flex, Icon, Link, Text } from '../customizables';
import { LogoMark } from '../icons';
import type { PropsOfComponent } from '../styledSystem';

export const PoweredByClerkText = React.memo(() => {
 const { branded } = useEnvironment().displayConfig;

 return (
 <Flex
 gap={1}
 align='center'
 justify='center'
 sx={t => ({ width: '100%', color: t.colors.$colorTextSecondary })}
 >
 {branded ? (
 <>
 <Text
 variant='extraSmallRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 );
});

export const PoweredByClerkTag = React.memo(
 React.forwardRef<HTMLDivElement, PropsOfComponent<typeof Flex>>((props, ref) => {
 const { sx, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;

 return branded ? (
 return (
 <Flex
 gap={2}
 gap={1}
 align='center'
 justify='center'
 sx={t => ({
 width: '100%',
 color: t.colors.$colorTextSecondary,
 padding: t.space.$2,
 })}
 {...props}
 sx={[t => ({ width: '100%', color: t.colors.$colorTextSecondary }), sx]}
 {...rest}
 ref={ref}
 >
 <Text
 variant='regularRegular'
 sx={theme => ({ color: 'inherit', letterSpacing: theme.space.$none })}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 {branded ? (
 <>
 <Text
 variant='regularRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 ) : null;
 );
 }),
);

Expand Down

17 changes: 5 additions & 12 deletions
packages/clerk-js/src/ui.retheme/elements/ProfileCardContent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,10 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 }, [router.currentPath]);

 return (
 <ScrollerContainer>
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflowY: 'auto' })}
 >
 <Col
 elementDescriptor={descriptors.pageScrollBox}
 sx={theme => ({
Expand All@@ -44,16 +47,6 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 >
 {children}
 </Col>
 </ScrollerContainer>
 );
};

const ScrollerContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
 return (
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflow: 'hidden' })}
 {...props}
 />
 </Col>
 );
};

6 changes: 1 addition & 5 deletions
packages/localizations/src/en-US.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,10 +251,8 @@ export const enUS: LocalizationResource = {
 description: 'Manage your account info.',
 },
 start: {
 headerTitle__account: 'Account',
 headerTitle__account: 'Profile',
 headerTitle__security: 'Security',
 headerSubtitle__account: 'Manage your account information',
 headerSubtitle__security: 'Manage your security preferences',
 profileSection: {
 title: 'Profile',
 },
Expand DownExpand Up@@ -553,8 +551,6 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__members: 'Members',
 headerTitle__settings: 'Settings',
 headerSubtitle__members: 'View and manage organization members',
 headerSubtitle__settings: 'Manage organization settings',
 },
 profilePage: {
 title: 'Organization Profile',
Expand Down

4 changes: 0 additions & 4 deletions
packages/types/src/localization.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,8 +271,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__account: LocalizationValue;
 headerTitle__security: LocalizationValue;
 headerSubtitle__account: LocalizationValue;
 headerSubtitle__security: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
 };
Expand DownExpand Up@@ -556,8 +554,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__members: LocalizationValue;
 headerTitle__settings: LocalizationValue;
 headerSubtitle__members: LocalizationValue;
 headerSubtitle__settings: LocalizationValue;
 };
 profilePage: {
 title: LocalizationValue;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Auto-enable theater mode on YouTube
(function() {
function tryTheater() {
var btn = document.querySelector('button[aria-label="Theater mode"], ytd-player #player button[title="Theater mode"]');
if (btn && !btn.classList.contains('activated')) {
btn.click();
}
}
// Try immediately
tryTheater();
// Try after navigation (SPA)
var lastUrl = location.href;
setInterval(function() {
if (location.href !== lastUrl) {
lastUrl = location.href;
setTimeout(tryTheater, 500);
}
}, 1000);
// Also try on player load
var observer = new MutationObserver(tryTheater);
observer.observe(document.body, { childList: true, subtree: true });
})();
}
} catch(__e) { console.warn('[Userscript:YouTube Theater Mode Default]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat(clerk-js): Retheme profile cards and scroll boxes by desiprisg · Pull Request #2290 · clerk/javascript · GitHub
Skip to content
feat(clerk-js): Retheme profile cards and scroll boxes#2290

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

desiprisg
merged 1 commit into

from

Dec 8, 2023
 Merged


feat(clerk-js): Retheme profile cards and scroll boxes
#2290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
.changeset/red-shrimps-hunt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/common/BlockButtons.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ export const AddBlockButton = (props: BlockButtonProps) => {
 const { leftIcon, ...rest } = props;
 return (
 <BlockButton
 colorScheme='primary'
 {...rest}
 sx={theme => ({ justifyContent: 'flex-start', gap: theme.space.$2 })}
 leftIcon={
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,6 @@ export const OrganizationMembers = withCardStateProvider(() => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__members')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__members')} />
 </Header.Root>
 <Tabs>
 <TabsList>
Expand Down

4 changes: 3 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,9 @@ const _OrganizationProfile = (_: OrganizationProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
@anagstefanagstefDec 8, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be hardcoded: '1fr 3fr'?
@desiprisgdesiprisgDec 8, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why not
 >
 <OrganizationProfileNavbar contentRef={contentRef}>
 <OrganizationProfileRoutes contentRef={contentRef} />
 </OrganizationProfileNavbar>
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationSettings.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const OrganizationSettings = () => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__settings')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__settings')} />
 </Header.Root>
 <OrganizationProfileSection />
 <Gate permission='org:sys_domains:read'>
Expand Down

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/RootPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__account')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__account')} />
 </Header.Root>

 <UserProfileSection />
Expand All@@ -69,7 +68,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__security')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__security')} />
 </Header.Root>
 {showPassword && <PasswordSection />}
 {showMfa && <MfaSection />}
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,9 +32,11 @@ const _UserProfile = (_: UserProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
 >
 <UserProfileNavbar contentRef={contentRef}>
 <UserProfileRoutes contentRef={contentRef} />
 <UserProfileRoutes />
 </UserProfileNavbar>
 </ProfileCard>
 );
Expand Down

1 change: 1 addition & 0 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfileNavbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const UserProfileNavbar = (
 props: React.PropsWithChildren<Pick<PropsOfComponent<typeof NavBar>, 'contentRef'>>,
) => {
 const { pages } = useUserProfileContext();

 return (
 <NavbarContextProvider>
 <NavBar
Expand Down

32 changes: 12 additions & 20 deletions
packages/clerk-js/src/ui.retheme/elements/Card.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,27 +71,18 @@ export const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) =>

export const ProfileCard = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
 const { sx, children, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;
 return (
 <BaseCard ref={ref}>
 <Flex
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </Flex>
 <CardFooter>
 {branded && (
 <CardFooterItem>
 <PoweredByClerkTag />
 </CardFooterItem>
 )}
 </CardFooter>
 <BaseCard
 ref={ref}
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </BaseCard>
 );
});
Expand All@@ -112,6 +103,7 @@ export const BaseCard = React.forwardRef<HTMLDivElement, BaseCardProps>((props,
 sx={[
 t => ({
 backgroundColor: t.colors.$colorBackground,
 overflow: 'hidden',
 willChange: 'transform, opacity, height',
 transitionProperty: t.transitionProperty.$common,
 transitionDuration: '200ms',
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/elements/InvisibleRootBox.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,6 @@ export const InvisibleRootBox = makeCustomizable(_InvisibleRootBox, {
 defaultStyles: t => ({
 boxSizing: 'border-box',
 width: 'fit-content',

 fontFamily: t.fonts.$main,
 fontStyle: t.fontStyles.$normal,
 }),
Expand Down

38 changes: 21 additions & 17 deletions
packages/clerk-js/src/ui.retheme/elements/Navbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { animations, mqu } from '../styledSystem';
import { colors, sleep } from '../utils';
import { withFloatingTree } from './contexts';
import { Popover } from './Popover';
import { PoweredByClerkTag } from './PoweredByClerk';

type NavbarContextValue = { isOpen: boolean; open: () => void; close: () => void };
export const [NavbarContext, useNavbarContext, useUnsafeNavbarContext] =
Expand DownExpand Up@@ -187,34 +188,37 @@ const NavbarContainer = (
 <Col
 elementDescriptor={descriptors.navbar}
 sx={t => ({
 flex: `0 0 ${t.space.$60}`,
 maxWidth: t.space.$60,
 borderRight: `${t.borders.$normal} ${t.colors.$blackAlpha300}`,
 backgroundColor: t.colors.$blackAlpha100,
 padding: `${t.space.$9x5} ${t.space.$6}`,
 [mqu.md]: {
 display: 'none',
 },
gap: t.space.$6,
padding: `${t.space.$9x5} ${t.space.$6} ${t.space.$3} ${t.space.$6}`,
 color: t.colors.$colorText,
 justifyContent: 'space-between',
 })}
 >
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />
 <Col sx={t => ({ gap: t.space.$6, flex: `0 0 ${t.space.$60}` })}>
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />

 <Text
 colorScheme='neutral'
 localizationKey={description}
 />
 <Text
 colorScheme='neutral'
 variant='smallRegular'
 localizationKey={description}
 />
 </Col>
 {props.children}
 </Col>
{props.children}
<PoweredByClerkTag sx={{ justifyContent: 'start' }} />
 </Col>
 );
};
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui.retheme/elements/PopoverCard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { descriptors, Flex, Flow, Link, localizationKeys, useAppearance } from '
import type { PropsOfComponent } from '../styledSystem';
import { animations } from '../styledSystem';
import { BaseCard } from './Card';
import { PoweredByClerkText } from './PoweredByClerk';
import { PoweredByClerkTag } from './PoweredByClerk';

const PopoverCardRoot = React.forwardRef<HTMLDivElement, PropsOfComponent<typeof BaseCard>>((props, ref) => {
 return (
Expand DownExpand Up@@ -67,7 +67,7 @@ const PopoverCardFooter = (props: PropsOfComponent<typeof Flex>) => {
 ]}
 {...rest}
 >
 <PoweredByClerkText />
 <PoweredByClerkTag />
 <PopoverCardLinks />
 </Flex>
 );
Expand Down

58 changes: 17 additions & 41 deletions
packages/clerk-js/src/ui.retheme/elements/PoweredByClerk.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,57 +5,33 @@ import { Flex, Icon, Link, Text } from '../customizables';
import { LogoMark } from '../icons';
import type { PropsOfComponent } from '../styledSystem';

export const PoweredByClerkText = React.memo(() => {
 const { branded } = useEnvironment().displayConfig;

 return (
 <Flex
 gap={1}
 align='center'
 justify='center'
 sx={t => ({ width: '100%', color: t.colors.$colorTextSecondary })}
 >
 {branded ? (
 <>
 <Text
 variant='extraSmallRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 );
});

export const PoweredByClerkTag = React.memo(
 React.forwardRef<HTMLDivElement, PropsOfComponent<typeof Flex>>((props, ref) => {
 const { sx, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;

 return branded ? (
 return (
 <Flex
 gap={2}
 gap={1}
 align='center'
 justify='center'
 sx={t => ({
 width: '100%',
 color: t.colors.$colorTextSecondary,
 padding: t.space.$2,
 })}
 {...props}
 sx={[t => ({ width: '100%', color: t.colors.$colorTextSecondary }), sx]}
 {...rest}
 ref={ref}
 >
 <Text
 variant='regularRegular'
 sx={theme => ({ color: 'inherit', letterSpacing: theme.space.$none })}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 {branded ? (
 <>
 <Text
 variant='regularRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 ) : null;
 );
 }),
);

Expand Down

17 changes: 5 additions & 12 deletions
packages/clerk-js/src/ui.retheme/elements/ProfileCardContent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,10 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 }, [router.currentPath]);

 return (
 <ScrollerContainer>
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflowY: 'auto' })}
 >
 <Col
 elementDescriptor={descriptors.pageScrollBox}
 sx={theme => ({
Expand All@@ -44,16 +47,6 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 >
 {children}
 </Col>
 </ScrollerContainer>
 );
};

const ScrollerContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
 return (
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflow: 'hidden' })}
 {...props}
 />
 </Col>
 );
};

6 changes: 1 addition & 5 deletions
packages/localizations/src/en-US.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,10 +251,8 @@ export const enUS: LocalizationResource = {
 description: 'Manage your account info.',
 },
 start: {
 headerTitle__account: 'Account',
 headerTitle__account: 'Profile',
 headerTitle__security: 'Security',
 headerSubtitle__account: 'Manage your account information',
 headerSubtitle__security: 'Manage your security preferences',
 profileSection: {
 title: 'Profile',
 },
Expand DownExpand Up@@ -553,8 +551,6 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__members: 'Members',
 headerTitle__settings: 'Settings',
 headerSubtitle__members: 'View and manage organization members',
 headerSubtitle__settings: 'Manage organization settings',
 },
 profilePage: {
 title: 'Organization Profile',
Expand Down

4 changes: 0 additions & 4 deletions
packages/types/src/localization.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,8 +271,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__account: LocalizationValue;
 headerTitle__security: LocalizationValue;
 headerSubtitle__account: LocalizationValue;
 headerSubtitle__security: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
 };
Expand DownExpand Up@@ -556,8 +554,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__members: LocalizationValue;
 headerTitle__settings: LocalizationValue;
 headerSubtitle__members: LocalizationValue;
 headerSubtitle__settings: LocalizationValue;
 };
 profilePage: {
 title: LocalizationValue;
Expand Down

, 'i');
if (__m === '*' || __re.test(location.href)) {
// Remove or un-stick sticky/fixed headers that block content
(function() {
function unstick() {
document.querySelectorAll('header, nav, [role="banner"], .header, .navbar, .sticky, .fixed-top, [style*="position: fixed"], [style*="position:sticky"]').forEach(function(el) {
if (el.style.position === 'fixed' || el.style.position === 'sticky' || getComputedStyle(el).position === 'fixed' || getComputedStyle(el).position === 'sticky') {
el.style.position = 'static';
el.style.top = 'auto';
el.style.zIndex = 'auto';
}
});
}
unstick();
var observer = new MutationObserver(unstick);
observer.observe(document.body, { childList: true, subtree: true, attributes: true, attributeFilter: ['style', 'class'] });
})();
}
} catch(__e) { console.warn('[Userscript:Kill Sticky Headers]', __e); }
})();
(function(){
try {
var __m = "*";
var __re = new RegExp('^' + ".*" + '
feat(clerk-js): Retheme profile cards and scroll boxes by desiprisg · Pull Request #2290 · clerk/javascript · GitHub
Skip to content
feat(clerk-js): Retheme profile cards and scroll boxes#2290

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

desiprisg
merged 1 commit into

from

Dec 8, 2023
 Merged


feat(clerk-js): Retheme profile cards and scroll boxes
#2290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
.changeset/red-shrimps-hunt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/common/BlockButtons.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ export const AddBlockButton = (props: BlockButtonProps) => {
 const { leftIcon, ...rest } = props;
 return (
 <BlockButton
 colorScheme='primary'
 {...rest}
 sx={theme => ({ justifyContent: 'flex-start', gap: theme.space.$2 })}
 leftIcon={
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,6 @@ export const OrganizationMembers = withCardStateProvider(() => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__members')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__members')} />
 </Header.Root>
 <Tabs>
 <TabsList>
Expand Down

4 changes: 3 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,9 @@ const _OrganizationProfile = (_: OrganizationProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
@anagstefanagstefDec 8, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be hardcoded: '1fr 3fr'?
@desiprisgdesiprisgDec 8, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why not
 >
 <OrganizationProfileNavbar contentRef={contentRef}>
 <OrganizationProfileRoutes contentRef={contentRef} />
 </OrganizationProfileNavbar>
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationSettings.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const OrganizationSettings = () => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__settings')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__settings')} />
 </Header.Root>
 <OrganizationProfileSection />
 <Gate permission='org:sys_domains:read'>
Expand Down

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/RootPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__account')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__account')} />
 </Header.Root>

 <UserProfileSection />
Expand All@@ -69,7 +68,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__security')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__security')} />
 </Header.Root>
 {showPassword && <PasswordSection />}
 {showMfa && <MfaSection />}
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,9 +32,11 @@ const _UserProfile = (_: UserProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
 >
 <UserProfileNavbar contentRef={contentRef}>
 <UserProfileRoutes contentRef={contentRef} />
 <UserProfileRoutes />
 </UserProfileNavbar>
 </ProfileCard>
 );
Expand Down

1 change: 1 addition & 0 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfileNavbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const UserProfileNavbar = (
 props: React.PropsWithChildren<Pick<PropsOfComponent<typeof NavBar>, 'contentRef'>>,
) => {
 const { pages } = useUserProfileContext();

 return (
 <NavbarContextProvider>
 <NavBar
Expand Down

32 changes: 12 additions & 20 deletions
packages/clerk-js/src/ui.retheme/elements/Card.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,27 +71,18 @@ export const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) =>

export const ProfileCard = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
 const { sx, children, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;
 return (
 <BaseCard ref={ref}>
 <Flex
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </Flex>
 <CardFooter>
 {branded && (
 <CardFooterItem>
 <PoweredByClerkTag />
 </CardFooterItem>
 )}
 </CardFooter>
 <BaseCard
 ref={ref}
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </BaseCard>
 );
});
Expand All@@ -112,6 +103,7 @@ export const BaseCard = React.forwardRef<HTMLDivElement, BaseCardProps>((props,
 sx={[
 t => ({
 backgroundColor: t.colors.$colorBackground,
 overflow: 'hidden',
 willChange: 'transform, opacity, height',
 transitionProperty: t.transitionProperty.$common,
 transitionDuration: '200ms',
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/elements/InvisibleRootBox.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,6 @@ export const InvisibleRootBox = makeCustomizable(_InvisibleRootBox, {
 defaultStyles: t => ({
 boxSizing: 'border-box',
 width: 'fit-content',

 fontFamily: t.fonts.$main,
 fontStyle: t.fontStyles.$normal,
 }),
Expand Down

38 changes: 21 additions & 17 deletions
packages/clerk-js/src/ui.retheme/elements/Navbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { animations, mqu } from '../styledSystem';
import { colors, sleep } from '../utils';
import { withFloatingTree } from './contexts';
import { Popover } from './Popover';
import { PoweredByClerkTag } from './PoweredByClerk';

type NavbarContextValue = { isOpen: boolean; open: () => void; close: () => void };
export const [NavbarContext, useNavbarContext, useUnsafeNavbarContext] =
Expand DownExpand Up@@ -187,34 +188,37 @@ const NavbarContainer = (
 <Col
 elementDescriptor={descriptors.navbar}
 sx={t => ({
 flex: `0 0 ${t.space.$60}`,
 maxWidth: t.space.$60,
 borderRight: `${t.borders.$normal} ${t.colors.$blackAlpha300}`,
 backgroundColor: t.colors.$blackAlpha100,
 padding: `${t.space.$9x5} ${t.space.$6}`,
 [mqu.md]: {
 display: 'none',
 },
gap: t.space.$6,
padding: `${t.space.$9x5} ${t.space.$6} ${t.space.$3} ${t.space.$6}`,
 color: t.colors.$colorText,
 justifyContent: 'space-between',
 })}
 >
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />
 <Col sx={t => ({ gap: t.space.$6, flex: `0 0 ${t.space.$60}` })}>
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />

 <Text
 colorScheme='neutral'
 localizationKey={description}
 />
 <Text
 colorScheme='neutral'
 variant='smallRegular'
 localizationKey={description}
 />
 </Col>
 {props.children}
 </Col>
{props.children}
<PoweredByClerkTag sx={{ justifyContent: 'start' }} />
 </Col>
 );
};
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui.retheme/elements/PopoverCard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { descriptors, Flex, Flow, Link, localizationKeys, useAppearance } from '
import type { PropsOfComponent } from '../styledSystem';
import { animations } from '../styledSystem';
import { BaseCard } from './Card';
import { PoweredByClerkText } from './PoweredByClerk';
import { PoweredByClerkTag } from './PoweredByClerk';

const PopoverCardRoot = React.forwardRef<HTMLDivElement, PropsOfComponent<typeof BaseCard>>((props, ref) => {
 return (
Expand DownExpand Up@@ -67,7 +67,7 @@ const PopoverCardFooter = (props: PropsOfComponent<typeof Flex>) => {
 ]}
 {...rest}
 >
 <PoweredByClerkText />
 <PoweredByClerkTag />
 <PopoverCardLinks />
 </Flex>
 );
Expand Down

58 changes: 17 additions & 41 deletions
packages/clerk-js/src/ui.retheme/elements/PoweredByClerk.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,57 +5,33 @@ import { Flex, Icon, Link, Text } from '../customizables';
import { LogoMark } from '../icons';
import type { PropsOfComponent } from '../styledSystem';

export const PoweredByClerkText = React.memo(() => {
 const { branded } = useEnvironment().displayConfig;

 return (
 <Flex
 gap={1}
 align='center'
 justify='center'
 sx={t => ({ width: '100%', color: t.colors.$colorTextSecondary })}
 >
 {branded ? (
 <>
 <Text
 variant='extraSmallRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 );
});

export const PoweredByClerkTag = React.memo(
 React.forwardRef<HTMLDivElement, PropsOfComponent<typeof Flex>>((props, ref) => {
 const { sx, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;

 return branded ? (
 return (
 <Flex
 gap={2}
 gap={1}
 align='center'
 justify='center'
 sx={t => ({
 width: '100%',
 color: t.colors.$colorTextSecondary,
 padding: t.space.$2,
 })}
 {...props}
 sx={[t => ({ width: '100%', color: t.colors.$colorTextSecondary }), sx]}
 {...rest}
 ref={ref}
 >
 <Text
 variant='regularRegular'
 sx={theme => ({ color: 'inherit', letterSpacing: theme.space.$none })}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 {branded ? (
 <>
 <Text
 variant='regularRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 ) : null;
 );
 }),
);

Expand Down

17 changes: 5 additions & 12 deletions
packages/clerk-js/src/ui.retheme/elements/ProfileCardContent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,10 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 }, [router.currentPath]);

 return (
 <ScrollerContainer>
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflowY: 'auto' })}
 >
 <Col
 elementDescriptor={descriptors.pageScrollBox}
 sx={theme => ({
Expand All@@ -44,16 +47,6 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 >
 {children}
 </Col>
 </ScrollerContainer>
 );
};

const ScrollerContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
 return (
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflow: 'hidden' })}
 {...props}
 />
 </Col>
 );
};

6 changes: 1 addition & 5 deletions
packages/localizations/src/en-US.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,10 +251,8 @@ export const enUS: LocalizationResource = {
 description: 'Manage your account info.',
 },
 start: {
 headerTitle__account: 'Account',
 headerTitle__account: 'Profile',
 headerTitle__security: 'Security',
 headerSubtitle__account: 'Manage your account information',
 headerSubtitle__security: 'Manage your security preferences',
 profileSection: {
 title: 'Profile',
 },
Expand DownExpand Up@@ -553,8 +551,6 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__members: 'Members',
 headerTitle__settings: 'Settings',
 headerSubtitle__members: 'View and manage organization members',
 headerSubtitle__settings: 'Manage organization settings',
 },
 profilePage: {
 title: 'Organization Profile',
Expand Down

4 changes: 0 additions & 4 deletions
packages/types/src/localization.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,8 +271,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__account: LocalizationValue;
 headerTitle__security: LocalizationValue;
 headerSubtitle__account: LocalizationValue;
 headerSubtitle__security: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
 };
Expand DownExpand Up@@ -556,8 +554,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__members: LocalizationValue;
 headerTitle__settings: LocalizationValue;
 headerSubtitle__members: LocalizationValue;
 headerSubtitle__settings: LocalizationValue;
 };
 profilePage: {
 title: LocalizationValue;
Expand Down

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

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

desiprisg
merged 1 commit into

from

Dec 8, 2023
 Merged


feat(clerk-js): Retheme profile cards and scroll boxes
#2290
Show file tree
Hide file tree
 Changes from all commits
Commits

Show all changes


1 commit


Select commit


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


2 changes: 2 additions & 0 deletions
.changeset/red-shrimps-hunt.md

View file


Open in desktop

Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
---
---

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/common/BlockButtons.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -21,7 +21,6 @@ export const AddBlockButton = (props: BlockButtonProps) => {
 const { leftIcon, ...rest } = props;
 return (
 <BlockButton
 colorScheme='primary'
 {...rest}
 sx={theme => ({ justifyContent: 'flex-start', gap: theme.space.$2 })}
 leftIcon={
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationMembers.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -54,7 +54,6 @@ export const OrganizationMembers = withCardStateProvider(() => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__members')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__members')} />
 </Header.Root>
 <Tabs>
 <TabsList>
Expand Down

4 changes: 3 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -34,7 +34,9 @@ const _OrganizationProfile = (_: OrganizationProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
@anagstefanagstefDec 8, 2023

Copy link


Copy Markdown

Contributor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Should these be hardcoded: '1fr 3fr'?
@desiprisgdesiprisgDec 8, 2023

Copy link


Copy Markdown

ContributorAuthor
Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I don't see why not
 >
 <OrganizationProfileNavbar contentRef={contentRef}>
 <OrganizationProfileRoutes contentRef={contentRef} />
 </OrganizationProfileNavbar>
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/components/OrganizationProfile/OrganizationSettings.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -25,7 +25,6 @@ export const OrganizationSettings = () => {
 localizationKey={localizationKeys('organizationProfile.start.headerTitle__settings')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('organizationProfile.start.headerSubtitle__settings')} />
 </Header.Root>
 <OrganizationProfileSection />
 <Gate permission='org:sys_domains:read'>
Expand Down

2 changes: 0 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/RootPage.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -48,7 +48,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__account')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__account')} />
 </Header.Root>

 <UserProfileSection />
Expand All@@ -69,7 +68,6 @@ export const RootPage = withCardStateProvider(() => {
 localizationKey={localizationKeys('userProfile.start.headerTitle__security')}
 textVariant='xxlargeMedium'
 />
 <Header.Subtitle localizationKey={localizationKeys('userProfile.start.headerSubtitle__security')} />
 </Header.Root>
 {showPassword && <PasswordSection />}
 {showMfa && <MfaSection />}
Expand Down

6 changes: 4 additions & 2 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfile.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -32,9 +32,11 @@ const _UserProfile = (_: UserProfileProps) => {
const AuthenticatedRoutes = withCoreUserGuard(() => {
 const contentRef = React.useRef<HTMLDivElement>(null);
 return (
 <ProfileCard sx={{ height: '100%' }}>
 <ProfileCard
 sx={t => ({ display: 'grid', gridTemplateColumns: '1fr 3fr', height: t.sizes.$176, overflow: 'hidden' })}
 >
 <UserProfileNavbar contentRef={contentRef}>
 <UserProfileRoutes contentRef={contentRef} />
 <UserProfileRoutes />
 </UserProfileNavbar>
 </ProfileCard>
 );
Expand Down

1 change: 1 addition & 0 deletions
packages/clerk-js/src/ui.retheme/components/UserProfile/UserProfileNavbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -9,6 +9,7 @@ export const UserProfileNavbar = (
 props: React.PropsWithChildren<Pick<PropsOfComponent<typeof NavBar>, 'contentRef'>>,
) => {
 const { pages } = useUserProfileContext();

 return (
 <NavbarContextProvider>
 <NavBar
Expand Down

32 changes: 12 additions & 20 deletions
packages/clerk-js/src/ui.retheme/elements/Card.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -71,27 +71,18 @@ export const Card = React.forwardRef<HTMLDivElement, CardProps>((props, ref) =>

export const ProfileCard = React.forwardRef<HTMLDivElement, CardProps>((props, ref) => {
 const { sx, children, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;
 return (
 <BaseCard ref={ref}>
 <Flex
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </Flex>
 <CardFooter>
 {branded && (
 <CardFooterItem>
 <PoweredByClerkTag />
 </CardFooterItem>
 )}
 </CardFooter>
 <BaseCard
 ref={ref}
 sx={[
 t => ({
 width: t.sizes.$220,
 }),
 sx,
 ]}
 {...rest}
 >
 {children}
 </BaseCard>
 );
});
Expand All@@ -112,6 +103,7 @@ export const BaseCard = React.forwardRef<HTMLDivElement, BaseCardProps>((props,
 sx={[
 t => ({
 backgroundColor: t.colors.$colorBackground,
 overflow: 'hidden',
 willChange: 'transform, opacity, height',
 transitionProperty: t.transitionProperty.$common,
 transitionDuration: '200ms',
Expand Down

1 change: 0 additions & 1 deletion
packages/clerk-js/src/ui.retheme/elements/InvisibleRootBox.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -37,7 +37,6 @@ export const InvisibleRootBox = makeCustomizable(_InvisibleRootBox, {
 defaultStyles: t => ({
 boxSizing: 'border-box',
 width: 'fit-content',

 fontFamily: t.fonts.$main,
 fontStyle: t.fontStyles.$normal,
 }),
Expand Down

38 changes: 21 additions & 17 deletions
packages/clerk-js/src/ui.retheme/elements/Navbar.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -22,6 +22,7 @@ import { animations, mqu } from '../styledSystem';
import { colors, sleep } from '../utils';
import { withFloatingTree } from './contexts';
import { Popover } from './Popover';
import { PoweredByClerkTag } from './PoweredByClerk';

type NavbarContextValue = { isOpen: boolean; open: () => void; close: () => void };
export const [NavbarContext, useNavbarContext, useUnsafeNavbarContext] =
Expand DownExpand Up@@ -187,34 +188,37 @@ const NavbarContainer = (
 <Col
 elementDescriptor={descriptors.navbar}
 sx={t => ({
 flex: `0 0 ${t.space.$60}`,
 maxWidth: t.space.$60,
 borderRight: `${t.borders.$normal} ${t.colors.$blackAlpha300}`,
 backgroundColor: t.colors.$blackAlpha100,
 padding: `${t.space.$9x5} ${t.space.$6}`,
 [mqu.md]: {
 display: 'none',
 },
gap: t.space.$6,
padding: `${t.space.$9x5} ${t.space.$6} ${t.space.$3} ${t.space.$6}`,
 color: t.colors.$colorText,
 justifyContent: 'space-between',
 })}
 >
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />
 <Col sx={t => ({ gap: t.space.$6, flex: `0 0 ${t.space.$60}` })}>
 <Col
 sx={t => ({
 gap: t.space.$0x5,
 })}
 >
 <Heading
 as='h1'
 localizationKey={title}
 />

 <Text
 colorScheme='neutral'
 localizationKey={description}
 />
 <Text
 colorScheme='neutral'
 variant='smallRegular'
 localizationKey={description}
 />
 </Col>
 {props.children}
 </Col>
{props.children}
<PoweredByClerkTag sx={{ justifyContent: 'start' }} />
 </Col>
 );
};
Expand Down

4 changes: 2 additions & 2 deletions
packages/clerk-js/src/ui.retheme/elements/PopoverCard.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,7 +5,7 @@ import { descriptors, Flex, Flow, Link, localizationKeys, useAppearance } from '
import type { PropsOfComponent } from '../styledSystem';
import { animations } from '../styledSystem';
import { BaseCard } from './Card';
import { PoweredByClerkText } from './PoweredByClerk';
import { PoweredByClerkTag } from './PoweredByClerk';

const PopoverCardRoot = React.forwardRef<HTMLDivElement, PropsOfComponent<typeof BaseCard>>((props, ref) => {
 return (
Expand DownExpand Up@@ -67,7 +67,7 @@ const PopoverCardFooter = (props: PropsOfComponent<typeof Flex>) => {
 ]}
 {...rest}
 >
 <PoweredByClerkText />
 <PoweredByClerkTag />
 <PopoverCardLinks />
 </Flex>
 );
Expand Down

58 changes: 17 additions & 41 deletions
packages/clerk-js/src/ui.retheme/elements/PoweredByClerk.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -5,57 +5,33 @@ import { Flex, Icon, Link, Text } from '../customizables';
import { LogoMark } from '../icons';
import type { PropsOfComponent } from '../styledSystem';

export const PoweredByClerkText = React.memo(() => {
 const { branded } = useEnvironment().displayConfig;

 return (
 <Flex
 gap={1}
 align='center'
 justify='center'
 sx={t => ({ width: '100%', color: t.colors.$colorTextSecondary })}
 >
 {branded ? (
 <>
 <Text
 variant='extraSmallRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 );
});

export const PoweredByClerkTag = React.memo(
 React.forwardRef<HTMLDivElement, PropsOfComponent<typeof Flex>>((props, ref) => {
 const { sx, ...rest } = props;
 const { branded } = useEnvironment().displayConfig;

 return branded ? (
 return (
 <Flex
 gap={2}
 gap={1}
 align='center'
 justify='center'
 sx={t => ({
 width: '100%',
 color: t.colors.$colorTextSecondary,
 padding: t.space.$2,
 })}
 {...props}
 sx={[t => ({ width: '100%', color: t.colors.$colorTextSecondary }), sx]}
 {...rest}
 ref={ref}
 >
 <Text
 variant='regularRegular'
 sx={theme => ({ color: 'inherit', letterSpacing: theme.space.$none })}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 {branded ? (
 <>
 <Text
 variant='regularRegular'
 sx={{ color: 'inherit' }}
 >
 Secured by
 </Text>
 <LogoMarkIconLink />
 </>
 ) : null}
 </Flex>
 ) : null;
 );
 }),
);

Expand Down

17 changes: 5 additions & 12 deletions
packages/clerk-js/src/ui.retheme/elements/ProfileCardContent.tsx

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -29,7 +29,10 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 }, [router.currentPath]);

 return (
 <ScrollerContainer>
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflowY: 'auto' })}
 >
 <Col
 elementDescriptor={descriptors.pageScrollBox}
 sx={theme => ({
Expand All@@ -44,16 +47,6 @@ export const ProfileCardContent = (props: ProfileCardContentProps) => {
 >
 {children}
 </Col>
 </ScrollerContainer>
 );
};

const ScrollerContainer = (props: React.PropsWithChildren<Record<never, never>>) => {
 return (
 <Col
 elementDescriptor={descriptors.scrollBox}
 sx={t => ({ position: 'relative', borderRadius: t.radii.$xl, width: '100%', overflow: 'hidden' })}
 {...props}
 />
 </Col>
 );
};

6 changes: 1 addition & 5 deletions
packages/localizations/src/en-US.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -251,10 +251,8 @@ export const enUS: LocalizationResource = {
 description: 'Manage your account info.',
 },
 start: {
 headerTitle__account: 'Account',
 headerTitle__account: 'Profile',
 headerTitle__security: 'Security',
 headerSubtitle__account: 'Manage your account information',
 headerSubtitle__security: 'Manage your security preferences',
 profileSection: {
 title: 'Profile',
 },
Expand DownExpand Up@@ -553,8 +551,6 @@ export const enUS: LocalizationResource = {
 start: {
 headerTitle__members: 'Members',
 headerTitle__settings: 'Settings',
 headerSubtitle__members: 'View and manage organization members',
 headerSubtitle__settings: 'Manage organization settings',
 },
 profilePage: {
 title: 'Organization Profile',
Expand Down

4 changes: 0 additions & 4 deletions
packages/types/src/localization.retheme.ts

View file


Open in desktop

Original file line numberDiff line numberDiff line change
Expand Up@@ -271,8 +271,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__account: LocalizationValue;
 headerTitle__security: LocalizationValue;
 headerSubtitle__account: LocalizationValue;
 headerSubtitle__security: LocalizationValue;
 profileSection: {
 title: LocalizationValue;
 };
Expand DownExpand Up@@ -556,8 +554,6 @@ type _LocalizationResource = {
 start: {
 headerTitle__members: LocalizationValue;
 headerTitle__settings: LocalizationValue;
 headerSubtitle__members: LocalizationValue;
 headerSubtitle__settings: LocalizationValue;
 };
 profilePage: {
 title: LocalizationValue;
Expand Down