Skip to content

Connect, collaborate, and grow with a community of TypeScript developers

Profile 2 (#526)

PickleNik9bddf2f7f5ab
diff --git a/apps/og-image/public/og.png b/apps/og-image/public/og.png
index e5b8067a..5d00cf8b 100644
Binary files a/apps/og-image/public/og.png and b/apps/og-image/public/og.png differ
diff --git a/apps/web/src/components/user/dashboard/index.tsx b/apps/web/src/components/user/dashboard/index.tsx
index 450b8ba1..42b044f6 100644
--- a/apps/web/src/components/user/dashboard/index.tsx
+++ b/apps/web/src/components/user/dashboard/index.tsx
@@ -12,7 +12,6 @@ import {
Tabs,
VerticalTabsContent,
VerticalTabsTrigger,
- Button,
MagicIcon,
VerticalTabsList,
} from '@repo/ui';
@@ -22,6 +21,7 @@ import { SolutionsTab } from './solutions-tab';
import UserHeader from './user-header';
import { getRelativeTime } from '~/utils/relativeTime';
import { stripProtocolAndWWW } from '~/utils/stringUtils';
+import { Bookmark, ChevronRightSquare, MessagesSquare, Play, Settings } from 'lucide-react';
interface Props {
// TODO: how do do this union type with just letting prisma halp
@@ -66,105 +66,122 @@ export default async function Dashboard({ user }: Props) {
return (
<div className="container">
- <div className="mt-10">
- <div className="max-w-md">
- <ReactMarkdown>{user.bio}</ReactMarkdown>
- </div>
+ {/* // TODO: GFI: make each page a subroute, put settings into this same layout */}
+ <Tabs className="flex flex-col gap-8 py-8 md:flex-row" defaultValue="in-progress">
+ <VerticalTabsList>
+ <div className="mb-2 flex flex-col items-center md:items-start">
+ <div
+ className="mb-10 h-32 w-32 rounded-3xl bg-cover bg-center bg-no-repeat md:h-64 md:w-64"
+ style={{ backgroundImage: `url(${user.image ?? '/avatar.jpeg'})` }}
+ />
+ <UserHeader user={user} isOwnProfile={session?.user.id === user.id} />
+ <p
+ className="text-sm italic tracking-tight text-neutral-500"
+ title={`Joined ${user.createdAt.toString()}`}
+ >
+ Joined {getRelativeTime(user.createdAt)}
+ </p>
+ <div className="mb-4 mt-2 w-full text-center text-sm md:w-64 md:text-start">
+ Lorem ipsum dolor, sit amet consectetur adipisicing elit. Minima temporibus maiores
+ nesciunt hic dolores aspernatur corrupti laboriosam consectetur. Vitae, consectetur?
+ <ReactMarkdown>{user.bio}</ReactMarkdown>
+ </div>
- {user.userLinks.length > 0 && (
- <div>
- {user.userLinks
- .filter((item) => item.url !== '')
- .map((link) => (
- <div className="flex gap-2" key={link.id}>
- <MagicIcon url={link.url} />
- <a
- className="hover:text-zinc-400"
- href={link.url}
- rel="noopener noreferrer"
- target="_blank"
- >
- {stripProtocolAndWWW(link.url)}
- </a>
- </div>
- ))}
+ {user.userLinks.length > 0 && (
+ <div className="flex flex-col gap-2">
+ {user.userLinks
+ .filter((item) => item.url !== '')
+ .map((link) => (
+ <div className="flex items-center gap-2" key={link.id}>
+ <MagicIcon url={link.url} />
+ <a
+ className="text-xs text-neutral-400 hover:text-neutral-600 dark:text-neutral-600 dark:hover:text-neutral-400"
+ href={link.url}
+ rel="noopener noreferrer"
+ target="_blank"
+ >
+ {stripProtocolAndWWW(link.url)}
+ </a>
+ </div>
+ ))}
+ </div>
+ )}
</div>
- )}
-
- <Tabs className="flex flex-col gap-4 md:flex-row" defaultValue="in-progress">
- <VerticalTabsList className="teststuffhere">
- <div className="flex flex-col items-center justify-center">
- <Image
- alt="user avatar"
- className="rounded-3xl"
- height="100"
- src={user.image ?? '/avatar.jpeg'}
- width="100"
- />
- <UserHeader user={user} isOwnProfile={session?.user.id === user.id} />
- <p
- className="text-sm italic tracking-tight"
- title={`Joined ${user.createdAt.toString()}`}
- >
- Joined {getRelativeTime(user.createdAt)}
- </p>
- </div>
+ <div className="flex gap-4 pr-6 md:flex-col">
+ <VerticalTabsTrigger
+ className="flex items-center justify-center gap-3 px-2 md:justify-normal md:px-3"
+ value="in-progress"
+ >
+ <Play className="h-4 w-4" />
+ <span className="hidden md:block">In-Progress</span>
+ </VerticalTabsTrigger>
+ <VerticalTabsTrigger
+ className="flex items-center justify-center gap-3 px-2 md:justify-normal md:px-3"
+ value="solutions"
+ >
+ <ChevronRightSquare className="h-4 w-4" />
+ <span className="hidden md:block">Solutions</span>
+ </VerticalTabsTrigger>
+ <VerticalTabsTrigger
+ className="flex items-center justify-center gap-3 px-2 md:justify-normal md:px-3"
+ disabled
+ value="bookmarks"
+ >
+ <Bookmark className="h-4 w-4" />
+ <span className="hidden md:block">Bookmarks</span>
+ </VerticalTabsTrigger>
+ <VerticalTabsTrigger
+ className="flex items-center justify-center gap-3 px-2 md:justify-normal md:px-3"
+ disabled
+ value="comments"
+ >
+ <MessagesSquare className="h-4 w-4" />
+ <span className="hidden md:block">Comments</span>
+ </VerticalTabsTrigger>
<div>
{session?.user.id === user.id && (
- <Link href="/settings">
- <div className="data-[state=active]:bg-border border-ring rounded-lg border p-2 text-sm font-medium duration-300">
- Settings
- </div>
+ <Link
+ href="/settings"
+ className="border-border dark:border-ring data-[state=active]:bg-border ring-offset-background focus-visible:ring-ring data-[state=active]:text-foreground flex items-center justify-center gap-3 whitespace-nowrap rounded-xl border px-1.5 py-1.5 text-sm font-medium transition-all duration-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm md:justify-normal md:px-3"
+ >
+ <Settings width={18} height={18} />
+ <span className="hidden md:block">Settings</span>
</Link>
)}
</div>
- <VerticalTabsTrigger value="in-progress">In-Progress</VerticalTabsTrigger>
- <VerticalTabsTrigger value="solutions">Solutions</VerticalTabsTrigger>
- <VerticalTabsTrigger disabled value="bookmarks">
- Bookmarks
- </VerticalTabsTrigger>
- <VerticalTabsTrigger disabled value="comments">
- Comments
- </VerticalTabsTrigger>
- </VerticalTabsList>
- <VerticalTabsContent className="shrink grow space-y-4" value="overview">
- <div className="">
- <Card className="col-span-4">
- <CardHeader>
- <CardTitle>Overview</CardTitle>
- </CardHeader>
- <CardContent className="pl-2">
- <Overview />
- </CardContent>
- </Card>
- </div>
- </VerticalTabsContent>
- <VerticalTabsContent className="shrink grow space-y-4" value="in-progress">
- <div className="">
- <Card className="col-span-4">
- <CardHeader>
- <CardTitle>In-Progress</CardTitle>
- </CardHeader>
- <CardContent className="pl-2">
- <InProgressTab />
- </CardContent>
- </Card>
- </div>
- </VerticalTabsContent>
- <VerticalTabsContent className="shrink grow space-y-4" value="solutions">
- <div className="">
- <Card className="col-span-4">
- <CardHeader>
- <CardTitle>Solutions</CardTitle>
- </CardHeader>
- <CardContent className="pl-2">
- <SolutionsTab submissions={userData.submission} />
- </CardContent>
- </Card>
- </div>
- </VerticalTabsContent>
- </Tabs>
- </div>
+ </div>
+ </VerticalTabsList>
+ <VerticalTabsContent className="shrink grow space-y-4" value="overview">
+ <Card className="col-span-4 min-h-[calc(100vh_-_56px_-_6rem)]">
+ <CardHeader>
+ <CardTitle>Overview</CardTitle>
+ </CardHeader>
+ <CardContent className="pl-2">
+ <Overview />
+ </CardContent>
+ </Card>
+ </VerticalTabsContent>
+ <VerticalTabsContent className="shrink grow space-y-4" value="in-progress">
+ <Card className="col-span-4 min-h-[calc(100vh_-_56px_-_6rem)]">
+ <CardHeader>
+ <CardTitle>In-Progress</CardTitle>
+ </CardHeader>
+ <CardContent className="pl-2">
+ <InProgressTab />
+ </CardContent>
+ </Card>
+ </VerticalTabsContent>
+ <VerticalTabsContent className="shrink grow space-y-4" value="solutions">
+ <Card className="col-span-4 min-h-[calc(100vh_-_56px_-_6rem)]">
+ <CardHeader>
+ <CardTitle>Solutions</CardTitle>
+ </CardHeader>
+ <CardContent className="pl-2">
+ <SolutionsTab submissions={userData.submission} />
+ </CardContent>
+ </Card>
+ </VerticalTabsContent>
+ </Tabs>
</div>
);
}
diff --git a/media/og.png b/media/og.png
index e5b8067a..bfee47b5 100644
Binary files a/media/og.png and b/media/og.png differ
diff --git a/packages/ui/src/components/magic-icon.tsx b/packages/ui/src/components/magic-icon.tsx
index c2cf06c9..5681b970 100644
--- a/packages/ui/src/components/magic-icon.tsx
+++ b/packages/ui/src/components/magic-icon.tsx
@@ -3,12 +3,13 @@ import { Github, Link as LinkIcon, Linkedin, Twitter, Youtube } from 'lucide-rea
// TODO: this could be more robust
// it's not accounting for subdomains like the boomer www and stuff
export function MagicIcon({ url }: { url: string }) {
- if (url.startsWith('https://github.com/')) return <Github className="h-5 w-5 text-neutral-400" />;
+ if (url.startsWith('https://github.com/'))
+ return <Github className="h-3 w-3 text-neutral-400 dark:text-neutral-600" />;
if (url.startsWith('https://twitter.com/'))
- return <Twitter className="h-5 w-5 text-neutral-400" />;
+ return <Twitter className="h-3 w-3 text-neutral-400 dark:text-neutral-600" />;
if (url.startsWith('https://www.linkedin.com/'))
- return <Linkedin className="h-5 w-5 text-neutral-400" />;
+ return <Linkedin className="h-3 w-3 text-neutral-400 dark:text-neutral-600" />;
if (url.startsWith('https://youtube.com/'))
- return <Youtube className="h-5 w-5 text-neutral-400" />;
- return <LinkIcon className="h-5 w-5 text-neutral-400" />;
+ return <Youtube className="h-3 w-3 text-neutral-400 dark:text-neutral-600" />;
+ return <LinkIcon className="h-3 w-3 text-neutral-400 dark:text-neutral-600" />;
}
diff --git a/packages/ui/src/components/tabs.tsx b/packages/ui/src/components/tabs.tsx
index 834264b1..4beeffaf 100644
--- a/packages/ui/src/components/tabs.tsx
+++ b/packages/ui/src/components/tabs.tsx
@@ -35,7 +35,7 @@ const TabsTrigger = React.forwardRef<
>(({ className, ...props }, ref) => (
<TabsPrimitive.Trigger
className={cn(
- 'ring-offset-background focus-visible:ring-ring data-[state=active]:bg-background data-[state=active]:text-foreground inline-flex items-center justify-center whitespace-nowrap rounded-sm px-3 py-1.5 text-sm font-medium transition-all focus-visible:outline-none focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm',
+ 'ring-offset-background focus-visible:ring-ring data-[state=active]:bg-background data-[state=active]:text-foreground inline-flex items-center justify-center whitespace-nowrap rounded-sm px-4 py-1.5 text-sm font-medium transition-all focus-visible:outline-none focus-visible:ring-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm',
className,
)}
ref={ref}
@@ -50,7 +50,7 @@ const VerticalTabsTrigger = React.forwardRef<
>(({ className, ...props }, ref) => (
<TabsPrimitive.Trigger
className={cn(
- 'data-[state=active]:bg-border ring-offset-background border-ring focus-visible:ring-ring data-[state=active]:text-foreground inline-flex whitespace-nowrap rounded-lg border p-2 text-sm font-medium transition-all duration-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm',
+ 'border-border dark:border-ring data-[state=active]:bg-border ring-offset-background focus-visible:ring-ring data-[state=active]:text-foreground whitespace-nowrap rounded-xl border px-3 py-1.5 text-sm font-medium transition-all duration-300 focus-visible:outline-none focus-visible:ring-2 focus-visible:ring-offset-2 disabled:pointer-events-none disabled:opacity-50 data-[state=active]:shadow-sm',
className,
)}
ref={ref}
diff --git a/packages/ui/src/icons.ts b/packages/ui/src/icons.ts
index 053c9e0c..5e4082ec 100644
--- a/packages/ui/src/icons.ts
+++ b/packages/ui/src/icons.ts
@@ -28,6 +28,7 @@ export {
MessageCircle,
Moon,
Pencil,
+ Play,
Plus,
Reply,
Settings,