Skip to content

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

feat(aot): adds hassolved property

bautistaaa8727a9b08911
diff --git a/apps/aot/src/app/events/[year]/DayLink.tsx b/apps/aot/src/app/events/[year]/day-active.tsx
similarity index 75%
rename from apps/aot/src/app/events/[year]/DayLink.tsx
rename to apps/aot/src/app/events/[year]/day-active.tsx
index 1703a8d4..1fb58598 100644
--- a/apps/aot/src/app/events/[year]/DayLink.tsx
+++ b/apps/aot/src/app/events/[year]/day-active.tsx
@@ -13,7 +13,7 @@ const colorsArray = [
'from-pink-200 dark:from-pink-800 via-pink-600 dark:via-pink-400 to-pink-100 dark:to-pink-900',
];
-export default function DayLink({ day }: { day: number }) {
+export default function DayActive({ day, hasSolved }: { day: number; hasSolved: boolean }) {
return (
<motion.div
key={day}
@@ -38,16 +38,10 @@ export default function DayLink({ day }: { day: number }) {
height={64}
/>
)}
- {/* <div className="pointer-events-none absolute -left-4 -top-4 select-none text-6xl font-black text-white/20 lg:text-8xl">
- {day}
- </div>
- <div className="pointer-events-none absolute left-1/2 top-1/2 -translate-x-1/2 -translate-y-1/2 select-none text-6xl font-black text-white/30 lg:text-8xl">
- {day}
- </div>
- <div className="pointer-events-none absolute -bottom-4 -right-4 select-none text-6xl font-black text-white/40 lg:text-8xl">
- {day}
- </div> */}
- <h1 className="z-10 font-bold">{day}</h1>
+ <h1 className="z-10 font-bold">
+ {day}
+ {hasSolved ? 's' : undefined}
+ </h1>
</div>
</motion.div>
);
diff --git a/apps/aot/src/app/events/[year]/DayDisabled.tsx b/apps/aot/src/app/events/[year]/day-inactive.tsx
similarity index 97%
rename from apps/aot/src/app/events/[year]/DayDisabled.tsx
rename to apps/aot/src/app/events/[year]/day-inactive.tsx
index 83f8878c..b6d35515 100644
--- a/apps/aot/src/app/events/[year]/DayDisabled.tsx
+++ b/apps/aot/src/app/events/[year]/day-inactive.tsx
@@ -11,7 +11,7 @@ const colorsArray = [
'from-pink-200 dark:from-pink-800 via-pink-600 dark:via-pink-400 to-pink-100 dark:to-pink-900',
];
-export default function DayDisabled({ day }: { day: number }) {
+export default function DayInactive({ day }: { day: number }) {
return (
<motion.div
key={day}
diff --git a/apps/aot/src/app/events/[year]/page.tsx b/apps/aot/src/app/events/[year]/page.tsx
index 6b719dbb..47722f93 100644
--- a/apps/aot/src/app/events/[year]/page.tsx
+++ b/apps/aot/src/app/events/[year]/page.tsx
@@ -7,10 +7,12 @@ import { isValidAdventYear } from '~/utils/time-utils';
import gift1 from '~/../public/giftbox.png';
import gift2 from '~/../public/giftbox2.png';
import gift3 from '~/../public/giftbox3.png';
-import DayLink from './DayLink';
+import DayActive from './day-active';
import BgDecorations from './24BgDecorations';
-import DayDisabled from './DayDisabled';
+import DayInactive from './day-inactive';
+import type { RouterOutputs } from '~/trpc/react';
+type Challenge = RouterOutputs['event']['getEventChallengesByYear'][0];
interface Props {
params: {
year: string;
@@ -24,48 +26,29 @@ export async function generateMetadata() {
});
}
-const gifts = [gift1, gift2, gift3];
+const GIFTS = [gift1, gift2, gift3];
export default async function EventByYearLandingPage({ params }: Props) {
const year = Number(params.year);
if (!isValidAdventYear(year)) return notFound();
- const event = await api.event.getEventChallengesByYear({ year });
- const daysCompleted = event.trackChallenges.length;
+ // this will only return challenges that have passed/currently active
+ const activeEventChallenges = await api.event.getEventChallengesByYear({ year });
+ const daysThatHavePassed = activeEventChallenges.length;
- const daysLeftArray = Array.from({ length: 25 - daysCompleted }, (_, i) => daysCompleted + i + 1);
+ const inactiveEventChallenges = Array.from({ length: 25 - daysThatHavePassed }, (_, i) => ({
+ id: daysThatHavePassed + i + 1,
+ hasSolved: false,
+ active: false,
+ })) as Challenge[];
- function groupDays(array: { id: number; active: boolean }[]) {
- const grouped = [];
- let rowSize = 1; // Start with a row size of 1
- let i = 0;
+ const eventChallenges = [...activeEventChallenges, ...inactiveEventChallenges];
- while (i < array.length) {
- grouped.push(array.slice(i, i + rowSize));
- i += rowSize;
- rowSize++; // Increase row size for the next group
- }
+ const firstTwentyTwo = eventChallenges.slice(0, 22);
+ const groupedDays = groupDays(firstTwentyTwo);
+ const lastThree = eventChallenges.slice(-3);
- return grouped;
- }
-
- // create new array of numbers 1-event.trackChallenges.length
- const activeDays = Array.from({ length: daysCompleted }, (_, i) => i + 1);
- // create array of objects with id: number, active: boolean
- const newArray = activeDays.map((day) => ({ id: day, active: true }));
- // fill the rest with inactive
- newArray.push(
- ...Array.from({ length: 25 - daysCompleted }, (_, i) => ({
- id: daysCompleted + i + 1,
- active: false,
- })),
- ); // fill the rest with inactive
- // const groupedActive = groupDays(activeDays);
-
- const first22ofnewarray = newArray.slice(0, 22);
-
- const groupedDays = groupDays(first22ofnewarray);
- const lastThree = newArray.slice(-3);
+ console.log({ eventChallenges: eventChallenges[0] });
return (
<div className="-mt-14 flex min-h-screen flex-col justify-center overflow-hidden bg-gradient-to-t from-neutral-400/10 to-transparent">
@@ -82,10 +65,10 @@ export default async function EventByYearLandingPage({ params }: Props) {
<>
{day.active ? (
<Link key={day.id} href={`/events/${year}/${day.id}`}>
- <DayLink day={day.id} />
+ <DayActive day={day.id} hasSolved={day.hasSolved} />
</Link>
) : (
- <DayDisabled day={day.id} key={day.id} />
+ <DayInactive day={day.id} key={day.id} />
)}
</>
))}
@@ -106,7 +89,7 @@ export default async function EventByYearLandingPage({ params }: Props) {
} group-hover:brightness-90 dark:brightness-50 ${
index == 0 && '-translate-y-[calc(50%+0.5rem)]'
}`}
- src={gifts[index]!}
+ src={GIFTS[index]!}
alt="Day 23"
width={64}
height={64}
@@ -122,3 +105,17 @@ export default async function EventByYearLandingPage({ params }: Props) {
</div>
);
}
+
+function groupDays(array: Challenge[]) {
+ const grouped = [];
+ let rowSize = 1; // Start with a row size of 1
+ let i = 0;
+
+ while (i < array.length) {
+ grouped.push(array.slice(i, i + rowSize));
+ i += rowSize;
+ rowSize++; // Increase row size for the next group
+ }
+
+ return grouped;
+}
diff --git a/apps/aot/src/server/api/routers/event.ts b/apps/aot/src/server/api/routers/event.ts
index add14eab..a0f108ba 100644
--- a/apps/aot/src/server/api/routers/event.ts
+++ b/apps/aot/src/server/api/routers/event.ts
@@ -104,7 +104,12 @@ export const eventRouter = createTRPCRouter({
submission: {
where: {
userId: ctx.session?.user?.id || '',
+ isSuccessful: true,
},
+ select: {
+ isSuccessful: true,
+ },
+ take: 1,
},
user: {
select: {
@@ -118,6 +123,13 @@ export const eventRouter = createTRPCRouter({
},
});
- return challenges;
+ return challenges?.trackChallenges.map((trackChallenge) => {
+ const { submission, ...challenge } = trackChallenge.challenge;
+ return {
+ ...challenge,
+ hasSolved: trackChallenge.challenge.submission.length > 0,
+ active: true,
+ };
+ });
}),
});