Merge pull request #232 from Advik-Gupta/staging

Fixed merge issues and optimized variable names

Author: abhitrueprogrammer

ongoing-papers.ts

@@ -5,7 +5,6 @@ const papers: IUpcomingPaper[] = [
     _id: "6708fd8002a75017a4f08759",
     subject: "Discrete Mathematics and Graph Theory [BMAT205L]",
     slots: ["A2", "B2"],
-
   },
   {
     _id: "670980523ec3fdad83b2d211",
@@ -15,9 +14,9 @@ const papers: IUpcomingPaper[] = [
   {
     _id: "670a105e6272bcf9da4e2362",
 
-    finalUrl:
+    final_url:
       "https://res.cloudinary.com/dtorpaj1c/image/upload/v1728712773/papers/ifkrnjgwdudtev9rxpki.pdf",
-    thumbnailUrl:
+    thumbnail_url:
       "https://res.cloudinary.com/dtorpaj1c/image/upload/w_400,h_400,c_fill/v1728712773/papers/ifkrnjgwdudtev9rxpki.jpg",
     subject: "Complex Variables and Linear Algebra [BMAT201L]",
     slots: ["A1", "B1"],
@@ -28,9 +27,9 @@ const papers: IUpcomingPaper[] = [
   },
   {
     _id: "67097e7b3ec3fdad83b2d205",
-    finalUrl:
+    final_url:
       "https://res.cloudinary.com/dtorpaj1c/image/upload/v1728675439/papers/pyyqotz1mzuh2wmq1k9s.pdf",
-    thumbnailUrl:
+    thumbnail_url:
       "https://res.cloudinary.com/dtorpaj1c/image/upload/w_400,h_400,c_fill/v1728675439/papers/pyyqotz1mzuh2wmq1k9s.jpg",
     subject: "Computer Networks [BCSE308L]",
     slots: ["C2", "D2"],

src/app/api/papers/route.ts

@@ -30,34 +30,34 @@ export async function GET(req: NextRequest) {
       return NextResponse.json(
         {
           papers,
-          uniqueYears: [],
-          uniqueSlots: [],
-          uniqueExams: [],
-          uniqueCampuses: [],
-          uniqueSemesters: [],
+          unique_years: [],
+          unique_slots: [],
+          unique_exams: [],
+          unique_campuses: [],
+          unique_semesters: [],
         },
         { status: 200 },
       );
     }
 
-    const uniqueYears = Array.from(new Set(papers.map((paper) => paper.year)));
-    const uniqueSlots = Array.from(new Set(papers.map((paper) => paper.slot)));
-    const uniqueExams = Array.from(new Set(papers.map((paper) => paper.exam)));
-    const uniqueCampuses = Array.from(
+    const unique_years = Array.from(new Set(papers.map((paper) => paper.year)));
+    const unique_slots = Array.from(new Set(papers.map((paper) => paper.slot)));
+    const unique_exams = Array.from(new Set(papers.map((paper) => paper.exam)));
+    const unique_campuses = Array.from(
       new Set(papers.map((paper) => paper.campus)),
     );
-    const uniqueSemesters = Array.from(
+    const unique_semesters = Array.from(
       new Set(papers.map((paper) => paper.semester)),
     );
 
     return NextResponse.json(
       {
         papers,
-        uniqueYears,
-        uniqueSlots,
-        uniqueExams,
-        uniqueCampuses,
-        uniqueSemesters,
+        unique_years,
+        unique_slots,
+        unique_exams,
+        unique_campuses,
+        unique_semesters,
       },
       { status: 200 },
     );

src/app/api/ai-upload/route.ts renamed to src/app/api/upload/route.ts

@@ -28,7 +28,10 @@ const cloudinaryConfigs = [config1, config2];
 export async function POST(req: Request) {
   try {
     if (!process.env.NEXT_PUBLIC_CLOUDINARY_UPLOAD_PRESET) {
-      return NextResponse.json({ message: "ServerMisconfig" }, { status: 500 });
+      return NextResponse.json(
+        { message: "ServerMisconfiguration" },
+        { status: 500 },
+      );
     }
     await connectToDatabase();
     const count: number = await PaperAdmin.countDocuments();
@@ -54,9 +57,9 @@ export async function POST(req: Request) {
       pdfData = pdfBuffer.toString("base64");
     }
 
-    let finalUrl: string | undefined = "";
+    let final_url: string | undefined = "";
     let public_id_cloudinary: string | undefined = "";
-    let thumbnailUrl: string | undefined = "";
+    let thumbnail_url: string | undefined = "";
 
     if (!files || files.length === 0) {
       return NextResponse.json(
@@ -71,15 +74,11 @@ export async function POST(req: Request) {
           return;
         }
 
-        console.log("this is happening 1");
-
         const mergedPdfBytes = await CreatePDF(files);
-        [public_id_cloudinary, finalUrl] = await uploadPDFFile(
+        [public_id_cloudinary, final_url] = await uploadPDFFile(
           mergedPdfBytes,
           uploadPreset,
         );
-
-        console.log("this is happening 2");
       } catch (error) {
         console.error("Error creating PDF:", error);
         return NextResponse.json(
@@ -88,28 +87,25 @@ export async function POST(req: Request) {
         );
       }
     } else {
-      console.log("this is happening 3");
-      [public_id_cloudinary, finalUrl] = await uploadPDFFile(
+      [public_id_cloudinary, final_url] = await uploadPDFFile(
         files[0]!,
         uploadPreset,
       );
     }
 
-    const thumbnailResponse = cloudinary.v2.image(finalUrl!, {
+    const thumbnailResponse = cloudinary.v2.image(final_url!, {
       format: "jpg",
     });
-    thumbnailUrl = thumbnailResponse
+    thumbnail_url = thumbnailResponse
       .replace("pdf", "jpg")
       .replace("upload", "upload/w_400,h_400,c_fill")
       .replace(/<img src='|'\s*\/>/g, "");
 
-    console.log("this is happening 4");
-
     const paper = new PaperAdmin({
       cloudinary_index: configIndex,
       public_id_cloudinary,
-      finalUrl,
-      thumbnailUrl,
+      final_url,
+      thumbnail_url,
       subject: null,
       slot: null,
       year: null,
@@ -118,9 +114,7 @@ export async function POST(req: Request) {
       campus: null,
     });
 
-    console.log("this is happening 5");
     await paper.save();
-    console.log("this is happening 6");
     return NextResponse.json({ status: "success" }, { status: 201 });
   } catch (error) {
     console.error(error);
@@ -132,7 +126,6 @@ export async function POST(req: Request) {
 }
 
 async function uploadPDFFile(file: File | ArrayBuffer, uploadPreset: string) {
-  console.log("this is happening 7");
   let bytes;
   if (file instanceof File) {
     bytes = await file.arrayBuffer();
@@ -148,16 +141,14 @@ async function uploadFile(
   fileType: string,
 ) {
   try {
-    console.log("this is happening 8");
     const buffer = Buffer.from(bytes);
-    console.log("this is happening 9");
     const dataUrl = `data:${fileType};base64,${buffer.toString("base64")}`;
-    console.log("this is happening 10");
+
     const uploadResult = (await cloudinary.v2.uploader.unsigned_upload(
       dataUrl,
       uploadPreset,
     )) as CloudinaryUploadResult;
-    console.log("this is happening 11");
+
     return [uploadResult.public_id, uploadResult.secure_url];
   } catch (e) {
     throw e;

src/app/api/user-papers/route.ts

@@ -19,10 +19,15 @@ export async function POST(req: Request) {
       subject: { $in: subjects },
     });
 
-    const transformedPapers = usersPapers.reduce(
-      (acc: { subject: string; slots: string[] }[], paper) => {
+    const transformedPapers = usersPapers.reduce<TransformedPaper[]>(
+      (acc, paper) => {
         const existing = acc.find((item) => item.subject === paper.subject);
 
+        if (existing) {
+          existing.slots.push(paper.slot);
+        } else {
+          acc.push({ subject: paper.subject, slots: [paper.slot] });
+        }
         if (existing) {
           existing.slots.push(paper.slot);
         } else {
@@ -34,14 +39,7 @@ export async function POST(req: Request) {
       [],
     );
 
-    const seenSubjects = new Set();
-    const uniquePapers = transformedPapers.filter((paper) => {
-      if (seenSubjects.has(paper.subject)) return false;
-      seenSubjects.add(paper.subject);
-      return true;
-    });
-
-    return NextResponse.json(uniquePapers, {
+    return NextResponse.json(transformedPapers, {
       status: 200,
     });
   } catch (error) {

src/app/layout.tsx

@@ -7,7 +7,6 @@ import type { Metadata } from "next";
 import Navbar from "@/components/Navbar";
 import Footer from "@/components/Footer";
 import ChildrenWrapper from "@/components/ChildrenWrapper";
-import Banner from "@/components/BannerAlert";
 
 export const metadata: Metadata = {
   metadataBase: new URL("https://papers.codechefvit.com/"),

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

@@ -158,15 +158,15 @@ const PaperPage = async ({ params }: { params: { id: string } }) => {
         </div>
       ) : (
         <>
+          <h1 className="my-6 flex justify-center gap-4 text-center font-play text-2xl font-semibold md:mb-10 md:text-3xl">
           <h1 className="my-6 flex justify-center gap-4 text-center font-play text-2xl font-semibold md:mb-10 md:text-3xl">
             <div>
               {paper.subject} {paper.exam} {paper.slot} {paper.year}
             </div>
           </h1>
           <center>
             <PdfViewer
-              // url={paper.finalUrl}
-              url="https://res.cloudinary.com/dq6tapd4t/image/upload/v1746291007/sck2vipdklqaurwhipjl.pdf"
+              url={paper.final_url}
               name={`${extractBracketContent(paper.subject)}-${paper.exam}-${paper.slot}-${paper.year}`}
             ></PdfViewer>
           </center>

src/app/upload/page.tsx

@@ -140,7 +140,10 @@ const Page = () => {
       await toast.promise(
         async () => {
           try {
-            await axios.post<APIResponse>("/api/ai-upload", formData);
+            console.log("this is happening now");
+            await axios.post<APIResponse>("/api/upload", formData);
+            console.log("this is happening after now");
+            return { message: "Papers uploaded successfully!" };
           } catch (error) {
             if (error instanceof AxiosError && error.response?.data) {
               const errorData = error.response.data as APIResponse;
@@ -173,7 +176,7 @@ const Page = () => {
   const isCurrentlyDragging = isDragging || isGlobalDragging;
 
   return (
-    <div className="font-play flex h-[calc(100vh-85px)] flex-col justify-center px-6">
+    <div className="flex h-[calc(100vh-85px)] flex-col justify-center px-6 font-play">
       <div className="2xl:my-15 flex flex-col items-center">
         <fieldset className="mb-4 w-full max-w-md rounded-lg border-2 border-gray-300 p-4 pr-8">
           <div className="flex w-full flex-col 2xl:gap-y-4">

src/components/Card.tsx

@@ -30,7 +30,7 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
     url.startsWith("http://") ? url.replace("http://", "https://") : url;
 
   const generateFileName = (paper: IPaper): string => {
-    const extension = paper.finalUrl.split(".").pop();
+    const extension = paper.final_url.split(".").pop();
     return `${extractBracketContent(paper.subject)}-${paper.exam}-${paper.slot}-${paper.year}.${extension}`;
   };
 
@@ -49,7 +49,7 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
   };
 
   const handleDownload = async (paper: IPaper) => {
-    await downloadFile(getSecureUrl(paper.finalUrl), generateFileName(paper));
+    await downloadFile(getSecureUrl(paper.final_url), generateFileName(paper));
   };
 
   const handleCheckboxChange = () => {
@@ -65,14 +65,14 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
   return (
     <div
       className={cn(
+        "overflow-hidden rounded-sm border-2 border-[#734DFF] bg-[#FFFFFF] font-play transition-all duration-150 hover:bg-[#EFEAFF] dark:border-[#36266D] dark:bg-[#171720] hover:dark:bg-[#262635]",
         "overflow-hidden rounded-sm border-2 border-[#734DFF] bg-[#FFFFFF] font-play transition-all duration-150 hover:bg-[#EFEAFF] dark:border-[#36266D] dark:bg-[#171720] hover:dark:bg-[#262635]",
         checked && "bg-white",
       )}
     >
       <Link href={paperLink} target="_blank" rel="noopener noreferrer">
         <Image
-          // src={paper.thumbnailUrl}
-          src="https://res.cloudinary.com/dq6tapd4t/image/upload/w_400,h_400,c_fill/v1746291007/sck2vipdklqaurwhipjl.jpg"
+          src={paper.thumbnail_url}
           alt={paper.subject}
           width={320}
           height={180}
@@ -81,6 +81,7 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
 
         <div className="justify-center">
           <div className="flex flex-row items-center justify-between px-4 pb-2">
+            <div className="text-md font-play font-medium">
             <div className="text-md font-play font-medium">
               {extractBracketContent(paper.subject)}
             </div>
@@ -116,6 +117,7 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
         </div>
       </Link>
 
+      <div className="hidden items-center justify-between gap-2 px-4 pb-4 font-play md:flex">
       <div className="hidden items-center justify-between gap-2 px-4 pb-4 font-play md:flex">
         <div className="flex items-center gap-2">
           <input
@@ -126,7 +128,7 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
           />
           <p>Select</p>
         </div>
-        {paper.answerKeyIncluded && (
+        {paper.answer_key_included && (
           <div className="flex items-center gap-2 font-normal text-[#7480FF]">
             <Check color="#7480FF" />
             Answer Key