Connect, collaborate, and grow with a community of TypeScript developers
Better profile page (#129)
Sean Boult0a07c2bf7d1c
diff --git a/prisma/schema.prisma b/prisma/schema.prismaindex ba56fdbc..78233b6c 100644--- a/prisma/schema.prisma+++ b/prisma/schema.prisma@@ -75,6 +75,7 @@ model User {roles Role[]status Status @default(PENDING)emailVerified DateTime?+ createdAt DateTime @default(now())image String?accounts Account[]sessions Session[]diff --git a/src/app/profile/page.tsx b/src/app/profile/page.tsxdeleted file mode 100644index cfa5ab5b..00000000--- a/src/app/profile/page.tsx+++ /dev/null@@ -1,14 +0,0 @@-import Head from 'next/head';--export default function Profile() {- return (- <div>- <Head>- <title>Type Hero - Profile</title>- </Head>- <div className="flex flex-col items-center justify-center gap-4">- <p className="text-center text-2xl text-white">Profile</p>- </div>- </div>- );-}diff --git a/src/components/dashboard/solutions-tab-mock.tsx b/src/components/dashboard/solutions-tab-mock.tsxdeleted file mode 100644index 04f3d40a..00000000--- a/src/components/dashboard/solutions-tab-mock.tsx+++ /dev/null@@ -1,46 +0,0 @@-import {- Table,- TableBody,- TableCaption,- TableCell,- TableHead,- TableHeader,- TableRow,-} from '~/components/ui/table';--const challengesList = [- {- challengeTitle: 'Easy Challenge 1',- challengeStatus: 'Submitted',- },- {- challengeTitle: 'Easy Challenge 2',- challengeStatus: 'Submitted',- },- {- challengeTitle: 'Easy Challenge 3',- challengeStatus: 'Submitted',- },-];--export function SolutionsTab() {- return (- <Table>- <TableCaption>A list of your recent challenges.</TableCaption>- <TableHeader>- <TableRow>- <TableHead>Challenge</TableHead>- <TableHead>Status</TableHead>- </TableRow>- </TableHeader>- <TableBody>- {challengesList.map((challengeTitle) => (- <TableRow key={challengeTitle.challengeTitle}>- <TableCell className="font-medium">{challengeTitle.challengeTitle}</TableCell>- <TableCell>{challengeTitle.challengeStatus}</TableCell>- </TableRow>- ))}- </TableBody>- </Table>- );-}diff --git a/src/components/dashboard/bookmark-tab-mock.tsx b/src/components/user/dashboard/bookmark-tab.tsxsimilarity index 100%rename from src/components/dashboard/bookmark-tab-mock.tsxrename to src/components/user/dashboard/bookmark-tab.tsxdiff --git a/src/components/dashboard/in-progress-tab-mock.tsx b/src/components/user/dashboard/in-progress-tab.tsxsimilarity index 100%rename from src/components/dashboard/in-progress-tab-mock.tsxrename to src/components/user/dashboard/in-progress-tab.tsxdiff --git a/src/components/dashboard/DashboardPage.tsx b/src/components/user/dashboard/index.tsxsimilarity index 68%rename from src/components/dashboard/DashboardPage.tsxrename to src/components/user/dashboard/index.tsxindex 191ad03a..ecda1041 100644--- a/src/components/dashboard/DashboardPage.tsx+++ b/src/components/user/dashboard/index.tsx@@ -1,17 +1,52 @@-import type { Metadata } from 'next';import Image from 'next/image';import { Card, CardContent, CardHeader, CardTitle } from '~/components/ui/card';import { Tabs, TabsContent, TabsList, TabsTrigger } from '~/components/ui/tabs';-import { Overview } from '~/components/dashboard/overview';-import { InProgressTab } from '~/components/dashboard/in-progress-tab-mock';-import { SolutionsTab } from '~/components/dashboard/solutions-tab-mock';+import { Overview } from '../dashboard/overview';+import { InProgressTab } from '../dashboard/in-progress-tab';+import { SolutionsTab } from '../dashboard/solutions-tab';+import { User } from '@prisma/client';+import { getRelativeTime } from '~/utils/relativeTime';+import { prisma } from '~/server/db';-export const metadata: Metadata = {- title: 'Dashboard',- description: 'Example dashboard app using the components.',-};+interface Props {+ user: User;+}++export type UserData = NonNullable<Awaited<ReturnType<typeof getUserdata>>>;+async function getUserdata(id: string) {+ const userData = await prisma.user.findFirst({+ where: {+ id,+ },+ include: {+ Solution: {+ where: {+ userId: id+ },+ orderBy: [+ {+ createdAt: 'desc',+ },+ ],+ take: 10,+ include: {+ challenge: true,+ },+ },+ },+ });++ return userData+}++export default async function Dashboard({ user }: Props) {+ const userData = await getUserdata(user.id);++ // TODO: this seems sus+ if (!userData) {+ return null;+ }-export default function DashboardPage() {return (<div className="container"><div className="flex-1 space-y-4 pt-6">@@ -26,19 +61,17 @@ export default function DashboardPage() {/></div><div>- <p className="text-3xl font-bold tracking-tight">Username</p>- <p className="text-sm italic tracking-tight">Joined: 07/03/2023</p>- <p className="text-sm italic tracking-tight">Challenges Complete: 5</p>+ <p className="text-3xl font-bold tracking-tight">{user.name}</p>+ <p+ className="text-sm italic tracking-tight"+ title={`Joined ${user.createdAt.toString()}`}+ >+ Joined {getRelativeTime(user.createdAt)}+ </p></div></div>- <Tabs defaultValue="overview" className="space-y-4">+ <Tabs defaultValue="in-progress" className="space-y-4"><TabsList className="rounded-full border border-border bg-background">- <TabsTrigger- className="rounded-l-2xl rounded-r-lg duration-300 data-[state=active]:bg-border"- value="overview"- >- Overview- </TabsTrigger><TabsTriggerclassName="rounded-lg duration-300 data-[state=active]:bg-border"value="in-progress"@@ -97,7 +130,7 @@ export default function DashboardPage() {<CardTitle>Solutions</CardTitle></CardHeader><CardContent className="pl-2">- <SolutionsTab />+ <SolutionsTab solutions={userData?.Solution} /></CardContent></Card></div>diff --git a/src/components/dashboard/overview.tsx b/src/components/user/dashboard/overview.tsxsimilarity index 100%rename from src/components/dashboard/overview.tsxrename to src/components/user/dashboard/overview.tsxdiff --git a/src/components/user/dashboard/solutions-tab.tsx b/src/components/user/dashboard/solutions-tab.tsxnew file mode 100644index 00000000..a4d16ac2--- /dev/null+++ b/src/components/user/dashboard/solutions-tab.tsx@@ -0,0 +1,35 @@+import {+ Table,+ TableBody,+ TableCaption,+ TableCell,+ TableHead,+ TableHeader,+ TableRow,+} from '~/components/ui/table';+import { UserData } from '.';+import Link from 'next/link';++export function SolutionsTab({ solutions = [] }: { solutions: UserData['Solution'] }) {+ return (+ <Table>+ <TableCaption>A list of your recent challenges.</TableCaption>+ <TableHeader>+ <TableRow>+ <TableHead>Challenge</TableHead>+ <TableHead>Status</TableHead>+ </TableRow>+ </TableHeader>+ <TableBody>+ {solutions.map((solution) => (+ <TableRow key={solution.id}>+ <TableCell className="font-medium underline">+ <Link href={`/challenge/${solution.challenge.id}`}>{solution.challenge.name}</Link>+ </TableCell>+ <TableCell>{solution.isSuccessful ? 'Accepted' : 'Rejected'}</TableCell>+ </TableRow>+ ))}+ </TableBody>+ </Table>+ );+}diff --git a/src/components/user/profile.tsx b/src/components/user/profile.tsxindex 67dc8112..2fdd376d 100644--- a/src/components/user/profile.tsx+++ b/src/components/user/profile.tsx@@ -1,10 +1,17 @@import { notFound } from 'next/navigation';import { prisma } from '~/server/db';-import DashboardPage from '../dashboard/DashboardPage';+import Dashboard from './dashboard';+import { Metadata } from 'next';interface Props {username: string;}++export const metadata: Metadata = {+ title: 'Profile',+ description: 'A users profile',+};+export async function Profile({ username: usernameFromQuery }: Props) {const [, username] = decodeURIComponent(usernameFromQuery).split('@');const user = await prisma.user.findFirst({@@ -19,5 +26,5 @@ export async function Profile({ username: usernameFromQuery }: Props) {notFound();}- return <DashboardPage />;+ return <Dashboard user={user} />;}diff --git a/src/server/auth.ts b/src/server/auth.tsindex 1a03e75e..62f81475 100644--- a/src/server/auth.ts+++ b/src/server/auth.ts@@ -21,6 +21,7 @@ declare module 'next-auth' {}interface User {+ createdAt: Date;roles: Role[];}}@@ -74,6 +75,7 @@ export const authOptions: NextAuthOptions = {...session.user,id: user.id,role: userRoles,+ createAt: user.createdAt,},};},