Skip to content

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

chore: last min cleanup (#953)

bautistaaaa422640576bc
diff --git a/apps/web/src/app/[locale]/tracks/_components/track-card-soon.tsx b/apps/web/src/app/[locale]/tracks/_components/track-card-soon.tsx
index 568b985a..1750952e 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track-card-soon.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/track-card-soon.tsx
@@ -31,7 +31,7 @@ export function TrackCardSoon({ track }: TrackProps) {
const isEnrolled = Boolean(track.enrolledUsers?.length);
return (
- <Link href={`/tracks/${track.slug}`} className="group">
+ <div className="group">
<Card
className={clsx(
'relative overflow-hidden border-dashed duration-300',
@@ -73,6 +73,6 @@ export function TrackCardSoon({ track }: TrackProps) {
</div>
</CardContent>
</Card>
- </Link>
+ </div>
);
}
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 15c0457c..a918972b 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track-details.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/track-details.tsx
@@ -7,6 +7,7 @@ import { TrackChallenge } from './track-challenge-card';
import { TrackProgress } from './track-progress';
import { enrollUserInTrack, getTrackDetails, unenrollUserFromTrack } from './track.action';
import { Footsies } from '~/components/footsies';
+import { notFound } from 'next/navigation';
interface TrackDetailProps {
slug: string;
@@ -25,6 +26,10 @@ export const bgsArray = Object.values(BGS_BY_TRACK);
export async function TrackDetail({ slug }: TrackDetailProps) {
const track = await getTrackDetails(slug);
+ if (track.isComingSoon || !track.visible) {
+ return notFound();
+ }
+
const trackChallenges = track.trackChallenges ?? [];
const isEnrolled = Boolean(track.enrolledUsers?.length);
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 b1f2fb85..cbc47d3b 100644
--- a/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx
+++ b/apps/web/src/app/[locale]/tracks/_components/track-grid.tsx
@@ -17,11 +17,13 @@ export async function TrackGrid() {
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">
- {tracks?.map((track) => <TrackCard key={`track-${track.id}`} track={track} />)}
- {/* Coming Soon:tm: cards */}
- {tracks
- ?.splice(0, 1)
- .map((track) => <TrackCardSoon key={`track-${track.id}`} track={track} />)}
+ {tracks?.map((track) => {
+ if (track.isComingSoon) {
+ return <TrackCardSoon key={`track-${track.id}`} track={track} />;
+ }
+
+ return <TrackCard key={`track-${track.id}`} track={track} />;
+ })}
</section>
</div>
);
@@ -46,5 +48,8 @@ async function getTracks(session: Session | null) {
where: {
visible: true,
},
+ orderBy: {
+ isComingSoon: 'asc',
+ },
});
}
diff --git a/packages/db/seed/data/tracks.ts b/packages/db/seed/data/tracks.ts
index f95fc2db..b60c37be 100644
--- a/packages/db/seed/data/tracks.ts
+++ b/packages/db/seed/data/tracks.ts
@@ -22,6 +22,6 @@ export const tracks = [
{
name: 'TypeScript Foundations',
description:
- "'TypeScript Foundations' is a curated set of challenges designed to build a strong foundation. From basic syntax to advanced concepts, this collection offers hands-on exercises to help you become a TypeScript Hero.",
+ 'TypeScript Foundations is a curated set of challenges designed to build a strong foundation. From basic syntax to advanced concepts, this collection offers hands-on exercises to help you become a TypeScript Hero.',
},
];
diff --git a/packages/db/temp/populate-tokens.ts b/packages/db/temp/populate-tokens.ts
index 3af96113..356465c9 100644
--- a/packages/db/temp/populate-tokens.ts
+++ b/packages/db/temp/populate-tokens.ts
@@ -16,7 +16,6 @@ async function populateTokens() {
await prisma.betaTokens.createMany({
data: Array.from(new Array(TOKEN_LIMIT).keys()).map(() => {
return {
- isClaimed: false,
token: generateRandomStr(),
};
}),