Connect, collaborate, and grow with a community of TypeScript developers
updating event page (#1627)
Amanuel Odicho849bd8e566c7
diff --git a/apps/aot/src/app/events/[year]/page.tsx b/apps/aot/src/app/events/[year]/page.tsxindex ab57a5f0..5c3f39ae 100644--- a/apps/aot/src/app/events/[year]/page.tsx+++ b/apps/aot/src/app/events/[year]/page.tsx@@ -9,6 +9,10 @@ interface Props {export default async function EventByYearLandingPage({ params: { year } }: Props) {const event = await api.event.getEventChallengesByYear({ year });+ const daysCompleted = event.trackChallenges.length;++ const daysLeftArray = Array.from({ length: 25 - daysCompleted }, (_, i) => daysCompleted + i + 1);+return (<div><h1>Challenges for {year}</h1>@@ -20,6 +24,11 @@ export default async function EventByYearLandingPage({ params: { year } }: Props</Link></li>))}+ {daysLeftArray.map((day) => (+ <div key={day} className="day-left">+ Day {day}+ </div>+ ))}</ul></div>);diff --git a/apps/aot/src/app/leaderboard/getAotChallengeIds.ts b/apps/aot/src/app/leaderboard/getAotChallengeIds.tsindex a68ab0ed..2f64410d 100644--- a/apps/aot/src/app/leaderboard/getAotChallengeIds.ts+++ b/apps/aot/src/app/leaderboard/getAotChallengeIds.ts@@ -4,32 +4,37 @@ import { getCurrentAdventDay } from '~/utils/time-utils';export const getAotChallengeIdsSoFar = async () => {const currentAdventDay = getCurrentAdventDay();- const year = new Date().getUTCFullYear().toString();- const day = String(currentAdventDay);- const endSlug = getAotSlug({ year, day });+ // TODO: Put leaderboard under event/[year]/leaderboard+ // pass in year from slug+ const year = new Date().getUTCFullYear();// Fetch challenges for December up to the current day in a single query- const challengesSoFar = await prisma.challenge.findMany({+ const challengesSoFar = await prisma.track.findFirstOrThrow({where: {- slug: {- gte: `${year}-1`,- lte: endSlug,- },- },- orderBy: {- slug: 'asc',+ slug: `advent-of-typescript-${year}`,},select: {- id: true,+ trackChallenges: {+ where: {+ orderId: {+ gte: 0,+ lte: currentAdventDay - 1,+ },+ },+ },},});- const challengeIdsSoFar = challengesSoFar.map((challenge) => challenge.id);+ const challengeIdsSoFar = challengesSoFar.trackChallenges.map(+ (trackChallenge) => trackChallenge.challengeId,+ );return challengeIdsSoFar;};export const getAotChallengeIdForAdventDay = async (adventDay: number) => {+ // TODO: Put leaderboard under event/[year]/leaderboard+ // pass in year from slugconst year = new Date().getUTCFullYear().toString();const day = String(adventDay);const slug = getAotSlug({ year, day });diff --git a/apps/aot/src/server/api/routers/event.ts b/apps/aot/src/server/api/routers/event.tsindex 91e8a78b..07418755 100644--- a/apps/aot/src/server/api/routers/event.ts+++ b/apps/aot/src/server/api/routers/event.ts@@ -1,5 +1,6 @@import { z } from 'zod';import { createTRPCRouter, publicProcedure } from '~/server/api/trpc';+import { getCurrentAdventDay } from '~/utils/time-utils';import { validateCompilerOptions } from '~/utils/validateCompilerOptions';const AOT_TRACKS = ['advent-of-typescript-2023', 'advent-of-typescript-2024'];@@ -80,6 +81,8 @@ export const eventRouter = createTRPCRouter({}),).query(async ({ ctx, input }) => {+ const currentAdventDay = getCurrentAdventDay();+const challenges = await ctx.db.track.findFirstOrThrow({where: {slug: `advent-of-typescript-${input.year}`,@@ -89,6 +92,12 @@ export const eventRouter = createTRPCRouter({orderBy: {orderId: 'asc',},+ where: {+ orderId: {+ gte: 0,+ lte: currentAdventDay - 1,+ },+ },include: {challenge: {include: {diff --git a/apps/aot/src/utils/time-utils.ts b/apps/aot/src/utils/time-utils.tsindex f8716b49..fa7bc64d 100644--- a/apps/aot/src/utils/time-utils.ts+++ b/apps/aot/src/utils/time-utils.ts@@ -1,18 +1,25 @@export function hasAdventStarted() {- const aoStartTime = new Date(Date.UTC(2024, 11, 1, 5, 0, 0));- return Date.now() >= aoStartTime.getTime();+ const today = new Date().getTime();+ const aotStartTime = new Date(Date.UTC(2024, 11, 1, 5, 0, 0));++ return today >= aotStartTime.getTime();}export function getCurrentAdventDay() {const MS_PER_DAY = 24 * 60 * 60 * 1000;- const today = Date.now();+ const today = new Date().getTime();const startDate = new Date('2024-12-01T05:00:00.000Z').getTime();+ const endDate = new Date('2024-12-26T05:00:00.000Z').getTime();if (today < startDate) {return 0; // not advent yet!}+ if (today > endDate) {+ return 25;+ }+const adventDay = Math.floor((today - startDate) / MS_PER_DAY) + 1;return adventDay;