unscrewed up ideas a little bit

Author: abhitrueprogrammer

src/api/fetchIdeas.ts

@@ -8,36 +8,71 @@ const submissionSchema = z.object({
   github_link: z.string().nullable(),
   figma_link: z.string().nullable(),
   other_link: z.string().nullable(),
-  team_id: z.string()
+  team_id: z.string(),
 });
 
 const submissionResponseSchema = z.object({
   status: z.string(),
-  data: submissionSchema.nullable()
+  data: submissionSchema.nullable(),
 });
 
 export type Submission = z.infer<typeof submissionSchema>;
+
 export type SubmissionResponse = z.infer<typeof submissionResponseSchema>;
 
-export const fetchSubmission = async (teamId: string): Promise<Submission | null> => {
+const ideaSchema = z.object({
+  ID: z.string(), // UUID format for IDs
+  Title: z.string(),
+  Description: z.string(),
+  Track: z.string(),
+  TeamID: z.string(),
+  IsSelected: z.boolean(),
+  CreatedAt: z.string(), // ISO 8601 date string
+  UpdatedAt: z.string(), // ISO 8601 date string
+});
+
+export const ideasResponseSchema = z.object({
+  status: z.string(), // Ensures the status is always "success"
+  message: z.string(),
+  data: z.array(ideaSchema),
+});
+export type ideaType = z.infer<typeof ideaSchema>;
+
+export type ideaResponseType = z.infer<typeof ideasResponseSchema>;
+
+export const fetchIdeas = async (id?: number) => {
   try {
-    const response = await axios.get(`/submission/get`, {
-      params: { teamId },
-      headers: {
-        'Content-Type': 'application/json',
-      },
-      withCredentials: true
-    });
-
-    const parsedResponse = submissionResponseSchema.parse(response.data);
-    
-    if (parsedResponse.status === "success" && parsedResponse.data) {
-      return parsedResponse.data;
-    }
-    
-    return null;
-  } catch (error) {
-    console.error(`Error fetching submission for team ${teamId}:`, error);
-    return null;
+    const response = await axios.get<ideaResponseType>(`admin/ideas`);
+    const parsedResponse = ideasResponseSchema.parse(response.data);
+    console.log(parsedResponse);
+    return parsedResponse.data;
+  } catch (err) {
+    console.log(err);
+    throw err;
   }
-};
+};
+
+// export const fetchSubmission = async (
+//   teamId: string,
+// ): Promise<Submission | null> => {
+//   try {
+//     const response = await axios.get(`/submission/get`, {
+//       params: { teamId },
+//       headers: {
+//         "Content-Type": "application/json",
+//       },
+//       withCredentials: true,
+//     });
+
+//     const parsedResponse = submissionResponseSchema.parse(response.data);
+
+//     if (parsedResponse.status === "success" && parsedResponse.data) {
+//       return parsedResponse.data;
+//     }
+
+//     return null;
+//   } catch (error) {
+//     console.error(`Error fetching submission for team ${teamId}:`, error);
+//     return null;
+//   }
+// };

src/api/fetchTeamDetails.ts

@@ -92,4 +92,6 @@ export const fetchTeamDetails = async ({ uuid }: { uuid: string }) => {
     console.log(err);
     throw err;
   }
-};
+};
+
+

src/api/leaderboard.ts

@@ -48,7 +48,7 @@ export const fetchLeaderboard = async ({
       params.append("cursor", cursorId);
     }
 
-    const url = `admin/users?${params.toString()}`;
+    const url = `admin/leaderboard?${params.toString()}`;
 
     const response = await axios.get<LeaderboardResponse>(url);
 

src/app/idea/page.tsx

@@ -1,5 +1,5 @@
 "use client";
-import { fetchSubmission, type Submission } from "@/api/fetchIdeas";
+import { fetchIdeas, ideaType } from "@/api/fetchIdeas";
 import { fetchTeams } from "@/api/teams";
 import { DataTable } from "@/components/table/data-table";
 import { DataTableColumnHeader } from "@/components/table/data-table-column-header";
@@ -21,7 +21,7 @@ interface TeamData {
   name: string | null;
   numberOfPeople: number;
   roundQualified: number;
-  submission: Submission | null;
+  submission: ideaType | null;
 }
 
 export default function TeamsIdeasTable() {
@@ -37,74 +37,15 @@ export default function TeamsIdeasTable() {
     isLoading: teamsLoading,
     isError: teamsError,
   } = useQuery({
-    queryKey: ["teams", currentPage, pageLimit],
+    queryKey: ["idea", currentPage, pageLimit],
     queryFn: () =>
       fetchTeams({
         limit: pageLimit,
         cursorId: undefined,
       }),
   });
 
-  const { data: processedData, isLoading: submissionsLoading } = useQuery({
-    queryKey: ["teams-submissions", teamsData?.teams],
-    queryFn: async () => {
-      if (!teamsData?.teams) return [];
 
-      const teamsWithSubmissions = await Promise.all(
-        teamsData.teams.map(async (team: Team) => {
-          if (!team.ID) return null;
-
-          const submission = await fetchSubmission(team.ID);
-
-          return {
-            id: team.ID,
-            name: team.Name,
-            numberOfPeople: team.NumberOfPeople,
-            roundQualified: team.RoundQualified,
-            submission: submission,
-          } as TeamData;
-        }),
-      );
-
-      return teamsWithSubmissions.filter((team): team is TeamData => !!team);
-    },
-    enabled: !!teamsData?.teams,
-  });
-
-  useEffect(() => {
-    if (processedData) {
-      const tracks = new Set<string>();
-      processedData.forEach((team) => {
-        if (team.submission?.track) {
-          tracks.add(team.submission.track);
-        }
-      });
-      setAvailableTracks(Array.from(tracks));
-    }
-  }, [processedData]);
-
-  useEffect(() => {
-    if (!processedData) return;
-
-    const filtered = processedData.filter((team) => {
-      const matchesSearch = searchTerm
-        ? (team.name?.toLowerCase().includes(searchTerm.toLowerCase()) ??
-            false) ||
-          (team.submission?.title
-            ?.toLowerCase()
-            .includes(searchTerm.toLowerCase()) ??
-            false)
-        : true;
-
-      const matchesTrack = selectedTrack
-        ? team.submission?.track === selectedTrack
-        : true;
-
-      return matchesSearch && matchesTrack;
-    });
-
-    setFilteredData(filtered);
-  }, [processedData, searchTerm, selectedTrack]);
 
   const columns: ColumnDef<TeamData, unknown>[] = [
     {
@@ -129,37 +70,37 @@ export default function TeamsIdeasTable() {
     },
     {
       id: "submissionTitle",
-      accessorFn: (row) => row.submission?.title,
+      accessorFn: (row) => row.submission?.Title,
       header: ({ column }) => (
         <DataTableColumnHeader column={column} title="Submission Title" />
       ),
       cell: ({ row }) => (
         <div className="max-w-[200px] truncate">
-          {row.original.submission?.title ?? "No submission"}
+          {row.original.submission?.Title ?? "No submission"}
         </div>
       ),
     },
     {
       id: "submissionDescription",
-      accessorFn: (row) => row.submission?.description,
+      accessorFn: (row) => row.submission?.Description,
       header: ({ column }) => (
         <DataTableColumnHeader column={column} title="Description" />
       ),
       cell: ({ row }) => (
         <div className="max-w-[300px] truncate">
-          {row.original.submission?.description ?? "No description"}
+          {row.original.submission?.Description ?? "No description"}
         </div>
       ),
     },
     {
       id: "track",
-      accessorFn: (row) => row.submission?.track,
+      accessorFn: (row) => row.submission?.Track,
       header: ({ column }) => (
         <DataTableColumnHeader column={column} title="Track" />
       ),
       cell: ({ row }) => (
         <div className="max-w-[200px] truncate">
-          {row.original.submission?.track ?? "Unassigned"}
+          {row.original.submission?.Track ?? "Unassigned"}
         </div>
       ),
     },