Connect, collaborate, and grow with a community of TypeScript developers
track improvements [wip] (#694)
bautistaaac15fc8754578
diff --git a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsx b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsxindex 6898fe03..f6203ae5 100644--- a/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsx+++ b/apps/web/src/app/[locale]/challenge/[id]/submissions/_components/overview.tsx@@ -1,16 +1,10 @@import { Button } from '@repo/ui/components/button';import { Markdown } from '@repo/ui/components/markdown';-import {- Tooltip,- TooltipContent,- TooltipProvider,- TooltipTrigger,-} from '@repo/ui/components/tooltip';+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';import { toast } from '@repo/ui/components/use-toast';import { Copy, X } from '@repo/ui/icons';import { useQuery } from '@tanstack/react-query';import Link from 'next/link';-import { getBaseUrl } from '~/utils/getBaseUrl';import { getRelativeTime } from '~/utils/relativeTime';import { getChallengeSubmissionById } from '../getChallengeSubmissions';@@ -48,18 +42,16 @@ export function SubmissionOverview({ submissionId }: Props) {<Link href={`/challenge/${submission.challengeId}/submissions`}><X className="stroke-gray-500 hover:stroke-gray-400" size={20} /></Link>- <TooltipProvider>- <Tooltip>- <TooltipTrigger asChild>- <Button onClick={copyToClipboard} variant="ghost">- <Copy className="stroke-gray-500 hover:stroke-gray-400" size={20} />- </Button>- </TooltipTrigger>- <TooltipContent>- <p>Copy</p>- </TooltipContent>- </Tooltip>- </TooltipProvider>+ <Tooltip>+ <TooltipTrigger asChild>+ <Button onClick={copyToClipboard} variant="ghost">+ <Copy className="stroke-gray-500 hover:stroke-gray-400" size={20} />+ </Button>+ </TooltipTrigger>+ <TooltipContent>+ <p>Copy</p>+ </TooltipContent>+ </Tooltip></div><div className="p-2"><div className="mb-5">diff --git a/apps/web/src/app/[locale]/explore/_components/index.tsx b/apps/web/src/app/[locale]/explore/_components/index.tsxindex 6521a530..08ac5e63 100644--- a/apps/web/src/app/[locale]/explore/_components/index.tsx+++ b/apps/web/src/app/[locale]/explore/_components/index.tsx@@ -12,7 +12,7 @@ export async function Explore() {<div className="flex flex-col gap-8 py-8 md:gap-10 md:py-10"><div className="container"><h1 className="mb-8 text-4xl font-bold tracking-tight text-neutral-900 dark:text-white">- TypeHero Explore+ Explore</h1><p className=" max-w-[69ch] text-lg leading-10 text-neutral-600 dark:text-white/50">Explore the challenges. Embrace the opportunity to grow, learn, and showcase yourdiff --git a/apps/web/src/app/[locale]/tracks/_components/index.tsx b/apps/web/src/app/[locale]/tracks/_components/index.tsxindex 40d8eddf..fd9da60c 100644--- a/apps/web/src/app/[locale]/tracks/_components/index.tsx+++ b/apps/web/src/app/[locale]/tracks/_components/index.tsx@@ -6,10 +6,10 @@ export async function Tracks() {const session = await getServerAuthSession();return (- <div className="flex flex-col gap-8 py-8 md:gap-10 md:py-10">+ <div className="flex flex-col gap-5 py-8 md:gap-10 md:py-10"><div className="container"><h1 className="mb-8 text-4xl font-bold tracking-tight text-neutral-900 dark:text-white">- TypeHero Tracks+ Tracks</h1><p className=" max-w-[69ch] text-lg leading-10 text-neutral-600 dark:text-white/50">TypeHero provides a curated collection of diverse coding challenges grouped into differentdiff --git a/apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsx b/apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsxindex bb642ff2..4bcc48a3 100644--- a/apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsx+++ b/apps/web/src/app/[locale]/tracks/_components/personal-track-card.tsx@@ -1,7 +1,3 @@-import { TrendingUpIcon } from '@repo/ui/icons';-import clsx from 'clsx';-import type { EnrolledTracks } from './track-enrolled-section';-import { TrackProgress } from './track-progress';import {Card,CardContent,@@ -9,24 +5,23 @@ import {CardHeader,CardTitle,} from '@repo/ui/components/card';+import clsx from 'clsx';+import type { EnrolledTracks } from './track-enrolled-section';+import { TrackProgress } from './track-progress';+import { useMemo } from 'react';interface PersonalTrackCardProps {track: EnrolledTracks[number];}export function PersonalTrackCard({ track }: PersonalTrackCardProps) {- // Calculates the total number of successful challenges.- function calculateCompletedChallenges(): number {- let completedChallenges = 0;- for (const trackChallenge of track.trackChallenges) {- for (const submission of trackChallenge.challenge.submission) {- if (submission.isSuccessful) {- completedChallenges++;- }- }- }- return completedChallenges;- }+ const completedChallenges = useMemo(+ () =>+ track?.trackChallenges.filter((trackChallenge) =>+ trackChallenge.challenge.submission.some((submission) => submission.isSuccessful),+ ).length ?? 0,+ [track],+ );return (<Card@@ -37,22 +32,14 @@ export function PersonalTrackCard({ track }: PersonalTrackCardProps) {)}><CardHeader className="relative flex flex-col items-start gap-1 pb-0">- <CardTitle className="max-w-[75%] truncate text-2xl duration-300">{track.title}</CardTitle>- <div className="flex items-center gap-6 text-center duration-300">- <div className="flex items-center gap-2 text-sm">- <TrendingUpIcon size={18} />- {track._count.enrolledUsers}- </div>- </div>- <TrackProgress- completedChallenges={calculateCompletedChallenges()}- totalChallenges={track.trackChallenges.length}- />+ <CardTitle className="max-w-[90%] truncate text-xl duration-300">{track.title}</CardTitle></CardHeader><CardContent className="relative flex flex-col justify-between gap-2 rounded-xl p-6 pb-0 duration-300">- <CardDescription className="relative h-20 w-fit overflow-hidden pb-4">- <div className="pointer-events-none absolute inset-0 h-full w-full shadow-[inset_0_-1.5rem_1rem_-0.5rem_hsl(var(--card))] duration-300 group-hover/card:shadow-[inset_0_-1.5rem_1rem_-0.5rem_hsl(var(--card-hovered))] group-focus:shadow-[inset_0_-1.5rem_1rem_-0.5rem_hsl(var(--card-hovered))]" />- {track.description}+ <CardDescription className="relative h-20 overflow-hidden pb-4">+ <TrackProgress+ completedChallenges={completedChallenges}+ totalChallenges={track.trackChallenges.length}+ /></CardDescription></CardContent></Card>diff --git a/apps/web/src/app/[locale]/tracks/_components/track-card.tsx b/apps/web/src/app/[locale]/tracks/_components/track-card.tsxindex 2a02e3c4..ddeb87b6 100644--- a/apps/web/src/app/[locale]/tracks/_components/track-card.tsx+++ b/apps/web/src/app/[locale]/tracks/_components/track-card.tsx@@ -24,7 +24,7 @@ export const bgsArray = Object.values(BGS_BY_TRACK);const EnrolledBadge = ({ text = 'Enrolled' }: { text?: string }) => (<divclassName={clsx(- 'absolute -right-[1px] -top-[20px] z-[-1] rounded rounded-tl-lg rounded-tr-xl px-5 pb-10 pt-[3px] text-[10px]',+ 'absolute -right-[1px] -top-[27px] z-[-1] rounded rounded-tl-lg rounded-tr-xl px-5 pb-10 pt-[3px] text-sm','border border-blue-400 bg-blue-400 text-white',)}>@@ -45,8 +45,8 @@ export function TrackCard({ track }: TrackProps) {: 'group-hover:border-blue-400 group-focus:border-blue-400',)}>- {track.enrolledUsers?.length ? <EnrolledBadge /> : null}- <CardContent className="flex items-center gap-5 p-2 pr-4">+ {isEnrolled ? <EnrolledBadge /> : null}+ <CardContent className="flex flex-col items-center gap-5 p-8"><divclassName={clsx(`bg-gradient-to-r from-neutral-500/10 from-10% ${@@ -63,19 +63,13 @@ export function TrackCard({ track }: TrackProps) {)}/></div>+ <div className="text-center font-semibold capitalize tracking-wide">{track.title}</div>+ <div className="text-muted-foreground line-clamp-3 text-center text-sm tracking-wide">+ {track.description}+ </div>- <div className="flex-1">- <div className="flex items-center justify-between gap-2">- <span className="line-clamp-2 font-semibold capitalize tracking-wide">- {track.title}- </span>- <Badge className="flex-none">{track._count.trackChallenges} Challenges</Badge>- </div>- <div className="h-8">- <span className="text-muted-foreground mt-3 line-clamp-2 text-xs tracking-wide">- {track.description}- </span>- </div>+ <div className="text-center">+ <Badge className="flex-none">{track._count.trackChallenges} Challenges</Badge></div></CardContent></Card>diff --git a/apps/web/src/app/[locale]/tracks/_components/track-challenge-card.tsx b/apps/web/src/app/[locale]/tracks/_components/track-challenge-card.tsxindex e2d994cf..764bcc05 100644--- a/apps/web/src/app/[locale]/tracks/_components/track-challenge-card.tsx+++ b/apps/web/src/app/[locale]/tracks/_components/track-challenge-card.tsx@@ -1,13 +1,13 @@'use client';-import { Check } from '@repo/ui/icons';+import { Check, PieChart } from '@repo/ui/icons';import clsx from 'clsx';import { useIsMobile } from '~/utils/useIsMobile';import type { Challenge, Submission } from '@repo/db/types';-import { DifficultyBadge } from '@repo/ui/components/difficulty-badge';-import RelativeTime from '../../explore/_components/relative-time';import { Badge } from '@repo/ui/components/badge';+import { DifficultyBadge } from '@repo/ui/components/difficulty-badge';+import { Tooltip, TooltipContent, TooltipTrigger } from '@repo/ui/components/tooltip';interface TrackChallengeProps {challenge: Challenge & {@@ -17,14 +17,6 @@ interface TrackChallengeProps {isCompleted: boolean;}-const COLORS_BY_DIFFICULTY = {- BEGINNER: 'text-difficulty-beginner dark:text-difficulty-beginner-dark',- EASY: 'text-difficulty-easy dark:text-difficulty-easy-dark',- MEDIUM: 'text-difficulty-medium dark:text-difficulty-medium-dark',- HARD: 'text-difficulty-hard dark:text-difficulty-hard-dark',- EXTREME: 'text-difficulty-extreme dark:text-difficulty-extreme-dark',-} as const;-const BGS_BY_DIFFICULTY = {BEGINNER: 'to-difficulty-beginner/20 dark:to-difficulty-beginner-dark/20',EASY: 'to-difficulty-easy/20 dark:to-difficulty-easy-dark/20',@@ -33,6 +25,7 @@ const BGS_BY_DIFFICULTY = {EXTREME: 'to-difficulty-extreme/20 dark:to-difficulty-extreme-dark/20',} as const;+// million-ignoreexport function TrackChallenge({ challenge, isInProgress, isCompleted }: TrackChallengeProps) {const isMobile = useIsMobile();@@ -43,7 +36,7 @@ export function TrackChallenge({ challenge, isInProgress, isCompleted }: TrackCh><divclassName={clsx(- `flex w-full items-center justify-between gap-3 overflow-hidden rounded-lg`,+ `flex w-full items-center justify-between gap-3 rounded-lg`,`bg-gradient-to-r from-neutral-500/10 from-70% ${BGS_BY_DIFFICULTY[challenge.difficulty]} to-100% dark:from-neutral-500/20`,@@ -55,20 +48,40 @@ export function TrackChallenge({ challenge, isInProgress, isCompleted }: TrackCh<div className="w-full flex-col space-y-2"><div className="flex flex-row justify-between"><div className="flex flex-row gap-3">- <div className="relative hidden items-center gap-3 md:flex md:flex-row ">- <input- className="peer hidden appearance-none"- type="checkbox"- id={challenge.id.toString()}- checked={isCompleted}- readOnly- />- <div className="h-5 w-5 rounded-full border border-black/70 bg-black/10 duration-75 peer-checked:border-transparent peer-checked:bg-green-600/80 dark:border-white/50 dark:bg-white/10 peer-checked:dark:bg-green-300/80" />- <Check className="absolute left-1 my-auto h-3 w-3 scale-0 stroke-[4] text-white duration-300 peer-checked:scale-100 dark:text-black" />- </div>+ <Tooltip>+ <TooltipTrigger asChild>+ <div className="relative hidden items-center gap-3 md:flex md:flex-row ">+ <input+ className="peer hidden appearance-none"+ type="checkbox"+ id={challenge.id.toString()}+ checked={isCompleted || isInProgress}+ readOnly+ />+ <div+ className={clsx(+ 'h-5 w-5 rounded-full border border-black/70 bg-black/10 duration-75 peer-checked:border-transparent dark:border-white/50 dark:bg-white/10 ',+ isCompleted &&+ 'peer-checked:bg-green-600/80 peer-checked:dark:bg-green-300/80',+ isInProgress &&+ 'peer-checked:bg-orange-600/80 peer-checked:dark:bg-orange-300/80',+ )}+ />+ {isCompleted ? (+ <Check className="absolute left-1 my-auto h-3 w-3 scale-0 stroke-[4] text-white duration-300 peer-checked:scale-100 dark:text-black" />+ ) : null}+ {isInProgress ? (+ <PieChart className="absolute left-1 my-auto h-3 w-3 scale-0 stroke-[4] text-white duration-300 peer-checked:scale-100 dark:text-black" />+ ) : null}+ </div>+ </TooltipTrigger>+ <TooltipContent>+ <p>{isCompleted ? 'Completed' : isInProgress ? 'Attempted' : 'Todo'}</p>+ </TooltipContent>+ </Tooltip><div className="flex flex-col items-start gap-3 md:flex-row"><div className="flex flex-col gap-2">- <span>{challenge.name}</span>+ {challenge.name}<div className="flex flex-row gap-3 md:hidden"><DifficultyBadge difficulty={challenge.difficulty} />{isCompleted && isMobile ? <Badge variant="outline">Completed</Badge> : null}@@ -89,6 +102,7 @@ export function TrackChallenge({ challenge, isInProgress, isCompleted }: TrackCh);}+// million-ignoreexport function MockTrackChallenge({ challenge }: { challenge: Challenge }) {const isMobile = useIsMobile();return (@@ -107,7 +121,7 @@ export function MockTrackChallenge({ challenge }: { challenge: Challenge }) {'group-hover/challenge:scale-105 group-hover/challenge:rounded-xl group-hover/challenge:bg-neutral-500/20',)}>- <div className="relative flex flex-row gap-3 text-xs sm:text-base">+ <div className="relative hidden items-center gap-3 md:flex md:flex-row "><inputclassName="peer hidden appearance-none"type="checkbox"diff --git a/apps/web/src/app/[locale]/tracks/_components/track-details.tsx b/apps/web/src/app/[locale]/tracks/_components/track-details.tsxindex e12a65a4..f8ae55aa 100644--- a/apps/web/src/app/[locale]/tracks/_components/track-details.tsx+++ b/apps/web/src/app/[locale]/tracks/_components/track-details.tsx@@ -7,11 +7,8 @@ import { ActionButton } from './enroll-button';import { TrackChallenge } from './track-challenge-card';import { TrackProgress } from './track-progress';import { enrollUserInTrack, getTrackDetails, unenrollUserFromTrack } from './track.action';-import { TypographyH3 } from '@repo/ui/components/typography/h3';-import { Markdown } from '@repo/ui/components/markdown';interface TrackDetailProps {- // trackidslug: string;}@@ -26,30 +23,28 @@ export const BGS_BY_TRACK: Record<number, string> = {export const bgsArray = Object.values(BGS_BY_TRACK);export async function TrackDetail({ slug }: TrackDetailProps) {- const session = await getServerAuthSession();const trackId = parseInt(slug);const track = await getTrackDetails(trackId);const trackChallenges = track?.trackChallenges ?? [];- const isEnrolled = track?.enrolledUsers.findIndex((user) => user.id === session?.user.id);+ const isEnrolled = Boolean(track?.enrolledUsers?.length);- const completedTrackChallengeId: number[] = [];- const inProgressTrackChallengeId: number[] = [];- const unattemptedTrackChallengeId: number[] = [];-- for (const trackChallenge of trackChallenges) {- const submissions = trackChallenge.challenge.submission;- if (submissions.length > 0) {- if (submissions.some((submission) => !submission.isSuccessful)) {- inProgressTrackChallengeId.push(trackChallenge.id);- }- if (submissions.some((submission) => submission.isSuccessful)) {- completedTrackChallengeId.push(trackChallenge.id);- }- } else {- unattemptedTrackChallengeId.push(trackChallenge.id);- }- }+ const completedTrackChallenges = trackChallenges+ .filter((trackChallenge) => {+ return (+ trackChallenge.challenge.submission.length &&+ trackChallenge.challenge.submission.some((submission) => submission.isSuccessful)+ );+ })+ .map((trackChallenge) => trackChallenge.id);+ const inProgressTrackChallenges = trackChallenges+ .filter((trackChallenge) => {+ return (+ trackChallenge.challenge.submission.length &&+ trackChallenge.challenge.submission.every((submission) => !submission.isSuccessful)+ );+ })+ .map((trackChallenge) => trackChallenge.id);return (<div className="container flex min-h-screen flex-col items-center gap-4 py-5 md:gap-8 md:pb-20">@@ -78,37 +73,35 @@ export async function TrackDetail({ slug }: TrackDetailProps) {{track?.description}</p></div>- {isEnrolled === -1 ? (- <ActionButton action={enrollUserInTrack} trackId={trackId} text="Enroll" />- ) : (+ {isEnrolled ? (<ActionButton action={unenrollUserFromTrack} trackId={trackId} text="Unenroll" />+ ) : (+ <ActionButton action={enrollUserInTrack} trackId={trackId} text="Enroll" />)}</div>- {isEnrolled !== -1 && (+ {isEnrolled ? (<div className="w-full md:w-3/4 "><TrackProgress- completedChallenges={completedTrackChallengeId.length}+ completedChallenges={completedTrackChallenges.length}totalChallenges={trackChallenges.length}/></div>- )}+ ) : null}<div className="flex w-full flex-row justify-around gap-8"><div className="flex flex-col space-y-2 md:w-3/4"><div className="grid-col grid grid-cols-1 gap-2 self-stretch">- {trackChallenges- .sort((a, b) => a.orderId - b.orderId)- .map((trackChallenge) => (- <Link- key={trackChallenge.challenge.id}- href={`/challenge/${trackChallenge.challenge.id}`}- >- <TrackChallenge- challenge={trackChallenge.challenge}- isCompleted={completedTrackChallengeId.includes(trackChallenge.id)}- isInProgress={inProgressTrackChallengeId.includes(trackChallenge.id)}- />- </Link>- ))}+ {trackChallenges.map((trackChallenge) => (+ <Link+ key={trackChallenge.challenge.id}+ href={`/challenge/${trackChallenge.challenge.id}`}+ >+ <TrackChallenge+ challenge={trackChallenge.challenge}+ isCompleted={completedTrackChallenges.includes(trackChallenge.id)}+ isInProgress={inProgressTrackChallenges.includes(trackChallenge.id)}+ />+ </Link>+ ))}</div></div></div>diff --git a/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx b/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsxindex d388664b..b6182575 100644--- a/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx+++ b/apps/web/src/app/[locale]/tracks/_components/track-enrolled-section.tsx@@ -54,7 +54,7 @@ export async function EnrolledTrackSection() {</>) : (<div- className="relative my-10 grid min-h-[246px] w-full items-center gap-2 px-5 md:grid-cols-2 md:gap-10"+ className="relative grid min-h-[246px] w-full items-center gap-2 px-5 md:grid-cols-2 md:gap-10"key="helper-track"><div className="text-center md:text-right">diff --git a/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx b/apps/web/src/app/[locale]/tracks/_components/track-grid.tsxindex 71d97468..7723e605 100644--- a/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx+++ b/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx@@ -5,13 +5,9 @@ import { TrackCard } from './track-card';export async function TrackGrid() {const tracks = await getTracks();return (- <div className="flex flex-col justify-between gap-4">- <div className="container relative text-3xl font-bold tracking-tight">- <div className="absolute -left-8 -z-10 h-12 w-32 rounded-full bg-blue-300/50 blur-3xl" />- <h3>All Tracks ✨</h3>- </div>- <section className="container grid w-full grid-flow-row grid-cols-1 gap-6 lg:grid-cols-2 xl:grid-cols-3">- {tracks?.map((t) => <TrackCard key={`track-${t.id}`} track={t} />)}+ <div className="container flex items-center justify-between gap-3">+ <section className="grid w-full grid-flow-row grid-cols-1 gap-10 lg:grid-cols-2 xl:grid-cols-3">+ {tracks?.map((track) => <TrackCard key={`track-${track.id}`} track={track} />)}</section></div>);@@ -19,9 +15,6 @@ export async function TrackGrid() {export type Tracks = Awaited<ReturnType<typeof getTracks>>;-/**- * Fetches all tracks.- */async function getTracks() {const session = await getServerAuthSession();return prisma.track.findMany({diff --git a/apps/web/src/app/[locale]/tracks/_components/track.action.ts b/apps/web/src/app/[locale]/tracks/_components/track.action.tsindex 7b85da5b..4faa0db8 100644--- a/apps/web/src/app/[locale]/tracks/_components/track.action.ts+++ b/apps/web/src/app/[locale]/tracks/_components/track.action.ts@@ -55,12 +55,10 @@ export const getTrackDetails = cache(async (id: number) => {id,},include: {- _count: {- select: {- enrolledUsers: true,- },- },trackChallenges: {+ orderBy: {+ orderId: 'asc',+ },include: {challenge: {include: {diff --git a/apps/web/tests/e2e/explore.test.ts b/apps/web/tests/e2e/explore.test.tsindex 152b97bc..9e43d729 100644--- a/apps/web/tests/e2e/explore.test.ts+++ b/apps/web/tests/e2e/explore.test.ts@@ -3,5 +3,5 @@ import { test, expect } from '@playwright/test';test('explore page', async ({ page }) => {await page.goto('/explore');- await expect(page.getByRole('heading', { name: 'TypeHero Explore' })).toBeVisible();+ await expect(page.getByRole('heading', { name: 'Explore' })).toBeVisible();});diff --git a/packages/ui/src/icons.ts b/packages/ui/src/icons.tsindex db9d414d..58064d07 100644--- a/packages/ui/src/icons.ts+++ b/packages/ui/src/icons.ts@@ -27,8 +27,10 @@ export {MailCheck,Maximize2,MessageCircle,+ Minus,Moon,Pencil,+ PieChart,Play,Plus,Reply,