fixed merge issues

Advik-Gupta · Advik-Gupta · commit c38c0b6348ee · 2025-08-04T21:09:34.000+05:30
diff --git a/src/app/api/user-papers/route.ts b/src/app/api/user-papers/route.ts
@@ -39,7 +39,7 @@ export async function POST(req: Request) {
       [],
     );
 
-    return NextResponse.json(uniquePapers, {
+    return NextResponse.json(transformedPapers, {
       status: 200,
     });
   } catch (error) {
diff --git a/src/components/PapersCarousel.tsx b/src/components/PapersCarousel.tsx
@@ -15,7 +15,6 @@ import Autoplay from "embla-carousel-autoplay";
 import { chunkArray } from "@/util/utils";
 import { Skeleton } from "@/components/ui/skeleton";
 
-function PapersCarousel() {
 function PapersCarousel() {
   const [displayPapers, setDisplayPapers] = useState<IUpcomingPaper[]>([]);
   const [isLoading, setIsLoading] = useState(true);
@@ -76,9 +75,7 @@ function PapersCarousel() {
           {isLoading ? (
             <CarouselItem
               className={`grid ${
-                chunkSize === 4
-                  ? "grid-cols-2 grid-rows-2"
-                  : "grid-cols-4"
+                chunkSize === 4 ? "grid-cols-2 grid-rows-2" : "grid-cols-4"
               } gap-4 lg:auto-rows-fr`}
             >
               {Array.from({ length: chunkSize }).map((_, idx) => (
@@ -104,9 +101,7 @@ function PapersCarousel() {
               <CarouselItem
                 key={`carousel-item-${index}`}
                 className={`grid ${
-                  chunkSize === 4
-                    ? "grid-cols-2 grid-rows-2"
-                    : "grid-cols-4"
+                  chunkSize === 4 ? "grid-cols-2 grid-rows-2" : "grid-cols-4"
                 } gap-4 lg:auto-rows-fr`}
               >
                 {paperGroup.map((paper, subIndex) => (
@@ -120,7 +115,7 @@ function PapersCarousel() {
               </CarouselItem>
             ))
           )}
-        </CarouselContent>  
+        </CarouselContent>
       </Carousel>
     </div>
   );
diff --git a/src/components/Searchbar/searchbar.tsx b/src/components/Searchbar/searchbar.tsx
@@ -7,9 +7,7 @@ import PinnedSearchBar from "./pinned-searchbar";
 
 export async function fetchSubjects() {
   try {
-    const response = await axios.get<ICourses[]>(
-      `${process.env.SERVER_URL}/api/course-list`,
-    );
+    const response = await axios.get<ICourses[]>(`/api/course-list`);
     console.log("Fetched subjects:", response.data);
     return response.data.map((course) => course.name);
   } catch (err) {
diff --git a/src/components/screens/Info.tsx b/src/components/screens/Info.tsx
@@ -13,69 +13,68 @@ import Link from "next/link";
 import { Button } from "@/components/ui/button";
 import PWAInstallButton from "../ui/PWAInstallButton";
 
-
 function Info() {
   return (
-    <section
-      id="features"
-      className="flex scroll-mt-24 flex-col items-center justify-between px-6 py-12 md:scroll-mt-32 lg:flex-row"
-    >
-      <div className="w-full text-center lg:w-[50%] lg:text-left">
-        <div className="mb-8 hidden font-vipnabd text-3xl font-extrabold text-black dark:text-white lg:block lg:text-5xl">
-          <span>Prepare to excel in </span>
-          <span>your CATs and FATs </span>
-          <span>with CodeChef-</span>
-          <span>VIT’s dedicated </span>
-          <span>repository of past </span>
-          <span>exam papers</span>
-        </div>
-        <div className="w-full">
+    <>
+      <section
+        id="features"
+        className="flex scroll-mt-24 flex-col items-center justify-between px-6 py-12 md:scroll-mt-32 lg:flex-row"
+      >
+        <div className="w-full text-center lg:w-[50%] lg:text-left">
+          <div className="mb-8 hidden font-vipnabd text-3xl font-extrabold text-black dark:text-white lg:block lg:text-5xl">
+            <span>Prepare to excel in </span>
+            <span>your CATs and FATs </span>
+            <span>with CodeChef-</span>
+            <span>VIT’s dedicated </span>
+            <span>repository of past </span>
+            <span>exam papers</span>
+          </div>
           <div className="w-full">
-            <div className="origin-top-left">
-              <div className="grid grid-cols-3 gap-2 overflow-hidden font-play text-xs text-black dark:text-white sm:text-sm lg:gap-4 lg:text-lg xl:text-base">
-                <FeatureCard
-                  icon={<User size={24} />}
-                  text="No Sign-up required"
-                />
-                <FeatureCard
-                  isHighlight
-                  highlightText="1200+"
-                  subText="Past Year Papers"
-                />
-                <FeatureCard
-                  icon={<Download size={24} />}
-                  text="Flexible Downloads"
-                />
-                <FeatureCard
-                  icon={<Check size={24} />}
-                  text="Answer Key Available"
-                />
-                <FeatureCard
-                  icon={<Filter size={24} />}
-                  text="Filtered Search"
-                />
+            <div className="w-full">
+              <div className="origin-top-left">
+                <div className="grid grid-cols-3 gap-2 overflow-hidden font-play text-xs text-black dark:text-white sm:text-sm lg:gap-4 lg:text-lg xl:text-base">
+                  <FeatureCard
+                    icon={<User size={24} />}
+                    text="No Sign-up required"
+                  />
+                  <FeatureCard
+                    isHighlight
+                    highlightText="1200+"
+                    subText="Past Year Papers"
+                  />
+                  <FeatureCard
+                    icon={<Download size={24} />}
+                    text="Flexible Downloads"
+                  />
+                  <FeatureCard
+                    icon={<Check size={24} />}
+                    text="Answer Key Available"
+                  />
+                  <FeatureCard
+                    icon={<Filter size={24} />}
+                    text="Filtered Search"
+                  />
+                </div>
               </div>
             </div>
           </div>
         </div>
-      </div>
-      <div className="mb-10 hidden h-[450px] w-[450px] justify-center p-5 lg:flex lg:h-[600px] lg:w-[500px]">
-        <Image
-          src={man1 as string}
-          height={600}
-          width={500}
-          alt="man-light"
-          className="block dark:hidden"
-        />
-        <Image
-          src={man as string}
-          height={600}
-          width={500}
-          alt="man-dark"
-          className="hidden dark:block"
-        />
-      </div>
-    </section>
+        <div className="mb-10 hidden h-[450px] w-[450px] justify-center p-5 lg:flex lg:h-[600px] lg:w-[500px]">
+          <Image
+            src={man1 as string}
+            height={600}
+            width={500}
+            alt="man-light"
+            className="block dark:hidden"
+          />
+          <Image
+            src={man as string}
+            height={600}
+            width={500}
+            alt="man-dark"
+            className="hidden dark:block"
+          />
+        </div>
       </section>
 
       {/* Create Request Section */}
@@ -89,13 +88,13 @@ function Info() {
             className="group border-[1.5px] border-[#4A55FF] bg-transparent px-6 py-3 text-sm font-medium text-[#4A55FF] transition-all duration-200 hover:bg-[#4A55FF] hover:text-white dark:border-[#9EA8FF] dark:text-[#9EA8FF] dark:hover:bg-[#9EA8FF] dark:hover:text-black"
           >
             Create Request
-            <ArrowUpRight className="ml-2 h-4 w-4 transition-transform group-hover:translate-x-0.5 group-hover:-translate-y-0.5" />
+            <ArrowUpRight className="ml-2 h-4 w-4 transition-transform group-hover:-translate-y-0.5 group-hover:translate-x-0.5" />
           </Button>
         </Link>
       </section>
-      <div className="flex justify-center py-4 z-50">
-  <PWAInstallButton />
-</div>
+      <div className="z-50 flex justify-center py-4">
+        <PWAInstallButton />
+      </div>
     </>
   );
 }
diff --git a/src/components/screens/PapersPage.tsx b/src/components/screens/PapersPage.tsx
@@ -35,9 +35,7 @@ export default function PapersPage() {
   useEffect(() => {
     async function fetchSubjects() {
       try {
-        const response = await axios.get<Course[]>(
-          `${process.env.NEXT_PUBLIC_SERVER_URL}/api/course-list`,
-        );
+        const response = await axios.get<Course[]>(`/api/course-list`);
         const courses: Course[] = response.data;
         const names = courses
           .map((course) => course.name ?? course.courseName ?? course.title)
@@ -177,7 +175,7 @@ export default function PapersPage() {
             <Select
               onValueChange={setSelectedExam}
               disabled={!selectedSubject}
-              value={selectedExam || undefined}
+              value={selectedExam ?? undefined}
             >
               <SelectTrigger className="w-32">
                 <SelectValue placeholder="Exam" />
@@ -193,7 +191,7 @@ export default function PapersPage() {
             <Select
               onValueChange={setSelectedSlot}
               disabled={!selectedSubject}
-              value={selectedSlot || undefined}
+              value={selectedSlot ?? undefined}
             >
               <SelectTrigger className="w-32">
                 <SelectValue placeholder="Slot" />
@@ -209,7 +207,7 @@ export default function PapersPage() {
             <Select
               onValueChange={setSelectedYear}
               disabled={!selectedSubject}
-              value={selectedYear || undefined}
+              value={selectedYear ?? undefined}
             >
               <SelectTrigger className="w-32">
                 <SelectValue placeholder="Year" />
diff --git a/src/interface.ts b/src/interface.ts
@@ -171,13 +171,8 @@ export interface IPaper {
     | "Andhra Pradesh"
     | "Bhopal"
     | "Bangalore"
-    | "Mauritius";
-    | "Vellore"
-    | "Chennai"
-    | "Andhra Pradesh"
-    | "Bhopal"
-    | "Bangalore"
-    | "Mauritius";
+    | "Mauritius"
+    | null;
   slot: string;
   subject: string;
   year: string;
@@ -189,12 +184,6 @@ export type ExamDetail = {
   slot: string;
   "course-code": string;
   exam: string;
-  semester:
-    | "Fall Semester"
-    | "Winter Semester"
-    | "Summer Semester"
-    | "Weekend Semester";
-  exam: string;
   semester:
     | "Fall Semester"
     | "Winter Semester"
@@ -212,3 +201,7 @@ export interface Filters {
   unique_campuses: string[];
   unique_semesters: string[];
 }
+
+export interface StoredSubjects {
+  subjects: string[];
+}
diff --git a/src/middleware.ts b/src/middleware.ts
@@ -1,18 +1,14 @@
 import { type NextRequest, NextResponse } from "next/server";
 import { Ratelimit } from "@upstash/ratelimit";
 import { kv } from "@vercel/kv";
-import { type NextRequest, NextResponse } from "next/server";
-import { Ratelimit } from "@upstash/ratelimit";
-import { kv } from "@vercel/kv";
 
 const ratelimit = new Ratelimit({
   redis: kv,
   limiter: Ratelimit.slidingWindow(100, "900 s"),
-  limiter: Ratelimit.slidingWindow(100, "900 s"),
 });
 
 export const config = {
-  matcher: "/api/upload",
+  matcher: "/api/ai-upload",
 };
 
 export default async function middleware(request: NextRequest) {
