Skip to content

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

feat: indicate when a track is finished (#1179)

Nkemjikanmae92f47aed91e
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-card.tsx b/apps/web/src/app/[locale]/tracks/_components/track-card.tsx
index 004335e1..f911dc22 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track-card.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/track-card.tsx
@@ -4,6 +4,7 @@ import { Swords } from '@repo/ui/icons';
import { clsx } from 'clsx';
import Link from 'next/link';
import type { Tracks } from './track-grid';
+import { useMemo } from 'react';
interface TrackProps {
track: Tracks[number];
@@ -19,21 +20,39 @@ export const BGS_BY_TRACK: Record<number, string> = {
} as const;
export const bgsArray = Object.values(BGS_BY_TRACK);
-const EnrolledBadge = ({ text = 'Enrolled' }: { text?: string }) => (
- <div className="text-background absolute left-0 top-0 z-10 rounded-br-3xl bg-[#3078c5] px-5 py-1.5 text-sm font-bold dark:bg-blue-400">
+const EnrolledAndCompletedBadge = ({ text = 'Enrolled' }: { text?: string }) => (
+ <div
+ className={clsx(
+ 'text-background absolute left-0 top-0 z-10 rounded-br-3xl bg-[#3078c5] px-5 py-1.5 text-sm font-bold dark:bg-blue-400',
+ text === 'Completed' && 'bg-green-700 text-white dark:bg-green-500',
+ )}
+ >
{text}
</div>
);
export function TrackCard({ track }: TrackProps) {
- const isEnrolled = Boolean(track.enrolledUsers?.length);
+ const { trackChallenges, enrolledUsers } = track;
+ const isEnrolled = Boolean(enrolledUsers?.length);
+
+ const completedChallenges = useMemo(
+ () =>
+ trackChallenges?.filter((trackChallenge) =>
+ trackChallenge.challenge.submission.some((submission) => submission.isSuccessful),
+ ).length ?? 0,
+ [trackChallenges],
+ );
+
+ const isCompleted = completedChallenges === track._count.trackChallenges;
return (
<Link href={`/tracks/${track.slug}`} className="group">
<Card
className={clsx(
'relative overflow-hidden duration-300',
- isEnrolled
+ isCompleted
+ ? 'border-green-700 dark:border-green-500'
+ : isEnrolled
? 'border-[#3078c5] dark:border-blue-400'
: 'dark:group-hover:border-border group-hover:border-neutral-400 group-hover:shadow-xl group-focus:border-neutral-500 dark:group-hover:shadow dark:group-hover:shadow-neutral-400/70',
)}
@@ -72,7 +91,9 @@ export function TrackCard({ track }: TrackProps) {
)}
/>
</div>
- {isEnrolled ? <EnrolledBadge /> : null}
+ {isEnrolled || isCompleted ? (
+ <EnrolledAndCompletedBadge text={isCompleted ? 'Completed' : undefined} />
+ ) : null}
<CardContent className="relative z-10 flex flex-col items-center gap-5 p-8">
<div
className={clsx(
@@ -96,7 +117,9 @@ export function TrackCard({ track }: TrackProps) {
</div>
<div className="text-center">
- <Badge className="flex-none">{track._count.trackChallenges} Challenges</Badge>
+ <Badge className="flex-none" variant={isCompleted ? 'completed' : 'default'}>
+ {track._count.trackChallenges} Challenges
+ </Badge>
</div>
</CardContent>
</Card>
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-details.tsx b/apps/web/src/app/[locale]/tracks/_components/track-details.tsx
index 0a22fcba..6ad89483 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track-details.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/track-details.tsx
@@ -4,7 +4,6 @@ import { Swords } from '@repo/ui/icons';
import { clsx } from 'clsx';
import { ActionButton } from './enroll-button';
import { TrackChallenge } from './track-challenge-card';
-import { track as vercelTrack } from '@vercel/analytics';
import { TrackProgress } from './track-progress';
import { enrollUserInTrack, getTrackDetails, unenrollUserFromTrack } from './track.action';
import { Footsies } from '~/components/footsies';
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx b/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx
index 0d2fc666..08573a11 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx
@@ -1,19 +1,13 @@
import { auth, type Session } from '@repo/auth/server';
import { prisma } from '@repo/db';
-import { withUnstableCache } from '~/utils/withUnstableCache';
import { TrackCard } from './track-card';
import { TrackCardSoon } from './track-card-soon';
-import { createTrackGridCacheKey } from './track.action';
export async function TrackGrid() {
const session = await auth();
- const tracks = await withUnstableCache({
- fn: getTracks,
- args: [session],
- keys: [createTrackGridCacheKey(session?.user.id ?? '')],
- tags: [createTrackGridCacheKey(session?.user.id ?? '')],
- });
+ const tracks = await getTracks(session);
+
return (
<div className="container">
<section className="w-[calc(100% + 8rem)] grid grid-cols-1 gap-4 sm:px-8 md:-mx-16 md:grid-cols-2 md:px-0 lg:mx-0 lg:w-full xl:grid-cols-3 2xl:gap-8">
@@ -44,6 +38,19 @@ async function getTracks(session: Session | null) {
id: session?.user.id ?? '',
},
},
+ trackChallenges: {
+ include: {
+ challenge: {
+ include: {
+ submission: {
+ where: {
+ userId: session?.user.id,
+ },
+ },
+ },
+ },
+ },
+ },
},
where: {
visible: true,
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-progress.tsx b/apps/web/src/app/[locale]/tracks/_components/track-progress.tsx
index bdf64c1b..b758d5ac 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track-progress.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/track-progress.tsx
@@ -6,10 +6,13 @@ interface TrackProgressProps {
}
export function TrackProgress({ completedChallenges, totalChallenges }: TrackProgressProps) {
+ const challengeStatus = completedChallenges < totalChallenges ? 'Progress' : 'Completed';
+ const challengeIndicatorColor =
+ challengeStatus === 'Completed' ? 'bg-green-500 dark:bg-green-700' : undefined;
return (
<div className="flex w-full flex-col">
<div className="mb-2 flex flex-row items-center justify-between">
- <span className="text-muted-foreground text-sm">Progress</span>
+ <span className="text-muted-foreground text-sm">{challengeStatus}</span>
<span className="text-muted-foreground text-sm">
{completedChallenges}/{totalChallenges}
</span>
@@ -17,6 +20,7 @@ export function TrackProgress({ completedChallenges, totalChallenges }: TrackPro
<Progress
className="h-[8px] bg-neutral-300 dark:bg-neutral-800"
value={(completedChallenges / totalChallenges) * 100}
+ indicatorClassName={challengeIndicatorColor}
/>
</div>
);
diff --git a/apps/web/src/app/[locale]/tracks/_components/track.action.ts b/apps/web/src/app/[locale]/tracks/_components/track.action.ts
index d0cd980b..98a21a29 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track.action.ts
+++ b/apps/web/src/app/[locale]/tracks/_components/track.action.ts
@@ -6,8 +6,6 @@ import { revalidateTag } from 'next/cache';
import { cache } from 'react';
import { track } from '@vercel/analytics/server';
-export const createTrackGridCacheKey = (userId: string) => `user-${userId}-tracks`;
-
/**
* Enrolls the session user in the track given a track id.
* @param id The track id.
@@ -33,7 +31,6 @@ export async function enrollUserInTrack(id: number, slug: string) {
track?.('track-action', { action: 'enrolled', slug });
revalidateTag(`track-${id}-detail`);
- revalidateTag(createTrackGridCacheKey(session.user.id));
}
/**
@@ -61,7 +58,6 @@ export async function unenrollUserFromTrack(id: number, slug: string) {
track?.('track-action', { action: 'unenrolled', slug });
revalidateTag(`track-${id}-detail`);
- revalidateTag(createTrackGridCacheKey(session.user.id));
}
/**
diff --git a/packages/ui/src/components/badge.tsx b/packages/ui/src/components/badge.tsx
index b7d25f6b..e5fdb388 100644
--- a/packages/ui/src/components/badge.tsx
+++ b/packages/ui/src/components/badge.tsx
@@ -8,6 +8,7 @@ const badgeVariants = cva(
variants: {
variant: {
default: 'bg-primary border-transparent text-primary-foreground',
+ completed: 'dark:bg-green-500 bg-green-700 border-transparent text-primary-foreground',
secondary: 'bg-secondary border-transparent text-secondary-foreground dark:bg-zinc-700',
destructive: 'bg-destructive border-transparent text-destructive-foreground',
outline: 'text-foreground',