Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
36 changes: 26 additions & 10 deletions src/components/dashboard/Sidebar/DashboardSidebar.tsx
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,7 @@
import React, { useCallback, useEffect, useRef, useState } from "react";
import Link from "@docusaurus/Link";
import { useLocation } from "@docusaurus/router";
import useDocusaurusContext from "@docusaurus/useDocusaurusContext";
import { SignInButton, useUser, useClerk } from "@clerk/react";
import {
LayoutGrid,
Expand Down Expand Up @@ -66,20 +67,25 @@ export default function DashboardSidebar({
activeTab,
onTabChange,
}: DashboardSidebarProps): React.JSX.Element {
const { siteConfig } = useDocusaurusContext();
const hasClerk = Boolean(siteConfig.customFields?.clerkPublishableKey);

let user: ReturnType<typeof useUser>["user"] | undefined;
let authLoaded = true;
let signOut: ReturnType<typeof useClerk>["signOut"] | undefined;
let openUserProfile: ReturnType<typeof useClerk>["openUserProfile"] | undefined;

try {
const auth = useUser();
user = auth.user;
authLoaded = auth.isLoaded;
const clerk = useClerk();
signOut = clerk.signOut;
openUserProfile = clerk.openUserProfile;
} catch {
// The dashboard remains usable in local builds without Clerk configuration.
if (hasClerk) {
try {
const auth = useUser();
user = auth.user;
authLoaded = auth.isLoaded;
const clerk = useClerk();
signOut = clerk.signOut;
openUserProfile = clerk.openUserProfile;
} catch {
// The dashboard remains usable in local builds without Clerk configuration.
}
}

const [collapsed, setCollapsed] = useState(false);
Expand Down Expand Up @@ -195,7 +201,7 @@ export default function DashboardSidebar({
</div>
)}
</>
) : (
) : hasClerk ? (
<SignInButton mode="modal">
<button
type="button"
Expand All @@ -207,6 +213,16 @@ export default function DashboardSidebar({
{!collapsed && <span>Sign in with GitHub</span>}
</button>
</SignInButton>
) : (
<button
type="button"
className="dashboard-rail-signin"
aria-label="Sign in with GitHub"
title={collapsed ? "Sign in with GitHub" : undefined}
>
<GithubMark />
{!collapsed && <span>Sign in with GitHub</span>}
</button>
)}
</div>

Expand Down
13 changes: 11 additions & 2 deletions src/components/dashboard/overview/SignedOutHero.tsx
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import React, { useState } from 'react';
import Link from '@docusaurus/Link';
import useDocusaurusContext from '@docusaurus/useDocusaurusContext';
import { SignInButton } from '@clerk/react';
import FloatingContributors from '../../FloatingContributors';
import { useHalloween } from '../../Halloween/useHalloween';
Expand All @@ -12,6 +13,8 @@ export const GithubMark = ({ size = 18 }: { size?: number }) => (
);

export default function SignedOutHero() {
const { siteConfig } = useDocusaurusContext();
const hasClerk = Boolean(siteConfig.customFields?.clerkPublishableKey);
const halloween = useHalloween();
const [showCard, setShowCard] = useState(true);

Expand All @@ -27,11 +30,17 @@ export default function SignedOutHero() {
Sign in with GitHub to see your merged PRs, contribution streak and leaderboard rank. Community stats below are public.
</p>
<div className={styles.actions}>
<SignInButton mode="modal">
{hasClerk ? (
<SignInButton mode="modal">
<button type="button" className={styles.btnPrimary}>
<GithubMark /> Sign in with GitHub
</button>
</SignInButton>
) : (
<button type="button" className={styles.btnPrimary}>
<GithubMark /> Sign in with GitHub
</button>
</SignInButton>
)}
<Link className={styles.btnOutline} to="/dashboard#leaderboard">Browse the leaderboard</Link>
</div>
</div>
Expand Down
Loading