Merge pull request #504 from CodeChefVIT/staging

fix: minor tweaks

Author: YOGESH-08

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

@@ -1,30 +1,16 @@
 import { NextResponse } from "next/server";
 import { connectToDatabase } from "@/lib/database/mongoose";
-import UpcomingSlot from "@/db/upcoming-slot";
 import UpcomingSubject from "@/db/upcoming-paper";
-import { calculateCorrespondingSlots } from "@/lib/utils/slot-calculation";
 
 export const dynamic = "force-dynamic";
 
 export async function GET() {
   try {
     await connectToDatabase();
-    const upcomingSlot = await UpcomingSlot.find();
-    const slot = upcomingSlot[0]?.slot;
-    
-    if (!slot) {
-      return NextResponse.json(
-        {
-          message: "No slot found.",
-        },
-        { status: 404 },
-      );
-    }
-
-    const correspondingSlots = calculateCorrespondingSlots(slot);
-    const selectedSubjects = await UpcomingSubject.find({
-      slots: { $in: correspondingSlots },
-    });
+    const selectedSubjects = await UpcomingSubject.find()
+      .sort({ _id: 1 })
+      .limit(16)
+      .lean();
 
     if (selectedSubjects.length === 0) {
       return NextResponse.json(
@@ -47,4 +33,4 @@ export async function GET() {
       { status: 500 },
     );
   }
-}
+}

src/app/request/page.tsx

@@ -52,11 +52,7 @@ export default function PaperRequest() {
           "/api/upcoming-papers",
         );
 
-        const randomPapers = [...response.data]
-          .sort(() => Math.random() - 0.5)
-          .slice(0, 8);
-
-        setDisplayPapers(randomPapers);
+        setDisplayPapers(response.data);
       } catch (error) {
         console.error("Failed to fetch papers:", error);
       } finally {

src/components/CatalogueContent.tsx

@@ -177,31 +177,6 @@ const CatalogueContentInner = ({ subject }: { subject: string | null }) => {
     void fetchPapers();
   }, [subject, isMounted, setPapers, setFilterOptions]);
 
-  useEffect(() => {
-    if (!papers.length) return;
-
-    const filtered = [...papers];
-
-    if (sortOption === "asc") {
-      filtered.sort((a, b) => a.year.localeCompare(b.year));
-    } else if (sortOption === "desc") {
-      filtered.sort((a, b) => b.year.localeCompare(a.year));
-    }
-
-    setFilteredPapers(filtered);
-  }, [
-    papers,
-    selectedExams,
-    selectedSlots,
-    selectedYears,
-    selectedSemesters,
-    selectedCampuses,
-    selectedAnswerKeyIncluded,
-    sortOption,
-    setFilteredPapers,
-    setAppliedFilters,
-  ]);
-
   useEffect(() => {
     if (!papers.length) return;
 
@@ -255,6 +230,7 @@ const CatalogueContentInner = ({ subject }: { subject: string | null }) => {
     selectedSemesters,
     selectedCampuses,
     selectedAnswerKeyIncluded,
+    sortOption,
     setFilteredPapers,
     setAppliedFilters,
   ]);

src/components/Footer.tsx

@@ -104,7 +104,7 @@ export default function Footer() {
         {/* Events */}
         <div className="flex w-full flex-col gap-2 text-black dark:text-white  lg:w-[15%]">
           <h3 className="font-jost text-xl font-semibold">Events</h3>
-          <Link href="https://devsoc25.codechefvit.com" target="_blank">DevSOC</Link>
+          <Link href="https://devsoc26.codechefvit.com" target="_blank">DevSOC</Link>
           <Link href="https://gravitas.codechefvit.com" target="_blank">CookOff</Link>
           <Link href="https://gravitas.codechefvit.com" target="_blank">Clueminati</Link>
         </div>

src/components/PinnedPapersCarousel.tsx

@@ -199,18 +199,19 @@ function PinnedPapersCarousel() {
                 </CarouselItem>
               ) : (
                 chunkedPapers.map((paperGroup, index) => {
-                  const placeholdersNeeded =
-                    (chunkSize - paperGroup.length) % chunkSize;
+                  const columns = chunkSize === 2 ? 1 : chunkSize === 4 ? 2 : 4;
+                  const rows = Math.max(1, Math.ceil(paperGroup.length / columns));
+                  const placeholdersNeeded = columns * rows - paperGroup.length;
                   return (
                     <CarouselItem
                       key={`carousel-item-${index}`}
                       className={`grid ${
-                        chunkSize === 2
-                          ? "grid-cols-1 grid-rows-2"
-                          : chunkSize === 4
-                            ? "grid-cols-2 grid-rows-2"
+                        columns === 1
+                          ? "grid-cols-1"
+                          : columns === 2
+                            ? "grid-cols-2"
                             : "grid-cols-4"
-                      } gap-4 lg:auto-rows-fr`}
+                      } ${rows === 1 ? "grid-rows-1" : "grid-rows-2"} gap-4 lg:auto-rows-fr`}
                     >
                       {paperGroup.map((paper, subIndex) =>
                         paper.subject === "add_subject_button" ? (
@@ -264,4 +265,4 @@ function PinnedPapersCarousel() {
   );
 }
 
-export default PinnedPapersCarousel;
+export default PinnedPapersCarousel;

src/components/ReportButton.tsx

@@ -10,10 +10,12 @@ export default function ReportButton(){
   const { paperId, subject, exam, slot, year } = usePaper();
   const [open, setOpen] = useState(false);
   return (
-    <>
+    <> 
       <Button
+    
         onClick={() => setOpen(true)}
         className="h-10 w-10 rounded p-0 text-white transition hover:bg-red-600 bg-red-500"
+        title="Report this paper"
       >
         <FaFlag className="text-sm" />
       </Button>

src/components/ShareButton.tsx

@@ -30,7 +30,7 @@ export default function ShareButton() {
   return (
     <Dialog>
       <DialogTrigger asChild>
-        <Button className="aspect-square h-10 w-10 p-0 rounded text-white bg-[#6536c1] transition hover:bg-[#7d4fc7]">
+        <Button className="aspect-square h-10 w-10 p-0 rounded text-white bg-[#6536c1] transition hover:bg-[#7d4fc7]" title="Share this paper">
           <FaShare />
         </Button>
       </DialogTrigger>
@@ -47,6 +47,7 @@ export default function ShareButton() {
             type="submit"
             size="sm"
             className="flex w-fit items-center justify-between gap-5 px-3"
+            title="Copy link to clipboard"
             onClick={async () => {
               await toast.promise(
                 navigator.clipboard.writeText(paperPath), // This is a promise

src/components/SideBar.tsx

@@ -19,8 +19,9 @@ function SideBar() {
     handleApplyFilters,
   } = useFilters();
   const exams =
-    filterOptions?.unique_exams.map((exam) => ({ label: exam, value: exam })) ??
-    [];
+    filterOptions?.unique_exams
+      .sort((a, b) => a.localeCompare(b))
+      .map((exam) => ({ label: exam, value: exam })) ?? [];
   const slots =
     filterOptions?.unique_slots
       .sort((a, b) => a.localeCompare(b, undefined, { numeric: true }))

src/components/UpcomingPaper.tsx

@@ -105,7 +105,7 @@ export default function PaperCard({ subject, slots }: PaperCardProps) {
 
         {
           <div className="mt-4 flex flex-wrap gap-2 font-play">
-            {slots?.map((slotValue, index) => (
+            {[...slots].sort().map((slotValue, index) => (
               <Capsule key={index}>{slotValue}</Capsule>
             ))}
           </div>

src/components/multi-select.tsx

@@ -307,7 +307,9 @@ export const MultiSelect = React.forwardRef<
                   </div>
                   <span>(Select All)</span>
                 </CommandItem>
-                {options.map((option) => {
+                {options
+                  .sort((a, b) => a.label.localeCompare(b.label))
+                  .map((option) => {
                   const isSelected = selectedValues.includes(option.value);
                   return (
                     <CommandItem