Skip to content

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

adds solution details (#195)

bautistaaa8350ede0e9f8
diff --git a/src/app/challenge/[id]/loading.tsx b/src/app/challenge/[id]/loading.tsx
new file mode 100644
index 00000000..a08a87ea
--- /dev/null
+++ b/src/app/challenge/[id]/loading.tsx
@@ -0,0 +1,5 @@
+import { DescriptionSkeleton } from '~/components/challenge/description-skeleton';
+
+export default function Loading() {
+ return <DescriptionSkeleton />;
+}
diff --git a/src/app/challenge/[id]/solutions/[solutionId]/page.tsx b/src/app/challenge/[id]/solutions/[solutionId]/page.tsx
index f4720b8c..32d41579 100644
--- a/src/app/challenge/[id]/solutions/[solutionId]/page.tsx
+++ b/src/app/challenge/[id]/solutions/[solutionId]/page.tsx
@@ -1,9 +1,30 @@
+import { SolutionDetails } from '~/components/challenge/solutions/solution-detail';
+import { prisma } from '~/server/db';
+
interface Props {
params: {
solutionId: string;
};
}
+export type SolutionData = NonNullable<Awaited<ReturnType<typeof getSolution>>>;
export default async function SolutionPage({ params: { solutionId } }: Props) {
- return <div>some details go here for {solutionId}</div>;
+ const solution = await getSolution(solutionId);
+ if (!solution) return null;
+
+ return <SolutionDetails solution={solution} />;
+}
+
+async function getSolution(solutionId: string) {
+ const solution = await prisma.sharedSolution.findFirst({
+ where: {
+ id: +solutionId,
+ },
+ include: {
+ challenge: true,
+ user: true
+ },
+ });
+
+ return solution;
}
diff --git a/src/app/challenge/[id]/wrapper.tsx b/src/app/challenge/[id]/wrapper.tsx
index f294ca4d..35e14530 100644
--- a/src/app/challenge/[id]/wrapper.tsx
+++ b/src/app/challenge/[id]/wrapper.tsx
@@ -6,9 +6,10 @@ import { SubmissionOverview } from '~/components/challenge/submissions/overview'
export function Wrapper({ challenge }: { challenge: ChallengeRouteData }) {
const segments = useSelectedLayoutSegments();
- if (!challenge) return <div>loading</div>;
+ if (!challenge) return null;
if (segments[0] === 'submissions' && typeof segments[1] === 'string') {
return <SubmissionOverview challenge={challenge} submissionId={segments[1]} />;
}
+
return <CodePanel mode="solve" challenge={challenge} />;
}
diff --git a/src/components/challenge/description-skeleton.tsx b/src/components/challenge/description-skeleton.tsx
new file mode 100644
index 00000000..a6abca5e
--- /dev/null
+++ b/src/components/challenge/description-skeleton.tsx
@@ -0,0 +1,21 @@
+export function DescriptionSkeleton() {
+ return (
+ <div className="flex flex-col space-y-10 px-4 py-3">
+ <div className="prose-invert flex flex-col space-y-2 prose-h3:text-xl">
+ <div className="h-4 rounded-lg bg-zinc-300 dark:bg-zinc-700"></div>
+ <div className="h-4 rounded-lg bg-zinc-300 dark:bg-zinc-700"></div>
+ <div className="h-4 w-1/2 rounded-lg bg-zinc-300 dark:bg-zinc-700"></div>
+ </div>
+ <div className="prose-invert flex flex-col space-y-2 prose-h3:text-xl">
+ <div className="h-4 rounded-lg bg-zinc-300 dark:bg-zinc-700"></div>
+ <div className="h-4 rounded-lg bg-zinc-300 dark:bg-zinc-700"></div>
+ <div className="h-4 w-1/2 rounded-lg bg-zinc-300 dark:bg-zinc-700"></div>
+ </div>
+ <div className="prose-invert flex flex-col space-y-2 prose-h3:text-xl">
+ <div className="h-4 rounded-lg bg-zinc-300 dark:bg-zinc-700"></div>
+ <div className="h-4 rounded-lg bg-zinc-300 dark:bg-zinc-700"></div>
+ <div className="h-4 w-1/2 rounded-lg bg-zinc-300 dark:bg-zinc-700"></div>
+ </div>
+ </div>
+ );
+}
diff --git a/src/components/challenge/skeleton.tsx b/src/components/challenge/skeleton.tsx
deleted file mode 100644
index 7fe4786a..00000000
--- a/src/components/challenge/skeleton.tsx
+++ /dev/null
@@ -1,8 +0,0 @@
-'use client';
-
-import { ChallengeLayout } from './challenge-layout';
-import { DescriptionPanelSkeleton } from './left-panel-skeleton';
-
-export function ChallengeSkeleton() {
- return <ChallengeLayout skeleton left={<DescriptionPanelSkeleton />} right={'Loading...'} />;
-}
diff --git a/src/components/challenge/solutions/solution-detail.tsx b/src/components/challenge/solutions/solution-detail.tsx
new file mode 100644
index 00000000..4b4da07e
--- /dev/null
+++ b/src/components/challenge/solutions/solution-detail.tsx
@@ -0,0 +1,78 @@
+'use client';
+import { Calendar, MessageCircle, Share, X } from 'lucide-react';
+import Link from 'next/link';
+import type { SolutionData } from '~/app/challenge/[id]/solutions/[solutionId]/page';
+import { Avatar, AvatarFallback, AvatarImage } from '~/components/ui/avatar';
+import { Button } from '~/components/ui/button';
+import { Markdown } from '~/components/ui/markdown';
+import { TypographyLarge } from '~/components/ui/typography/large';
+import { toast } from '~/components/ui/use-toast';
+
+interface Props {
+ solution: SolutionData;
+}
+export function SolutionDetails({ solution }: Props) {
+ const url = window.location.href;
+ const handleShareClick = async () => {
+ if (navigator.clipboard) {
+ await navigator.clipboard.writeText(url);
+ toast({
+ variant: 'success',
+ description: 'Link To Solution Copied!',
+ });
+ }
+ };
+
+ const handleCommentClick = () => {
+ console.log('something');
+ };
+
+ return (
+ <div className="relative flex h-full flex-col">
+ <div className="sticky right-0 top-[41px] flex border-b border-zinc-300 bg-background/90 p-2 backdrop-blur-sm dark:border-zinc-700 dark:bg-muted/90">
+ <Link href={`/challenge/${solution.challengeId}/solutions`}>
+ <X size={20} className="stroke-gray-500 hover:stroke-gray-400" />
+ </Link>
+ </div>
+ <div className="flex-1 px-4 py-3">
+ <div className="mb-5 flex flex-col gap-3">
+ <div className="flex items-center gap-2">
+ <Avatar>
+ <AvatarImage src={solution.user?.image ?? ''} alt="github profile picture" />
+ <AvatarFallback>{solution.user?.name}</AvatarFallback>
+ </Avatar>
+ <TypographyLarge>{solution.title}</TypographyLarge>
+ </div>
+ <div className="flex items-center gap-4">
+ <div className="rounded-full bg-neutral-100 px-2 py-1 text-xs font-bold text-neutral-400 dark:bg-zinc-700 dark:text-neutral-400">
+ @&nbsp;{solution.user?.name}
+ </div>
+ <div className="flex items-center">
+ <Calendar className="mr-2 h-4 w-4 stroke-gray-400" />
+ <span className="text-xs text-gray-400">{solution.createdAt.toLocaleString()}</span>
+ </div>
+ </div>
+ </div>
+ <Markdown>{solution.description}</Markdown>
+ </div>
+ <div className="sticky bottom-0 -mx-[1px] overflow-hidden rounded-xl border border-zinc-300 border-b-background bg-background/90 shadow-[0_0_3rem_-0.25rem_#0004] backdrop-blur-sm duration-300 dark:border-zinc-700 dark:border-b-muted dark:bg-muted/90 dark:shadow-[0_0_3rem_-0.25rem_#0008]"></div>
+ <div className="flex gap-2">
+ <Button
+ variant="ghost"
+ onClick={handleCommentClick}
+ className="group text-gray-500 group-hover:text-gray-400"
+ >
+ <MessageCircle className="mr-2 h-4 w-4 stroke-gray-500 group-hover:stroke-gray-400" />{' '}
+ Comments
+ </Button>
+ <Button
+ variant="ghost"
+ onClick={handleShareClick}
+ className="group text-gray-500 group-hover:text-gray-400"
+ >
+ <Share className="mr-2 h-4 w-4 stroke-gray-500 group-hover:stroke-gray-400" /> Share
+ </Button>
+ </div>
+ </div>
+ );
+}
diff --git a/src/components/ui/avatar.tsx b/src/components/ui/avatar.tsx
index 5e54c995..6496ce85 100644
--- a/src/components/ui/avatar.tsx
+++ b/src/components/ui/avatar.tsx
@@ -45,3 +45,4 @@ const AvatarFallback = React.forwardRef<
AvatarFallback.displayName = AvatarPrimitive.Fallback.displayName;
export { Avatar, AvatarImage, AvatarFallback };
+
diff --git a/src/components/ui/markdown.tsx b/src/components/ui/markdown.tsx
index 4305ada3..64ec8793 100644
--- a/src/components/ui/markdown.tsx
+++ b/src/components/ui/markdown.tsx
@@ -14,6 +14,12 @@ export function Markdown({ children }: { children: string }) {
h1: ({ className, ...props }) => (
<h1 className={clsx(className, 'mb-2 pb-2 text-3xl font-bold')} {...props} />
),
+ h2: ({ className, ...props }) => (
+ <h2 className={clsx(className, 'mb-2 pb-2 text-2xl font-bold')} {...props} />
+ ),
+ h3: ({ className, ...props }) => (
+ <h3 className={clsx(className, 'mb-2 pb-2 text-xl font-bold')} {...props} />
+ ),
p: ({ className, ...props }) => <p className={clsx(className, 'mb-4')} {...props} />,
code({ inline, className, children, style: _, ...props }) {
const match = /language-(\w+)/.exec(className || '');