Merge remote-tracking branch 'refs/remotes/origin/main'

Author: abhitrueprogrammer

pnpm-lock.yaml

@@ -1,8 +1,8 @@
 import instance from "./axiosConfig";
 
-export const downloadCSV = async (): Promise<Blob> => {
+export const downloadCSV = async ({what}: {what:string}): Promise<Blob> => {
   try {
-    const response = await instance.get<Blob>(`/admin/usercsv`, {
+    const response = await instance.get<Blob>(`/admin/${what}`, {
       withCredentials: true,
       responseType: "blob",
     });

src/api/downloadCSV.ts

@@ -53,25 +53,29 @@ export const fetchIdeas = async ({
   limit: number;
   cursorId?: string;
   name?: string;
-  track?: string;
+  track?: number;
 }) => {
   try {
     const params = new URLSearchParams({ limit: String(limit) });
-
+    
+    
     if (name) {
-      params.append("name", name);
+      params.append("title", name);
     } else if (cursorId) {
       params.append("cursor", cursorId);
     }
+    else if(track){
+      params.append("track", String(track))
+    }
     const url =
-      track !== ""
-        ? `admin/ideas/${track}?${params.toString()}`
+      (track || name)
+        ? `admin/ideas/filter?${params.toString()}`
         : `admin/ideas?${params.toString()}`;
 
     const response = await axios.get<ideaResponseType>(url);
     const parsedResponse = ideasResponseSchema.parse(response.data);
     console.log(parsedResponse.data);
-
+    console.log(url)
     //send in next cursor when data is done
     const nextCursor = parsedResponse.data.next_cursor;
 
@@ -83,4 +87,4 @@ export const fetchIdeas = async ({
     console.log(err);
     throw err;
   }
-};
+};

src/api/fetchIdeas.ts

@@ -17,6 +17,8 @@ import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { type ColumnDef } from "@tanstack/react-table";
 import { useEffect, useState } from "react";
 import { ModalTeamIdea } from "./ModalTeamIdea";
+import { useDebounce } from "use-debounce";
+import CopyLabel from "@/components/CopyLabel";
 
 export default function TeamsIdeasTable() {
   const queryClient = useQueryClient();
@@ -28,6 +30,7 @@ export default function TeamsIdeasTable() {
   const [pageLimit, setPageLimit] = useState(10);
   const [searchTerm, setSearchTerm] = useState("");
   const [selectedTrack, setSelectedTrack] = useState<string>("");
+  const [nameDebounce] = useDebounce(searchTerm, 1000);
   const tracks = [
     "Media and Entertainment",
     "Finance and Fintech",
@@ -41,12 +44,13 @@ export default function TeamsIdeasTable() {
     isLoading: ideasLoading,
     isError: ideasError,
   } = useQuery({
-    queryKey: ["idea", currentCursor, pageLimit],
+    queryKey: ["idea", currentCursor, pageLimit, nameDebounce],
     queryFn: () =>
       fetchIdeas({
         limit: pageLimit,
         cursorId: currentCursor,
-        track: selectedTrack,
+        track: Number(selectedTrack),
+        name: nameDebounce
       }),
   });
   const handleNextPage = () => {
@@ -76,9 +80,10 @@ export default function TeamsIdeasTable() {
         <DataTableColumnHeader column={column} title="Team ID" />
       ),
       cell: ({ row }) => (
-        <span className="relative block max-w-[100px] cursor-pointer truncate text-ellipsis whitespace-nowrap text-white">
-          {row.original.TeamID}
-        </span>
+        // <span className="relative block max-w-[100px] cursor-pointer truncate text-ellipsis whitespace-nowrap text-white">
+        //   {row.original.TeamID}
+        // </span>
+        <CopyLabel label={row.original.TeamID}/>
       ),
     },
     {
@@ -184,4 +189,4 @@ export default function TeamsIdeasTable() {
       }
     </>
   );
-}
+}

src/app/idea/page.tsx

@@ -14,9 +14,10 @@ import useToast from "@/lib/toast";
 import { useMutation, useQuery, useQueryClient } from "@tanstack/react-query";
 import Image from "next/image";
 import Link from "next/link";
-import { useParams } from "next/navigation";
+import { useParams, useRouter } from "next/navigation";
 import { useEffect, useState } from "react";
-
+import { BackButton } from "@/components/ui/BackButton";
+import { ChevronLeft, Router } from "lucide-react";
 export interface Score {
   id: string;
   team_id: string;
@@ -33,6 +34,7 @@ type ApiError = {
   message: string;
 };
 
+
 function ScoreSection({ teamId }: { teamId: string }) {
   const [design, setDesign] = useState(0);
   const [implementation, setImplementation] = useState(0);
@@ -471,9 +473,15 @@ export default function TheTeam() {
     queryKey: ["theTeams", id],
     queryFn: () => fetchTeamDetails({ uuid: String(id) }),
   });
+  const router = useRouter();
   return (
     <>
       <div className="mx-auto w-[100%] space-y-4">
+        <Button variant="outline" size="icon" onClick={()=>{
+          router.push("/teams")
+        }}>
+          <ChevronLeft />
+        </Button>
         {id && <ScoreSection teamId={String(id)} />}
         <div
           className={`${!teamList ? "h-[70vh]" : "h-auto"} mx-auto w-[100%] rounded-md border bg-black p-4 text-white shadow-lg`}

src/app/team/[id]/page.tsx

@@ -10,6 +10,8 @@ import { useQuery, useQueryClient } from "@tanstack/react-query";
 import { useState } from "react";
 // import { TeamModal } from "@/components/table/team-modal";
 import { useDebounce } from "use-debounce";
+import { Button } from "@/components/ui/button";
+import { downloadCSV } from "@/api/downloadCSV";
 
 export default function Teams() {
   const [cursorHistory, setCursorHistory] = useState<string[]>([]);
@@ -20,8 +22,9 @@ export default function Teams() {
   const [theName, setTheName] = useState<string>("");
   // const queryClient = useQueryClient();
   const [selectedTeam, setSelectedTeam] = useState<Team | null>(null);
-  const [nameDebounce] = useDebounce(theName, 1000);
+  const [nameDebounce] = useDebounce(theName, 500);
   const [open, setOpen] = useState(false);
+  
 
   const queryClient = useQueryClient();
 
@@ -65,19 +68,41 @@ export default function Teams() {
     setSelectedTeam(team);
     setOpen(true);
   };
+  const onClick = async () => {
+      try {
+        const blob = await downloadCSV({what : "teamcsv"});
+  
+        const url = window.URL.createObjectURL(blob);
+        const a = document.createElement("a");
+        a.href = url;
+        a.download = "teams.csv"; // Set the filename for the downloaded file
+        document.body.appendChild(a);
+  
+        a.click();
+  
+        window.URL.revokeObjectURL(url);
+        document.body.removeChild(a);
+      } catch (err) {
+        console.error("Error downloading CSV:", err);
+        alert("Failed to download CSV. Please try again.");
+      }
+    };
 
   return (
     <>
       <div className="p-4">
         <div className="mb-4"></div>
-        <div className="mb-4 flex flex-col items-start">
+        <div className="mb-4 flex items-center ">
           <input
             className="bg-gray w-[50%] rounded-md border p-2 text-white"
             placeholder="Search"
             value={theName}
             onChange={(e) => setTheName(e.target.value)}
             type="text"
           />
+          <Button className="ml-2" onClick={onClick}>
+          Download CSV{" "}
+        </Button>
         </div>
         {/* <DataTableUsers users={oosers} columns={userCol} /> */}
 

src/app/teams/page.tsx

@@ -15,8 +15,11 @@ import { useEffect, useState } from "react";
 import { useDebounce } from "use-debounce";
 import SelectGender from "@/components/select-gender";
 import toast from "react-hot-toast";
-
+import { useParams } from "next/navigation";
+import { usePathname } from "next/navigation";
 export default function Users() {
+  const pathname = usePathname();
+
   const queryClient = useQueryClient();
 
   const [gender, setGender] = useState<string>("");
@@ -27,7 +30,7 @@ export default function Users() {
   const [pageLimit, setPageLimit] = useState<number>(10);
   const [theName, setTheName] = useState<string>("");
   // const queryClient = useQueryClient();
-  const [nameDebounce] = useDebounce(theName, 1000);
+  const [nameDebounce] = useDebounce(theName, 500);
   const {
     data: userList,
     isLoading,
@@ -67,7 +70,7 @@ export default function Users() {
   }, [gender]);
   const onClick = async () => {
     try {
-      const blob = await downloadCSV();
+      const blob = await downloadCSV({what : "usercsv"});
 
       const url = window.URL.createObjectURL(blob);
       const a = document.createElement("a");
@@ -84,18 +87,21 @@ export default function Users() {
       alert("Failed to download CSV. Please try again.");
     }
   };
+
   return (
     <div className="p-4">
-      <div className="mb-4 flex items-start justify-between">
+      <div className="mb-4 flex items-center">
         <input
-          className="bg-gray w-[50%] rounded-md border p-2 text-white"
+          className="bg-gray mr-2 w-[50%] rounded-md border p-2 text-white"
           placeholder="Search"
           value={theName}
           onChange={(e) => setTheName(e.target.value)}
           type="text"
         />
         <SelectGender gender={gender} setGender={setGender}></SelectGender>
-        <Button onClick={onClick}>Download CSV </Button>
+        <Button className="ml-2" onClick={onClick}>
+          Download CSV{" "}
+        </Button>
       </div>
 
       {isError && <div className="text-red-500">Error fetching user data</div>}

src/app/users/page.tsx

@@ -0,0 +1,27 @@
+import React from 'react'
+import { Tooltip, TooltipContent, TooltipProvider, TooltipTrigger } from './ui/tooltip'
+import { handleCopy } from '@/lib/utils'
+
+const CopyLabel = ({label}:{label:string}) => {
+  return (
+    <div>
+      <TooltipProvider>
+          <Tooltip>
+            <TooltipTrigger className="hover:cursor-pointer" asChild>
+              <span
+                className="relative block max-w-[120px] cursor-pointer truncate text-ellipsis capitalize whitespace-nowrap text-white"
+                onClick={() => handleCopy(label)}
+              >
+                {label}
+              </span>
+            </TooltipTrigger>
+            <TooltipContent>
+              <p>Click to copy</p>
+            </TooltipContent>
+          </Tooltip>
+        </TooltipProvider>
+    </div>
+  )
+}
+
+export default CopyLabel

src/components/CopyLabel.tsx

@@ -9,6 +9,7 @@ import { Button } from "@/components/ui/button";
 import { useRouter } from "next/navigation";
 import { ArrowRight } from "lucide-react";
 import ChangeRound from "../changeRound";
+import CopyLabel from "../CopyLabel";
 
 const TeamActions = ({ teamId }: { teamId: string | null }) => {
   const router = useRouter();
@@ -47,7 +48,9 @@ const columns: ColumnDef<Team>[] = [
     header: ({ column }) => (
       <DataTableColumnHeader column={column} title="Team Code" />
     ),
-    cell: ({ row }) => <span>{row.getValue("Code")}</span>,
+    cell: ({ row }) => {
+      return <CopyLabel label={row.getValue("Code")} />;
+    }
   },
   {
     accessorKey: "IsBanned",