From cd15df376dd0182dafd4e69c97f0fde1fe65b8b0 Mon Sep 17 00:00:00 2001 From: Sargam Poudel Date: Tue, 4 Feb 2025 10:33:32 +0530 Subject: [PATCH 1/2] fix: admin not being able to add tracks --- apps/web/app/api/AddTracks/route.ts | 5 ++++- apps/web/components/Hero.tsx | 14 +++++++------- apps/web/components/admin/CompleteTrackCard.tsx | 1 + apps/web/tailwind.config.js | 2 +- 4 files changed, 13 insertions(+), 9 deletions(-) diff --git a/apps/web/app/api/AddTracks/route.ts b/apps/web/app/api/AddTracks/route.ts index 033ad122..26b0111d 100644 --- a/apps/web/app/api/AddTracks/route.ts +++ b/apps/web/app/api/AddTracks/route.ts @@ -14,7 +14,10 @@ export async function POST(req: NextRequest) { const notion = new NotionAPI(); try { const recordMap = await notion.getPage(notionId); - const data = Object.keys(recordMap.block).map((key) => { + const data = Object.keys(recordMap.block).filter((key) => { + const block = recordMap.block[key]; + return block?.role !== "none" + }).map((key) => { const block = recordMap.block[key]; return { notionDocId: block?.value.id, diff --git a/apps/web/components/Hero.tsx b/apps/web/components/Hero.tsx index 34fead2d..82eafc08 100644 --- a/apps/web/components/Hero.tsx +++ b/apps/web/components/Hero.tsx @@ -115,13 +115,13 @@ export default function Hero({ tracks }: { tracks: TrackPros[] }) { gradientUnits="userSpaceOnUse" gradientTransform="matrix(12.12436 -7 4.2 7.27461 16 16)" > - - - - - - - + + + + + + + diff --git a/apps/web/components/admin/CompleteTrackCard.tsx b/apps/web/components/admin/CompleteTrackCard.tsx index e659f988..2e3f7c57 100644 --- a/apps/web/components/admin/CompleteTrackCard.tsx +++ b/apps/web/components/admin/CompleteTrackCard.tsx @@ -34,6 +34,7 @@ const CompleteTrackCard = ({ notionId, TrackData }: { notionId: string; TrackDat problems: problems, selectedCategory: TrackData.selectedCategory, cohort: parseInt(TrackData.cohort), + trackType: "NOTION", }); await insertData(TrackData.trackId); setIsSubmitting(true); diff --git a/apps/web/tailwind.config.js b/apps/web/tailwind.config.js index d12d01c4..62b8fea7 100644 --- a/apps/web/tailwind.config.js +++ b/apps/web/tailwind.config.js @@ -2,7 +2,7 @@ module.exports = { darkMode: ["class"], content: [ - "../../packages/ui/**/*.{ts,tsx}", + "../../packages/ui/src/**/*.{ts,tsx}", "./app/**/*.{ts,tsx}", "./pages/**/*.{ts,tsx}", "./components/**/*.{ts,tsx}", From 6ff0e70df754f0a8fc3ad5d93ece235edc909856 Mon Sep 17 00:00:00 2001 From: Sargam Poudel Date: Tue, 4 Feb 2025 10:33:46 +0530 Subject: [PATCH 2/2] fix: filter for cohort selection --- apps/web/components/Tracks.tsx | 11 +---------- 1 file changed, 1 insertion(+), 10 deletions(-) diff --git a/apps/web/components/Tracks.tsx b/apps/web/components/Tracks.tsx index d9af482c..9baa3c08 100644 --- a/apps/web/components/Tracks.tsx +++ b/apps/web/components/Tracks.tsx @@ -61,16 +61,7 @@ export const Tracks = ({ tracks, categories }: TracksWithCategoriesProps) => { const filterTracks = () => { setLoading(true); - let newFilteredTracks = tracks; - if (selectedCohort) { - newFilteredTracks = newFilteredTracks.filter((t) => t.cohort === selectedCohort); - } - if (selectedCategory && selectedCategory !== "All") { - newFilteredTracks = newFilteredTracks.filter((t) => - t.categories.some((c) => c.category.category === selectedCategory) - ); - } - setFilteredTracks(newFilteredTracks); + setFilteredTracks(tracks.filter((t) => selectedCohort === 3 ? t.cohort === 3 : t.cohort !== 3)); setCurrentPage(1); // Reset to first page on filtering setLoading(false); };