changed view admin schema to reflect new changes from backend

Author: abhitrueprogrammer

src/api/leaderboard.ts

@@ -1,10 +1,6 @@
-import { type UserResponse } from "@/data/schema";
-import { usersResponseSchema } from "@/data/schema";
-import axios from "./axiosConfig";
 import { z } from "zod";
-export const leaderboardSchema = z.object({
-  ID: z.string(),
-  team_id: z.string(),
+import axios from "./axiosConfig";
+export const scoreSchema = z.object({
   team_name: z.string(),
   design: z.number(),
   implementation: z.number(),
@@ -14,15 +10,21 @@ export const leaderboardSchema = z.object({
   comment: z.string(),
   total_score: z.number(),
 });
+export const leaderboardUserSchema = z.object({
+  ID: z.string(),
+  team_id: z.string(),
+  team_name: z.string(),
+  rounds: z.array(scoreSchema),
+  overall_total: z.number(),
+});
 
-export type Leaderboard = z.infer<typeof leaderboardSchema>;
+export type Leaderboard = z.infer<typeof leaderboardUserSchema>;
 
 export const leaderBoardResponseSchema = z.object({
   status: z.string(),
   message: z.string(),
   data: z.object({
-    message: z.string().optional(),
-    users: z.array(leaderboardSchema).nullable(),
+    users: z.array(leaderboardUserSchema).nullable(),
   }),
 });
 export type LeaderboardResponse = z.infer<typeof leaderBoardResponseSchema>;

src/components/ViewScores.tsx

@@ -26,30 +26,46 @@ export default function ViewScores({ row }: { row: Row<Leaderboard> }) {
                   <Label className="font-semibold">Team Name:</Label>{" "}
                   {row.original.team_name}
                 </div>
-                <div>
-                  <Label className="font-semibold">Design:</Label>{" "}
-                  {row.original.design}
-                </div>
-                <div>
-                  <Label className="font-semibold">Implementation:</Label>{" "}
-                  {row.original.implementation}
-                </div>
-                <div>
-                  <Label className="font-semibold">Innovation:</Label>{" "}
-                  {row.original.innovation}
-                </div>
-                <div>
-                  <Label className="font-semibold">Presentation:</Label>{" "}
-                  {row.original.presentation}
-                </div>
-                <div>
-                  <Label className="font-semibold">Teamwork:</Label>{" "}
-                  {row.original.teamwork}
-                </div>
-                <div>
-                  <Label className="font-semibold">Total Score:</Label>{" "}
-                  {row.original.total_score}
-                </div>
+                {row.original.rounds.map((round, index) => {
+                  const {
+                    design,
+                    implementation,
+                    innovation,
+                    presentation,
+                    teamwork,
+                    total_score,
+                  } = round;
+
+                  return (
+                    <div key={index} className="border border-black p-2 overflow-y-auto">
+                      <div>Round {index} score: </div>
+                      <div>
+                        <Label className="font-semibold">Design:</Label>{" "}
+                        {design}
+                      </div>
+                      <div>
+                        <Label className="font-semibold">Implementation:</Label>{" "}
+                        {implementation}
+                      </div>
+                      <div>
+                        <Label className="font-semibold">Innovation:</Label>{" "}
+                        {innovation}
+                      </div>
+                      <div>
+                        <Label className="font-semibold">Presentation:</Label>{" "}
+                        {presentation}
+                      </div>
+                      <div>
+                        <Label className="font-semibold">Teamwork:</Label>{" "}
+                        {teamwork}
+                      </div>
+                      <div>
+                        <Label className="font-semibold">Total Score:</Label>{" "}
+                        {total_score}
+                      </div>
+                    </div>
+                  );
+                })}
               </CardContent>
             </Card>
           </DialogDescription>

src/components/columns/LeaderBoardCol.tsx

@@ -1,31 +1,30 @@
 "use client";
-import { type leaderboardSchema } from "@/api/leaderboard";
+import { type leaderboardUserSchema } from "@/api/leaderboard";
 import { type ColumnDef } from "@tanstack/react-table";
 import { type z } from "zod";
 import ViewScores from "../ViewScores";
 import ChangeRound from "../changeRound";
 
- const columns: ColumnDef<z.infer<typeof leaderboardSchema>>[] = [
+const columns: ColumnDef<z.infer<typeof leaderboardUserSchema>>[] = [
   {
     accessorKey: "team_name",
     header: "Team Name",
   },
   {
-    accessorKey: "total_score",
+    accessorKey: "rounds",
     header: "Scores",
     cell: ({ row }) => <ViewScores row={row} />,
   },
   {
-    accessorKey: "total_score",
+    accessorKey: "overall_total",
     header: "Final Score",
-  }
-  ,
+  },
+
   {
     accessorKey: "ID",
     header: "Set Round",
     cell: ({ row }) => <ChangeRound row={row} />,
-
-  }
+  },
 ];
 
-export default columns
+export default columns;