Merge pull request #80 from abhitrueprogrammer/staging

Feat: Added 2 campus, answerKey and sem tag

Author: Abh1noob

README.md

@@ -15,7 +15,6 @@
 - Tailwind CSS : Utility-first CSS framework for rapid UI development.
 - MongoDB & Mongoose : Database and object data modeling (ODM) for Node.js.
 - Cloudinary : Media storage and optimization service.
-- Nodemailer : Node.js library for sending emails.
 - Shadcn : Collection of pre-built components using Radix UI and Tailwind CSS.
 
 ## 💡 Features:

ongoing-papers.ts

@@ -1,6 +1,6 @@
-import { type Paper } from "@/interface";
+import { type IPaper } from "@/interface";
 
-const papers: Paper[] = [
+const papers: IPaper[] = [
   {
     _id: "6708fd8002a75017a4f08759",
     finalUrl:
@@ -11,6 +11,8 @@ const papers: Paper[] = [
     slot: "A2",
     year: "2023",
     exam: "CAT-2",
+    semester: "Fall",
+    campus: "Vellore",
   },
   {
     _id: "670980523ec3fdad83b2d211",
@@ -22,6 +24,8 @@ const papers: Paper[] = [
     slot: "A2",
     year: "2024",
     exam: "CAT-2",
+    semester: "Fall",
+    campus: "Vellore",
   },
   {
     _id: "670a105e6272bcf9da4e2362",
@@ -34,6 +38,8 @@ const papers: Paper[] = [
     slot: "A1",
     year: "2023",
     exam: "CAT-2",
+    semester: "Fall",
+    campus: "Vellore",
   },
   {
     _id: "67097e7b3ec3fdad83b2d205",
@@ -45,6 +51,8 @@ const papers: Paper[] = [
     slot: "C2",
     year: "2023",
     exam: "CAT-2",
+    semester: "Fall",
+    campus: "Vellore",
   },
 ];
 

src/app/api/getTags/route.ts

@@ -1,7 +1,7 @@
 import { NextResponse, NextRequest } from "next/server";
 import { connectToDatabase } from "@/lib/mongoose";
 import Paper from "@/db/papers";
-import { type IPaper } from "@/interface";
+import { IPaper, type IAdminPaper } from "@/interface";
 
 export const dynamic = "force-dynamic";
 
@@ -21,11 +21,11 @@ export async function GET(req: NextRequest) {
         { status: 400 },
       );
     }
-
+    console.log((await Paper.find()).map((paper)=>{paper.campus}))
     const papers: IPaper[] = await Paper.find({
       subject: { $regex: new RegExp(`${escapedSubject}`, "i") },
     });
-
+    console.log(papers[0]?.campus)
     if (papers.length === 0) {
       return NextResponse.json(
         { message: "No papers found for the specified subject" },
@@ -36,9 +36,11 @@ export async function GET(req: NextRequest) {
     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(new Set(papers.map((paper) => paper.campus)));
+    const uniqueSemesters = Array.from(new Set(papers.map((paper) => paper.semester)));
 
     return NextResponse.json(
-      { papers, uniqueYears, uniqueSlots, uniqueExams },
+      { papers, uniqueYears, uniqueSlots, uniqueExams, uniqueCampuses, uniqueSemesters },
       { status: 200 }
     );
   } catch (error) {

src/app/api/papers/route.ts

@@ -1,6 +1,6 @@
 import { NextResponse } from "next/server";
 import { PDFDocument } from "pdf-lib";
-import { slots, years } from "@/components/select_options";
+import { campuses, exams, semesters, slots, years } from "@/components/select_options";
 import { connectToDatabase } from "@/lib/mongoose";
 import cloudinary from "cloudinary";
 import { type ICourses, type CloudinaryUploadResult } from "@/interface";
@@ -26,6 +26,9 @@ export async function POST(req: Request) {
     const slot = formData.get("slot") as string;
     const year = formData.get("year") as string;
     const exam = formData.get("exam") as string;
+    const campus = formData.get("campus") as string;
+    const semester = formData.get("semester") as string;
+
     const isPdf = formData.get("isPdf") === "true"; // Convert string to boolean
 
     const { data } = await axios.get<ICourses[]>(`${process.env.SERVER_URL}/api/course-list`);
@@ -34,7 +37,10 @@ export async function POST(req: Request) {
       !(
         courses.includes(subject) &&
         slots.includes(slot) &&
-        years.includes(year)
+        years.includes(year) &&
+        exams.includes(exam) &&
+        campuses.includes(campus) &&
+        semesters.includes(semester) 
       )
     ) {
       return NextResponse.json({ message: "Bad Request" }, { status: 400 });
@@ -90,6 +96,8 @@ export async function POST(req: Request) {
       slot,
       year,
       exam,
+      campus,
+      semester
     });
     await paper.save();
     return NextResponse.json(

src/app/api/upload/route.ts

@@ -8,7 +8,7 @@ import { Button } from "@/components/ui/button";
 import Navbar from "@/components/Navbar";
 import Footer from "@/components/Footer";
 import { type PostPDFToCloudinary } from "@/interface";
-import { slots, years } from "@/components/select_options";
+import { slots, years, campuses, semesters, exams } from "@/components/select_options";
 import SearchBar from "@/components/searchbarSubjectList";
 import Dropzone from "react-dropzone";
 import {
@@ -26,6 +26,9 @@ const Page = () => {
   const [subject, setSubject] = useState("");
   const [exam, setExam] = useState("");
   const [year, setYear] = useState("");
+  const [campus, setCampus] = useState("");
+  const [semester, setSemester] = useState("");
+
   const [files, setFiles] = useState<File[]>([]);
   const [isUploading, setIsUploading] = useState(false);
   const [resetSearch, setResetSearch] = useState(false);
@@ -55,7 +58,14 @@ const Page = () => {
       toast.error("Year is required");
       return;
     }
-
+    if (!campus) {
+      toast.error("Campus is required");
+      return;
+    }
+    if (!semester) {
+      toast.error("Semester is required");
+      return;
+    }
     if (!files || files.length === 0) {
       toast.error("No files selected");
       return;
@@ -94,6 +104,9 @@ const Page = () => {
     formData.append("slot", slot);
     formData.append("year", year);
     formData.append("exam", exam);
+    formData.append("semester", semester);
+    formData.append("campus", campus);
+
     formData.append("isPdf", String(isPdf));
 
     setIsUploading(true);
@@ -162,9 +175,11 @@ const Page = () => {
                 <SelectContent>
                   <SelectGroup>
                     <SelectLabel>Exams</SelectLabel>
-                    <SelectItem value="CAT-1">CAT-1</SelectItem>
-                    <SelectItem value="CAT-2">CAT-2</SelectItem>
-                    <SelectItem value="FAT">FAT</SelectItem>
+                    {exams.map((exam) => (
+                      <SelectItem key={exam} value={String(exam)}>
+                        {exam}
+                      </SelectItem>
+                    ))}{" "}
                   </SelectGroup>
                 </SelectContent>
               </Select>
@@ -196,6 +211,44 @@ const Page = () => {
               </Select>
             </div>
 
+            {/* Year Selection */}
+            <div>
+              <label>Campus Selection:</label>
+              <Select value={campus} onValueChange={setCampus}>
+                <SelectTrigger className="m-2 rounded-md border p-2">
+                  <SelectValue placeholder="Select campus" />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectGroup>
+                    <SelectLabel>Years</SelectLabel>
+                    {campuses.map((campus) => (
+                      <SelectItem key={campus} value={String(campus)}>
+                        {campus}
+                      </SelectItem>
+                    ))}
+                  </SelectGroup>
+                </SelectContent>
+              </Select>
+            </div>
+            <div>
+              <label>Semester Selection:</label>
+              <Select value={semester} onValueChange={setSemester}>
+                <SelectTrigger className="m-2 rounded-md border p-2">
+                  <SelectValue placeholder="Select semester" />
+                </SelectTrigger>
+                <SelectContent>
+                  <SelectGroup>
+                    <SelectLabel>Semester</SelectLabel>
+                    {semesters.map((semester) => (
+                      <SelectItem key={semester} value={String(semester)}>
+                        {semester}
+                      </SelectItem>
+                    ))}
+                  </SelectGroup>
+                </SelectContent>
+              </Select>
+            </div>
+
             {/* File Dropzone */}
             <div>
               <Dropzone

src/app/upload/page.tsx

@@ -1,8 +1,9 @@
 import { useEffect, useState } from "react";
-import { type Paper } from "@/interface";
+import { type IPaper } from "@/interface";
 import Image from "next/image";
 import { Eye, Download } from "lucide-react";
 import {
+  capsuleGreen,
   extractBracketContent,
   extractWithoutBracketContent,
 } from "@/util/utils";
@@ -16,8 +17,8 @@ const Card = ({
   onSelect,
   isSelected,
 }: {
-  paper: Paper;
-  onSelect: (paper: Paper, isSelected: boolean) => void;
+  paper: IPaper;
+  onSelect: (paper: IPaper, isSelected: boolean) => void;
   isSelected: boolean;
 }) => {
   const router = useRouter();
@@ -27,7 +28,7 @@ const Card = ({
     setChecked(isSelected);
   }, [isSelected]);
 
-  const handleDownload = async (paper: Paper) => {
+  const handleDownload = async (paper: IPaper) => {
     const extension = paper.finalUrl.split(".").pop();
     const fileName = `${extractBracketContent(paper.subject)}-${paper.exam}-${paper.slot}-${paper.year}.${extension}`;
     await downloadFile(paper.finalUrl, fileName);
@@ -68,17 +69,20 @@ const Card = ({
         />
       </Link>
 
-      <div className="justify-center space-y-2 h-28">
+      <div className="justify-center space-y-2 h-30">
         <div className="text-sm font-sans font-medium">
           {extractBracketContent(paper.subject)}
         </div>
         <div className="text-base font-sans font-semibold">
           {extractWithoutBracketContent(paper.subject)}
         </div>
-        <div className="flex gap-2 py-2">
+        <div className="flex flex-wrap  gap-2 py-2">
           {capsule(paper.exam)}
           {capsule(paper.slot)}
           {capsule(paper.year)}
+          {capsule(paper.campus)}
+          {capsule(paper.semester)}
+          {paper.answerKeyIncluded && capsuleGreen("Answer key included")}
         </div>
       </div>
 

src/components/Card.tsx

@@ -2,13 +2,14 @@ import { useSearchParams } from "next/navigation";
 import { useEffect, useState } from "react";
 import axios, { type AxiosError } from "axios";
 import { Button } from "@/components/ui/button";
-import { type Paper, type Filters } from "@/interface";
+import { type IPaper, type Filters } from "@/interface";
 import { FilterDialog } from "@/components/FilterDialog";
 import Card from "./Card";
 import { extractBracketContent } from "@/util/utils";
 import { useRouter } from "next/navigation";
 import SearchBar from "./searchbar";
 import Loader from "./ui/loader";
+import { campuses, semesters } from "./select_options";
 
 const CatalogueContent = () => {
   const searchParams = useSearchParams();
@@ -17,6 +18,9 @@ const CatalogueContent = () => {
   const exams = searchParams.get("exams")?.split(",");
   const slots = searchParams.get("slots")?.split(",");
   const years = searchParams.get("years")?.split(",");
+  const semesters = searchParams.get("semesters")?.split(",");
+  const campuses = searchParams.get("campuses")?.split(",");
+
   const [selectedExams, setSelectedExams] = useState<string[] | undefined>(
     exams,
   );
@@ -34,8 +38,8 @@ const CatalogueContent = () => {
     router.push(`/catalogue?subject=${encodeURIComponent(subject!)}`);
   };
 
-  const [papers, setPapers] = useState<Paper[]>([]);
-  const [selectedPapers, setSelectedPapers] = useState<Paper[]>([]);
+  const [papers, setPapers] = useState<IPaper[]>([]);
+  const [selectedPapers, setSelectedPapers] = useState<IPaper[]>([]);
   const [error, setError] = useState<string | null>(null);
   const [loading, setLoading] = useState<boolean>(false);
   const [filterOptions, setFilterOptions] = useState<Filters>();
@@ -63,7 +67,7 @@ const CatalogueContent = () => {
     } catch (error) {}
   }
 
-  const handleSelectPaper = (paper: Paper, isSelected: boolean) => {
+  const handleSelectPaper = (paper: IPaper, isSelected: boolean) => {
     if (isSelected) {
       setSelectedPapers((prev) => [...prev, paper]);
     } else {
@@ -171,6 +175,8 @@ const CatalogueContent = () => {
               initialExams={exams}
               initialSlots={slots}
               initialYears={years}
+              initialCampuses={campuses}
+              initialSemesters={semesters}
               onReset={handleResetFilters}
               onApplyFilters={handleApplyFilters}
             />