Merge pull request #240 from Advik-Gupta/staging

fixed bugs in sidebar, request page, footer

Author: abhitrueprogrammer

src/app/api/subscribe/route.ts

@@ -32,7 +32,7 @@ async function appendEmailToSheet(email: string) {
 
 export async function POST(req: Request) {
   try {
-    const { email } = await req.json() as {email: string};
+    const { email } = (await req.json()) as { email: string };
 
     if (!email) {
       return NextResponse.json({ error: "Email is required" }, { status: 400 });

src/components/Card.tsx

@@ -9,7 +9,7 @@ import {
   extractBracketContent,
   extractWithoutBracketContent,
 } from "@/util/utils";
-import axios from "axios";
+import { getSecureUrl, generateFileName, downloadFile } from "@/util/download";
 import Link from "next/link";
 import { cn } from "@/lib/utils";
 
@@ -26,28 +26,6 @@ const Card = ({ paper, onSelect, isSelected }: CardProps) => {
     setChecked(isSelected);
   }, [isSelected]);
 
-  const getSecureUrl = (url: string): string =>
-    url.startsWith("http://") ? url.replace("http://", "https://") : url;
-
-  const generateFileName = (paper: IPaper): string => {
-    const extension = paper.final_url.split(".").pop();
-    return `${extractBracketContent(paper.subject)}-${paper.exam}-${paper.slot}-${paper.year}.${extension}`;
-  };
-
-  const downloadFile = async (url: string, filename: string): Promise<void> => {
-    try {
-      const response = await axios.get(url, { responseType: "blob" });
-      const blob = new Blob([response.data]);
-      const link = document.createElement("a");
-      link.href = window.URL.createObjectURL(blob);
-      link.download = filename;
-      link.click();
-      window.URL.revokeObjectURL(link.href);
-    } catch (error) {
-      console.error("Download failed:", error);
-    }
-  };
-
   const handleDownload = async (paper: IPaper) => {
     await downloadFile(getSecureUrl(paper.final_url), generateFileName(paper));
   };

src/components/CatalogueContent.tsx

@@ -6,7 +6,6 @@ import axios, { type AxiosError } from "axios";
 import { Button } from "@/components/ui/button";
 import { type IPaper, type Filters } from "@/interface";
 import Card from "./Card";
-import { extractBracketContent } from "@/util/utils";
 import { useRouter } from "next/navigation";
 import Loader from "./ui/loader";
 import SideBar from "../components/SideBar";
@@ -15,18 +14,7 @@ import { Filter } from "lucide-react";
 import { Sheet, SheetContent, SheetTrigger } from "./ui/sheet";
 import { Pin } from "lucide-react";
 import { StoredSubjects } from "@/interface";
-
-export async function downloadFile(url: string, filename: string) {
-  try {
-    const response = await axios.get(url, { responseType: "blob" });
-    const blob = new Blob([response.data]);
-    const link = document.createElement("a");
-    link.href = window.URL.createObjectURL(blob);
-    link.download = filename;
-    link.click();
-    window.URL.revokeObjectURL(link.href);
-  } catch (error) {}
-}
+import { getSecureUrl, generateFileName, downloadFile } from "@/util/download";
 
 const CatalogueContent = () => {
   const router = useRouter();
@@ -176,17 +164,15 @@ const CatalogueContent = () => {
   );
 
   const handleDownloadAll = useCallback(async () => {
-    /*    if (typeof window !== "undefined" && window.gtag) {
-      window.gtag("event", "download_all_clicked", {
-        event_category: "Paper Downloads",
-        event_label: "Download All Clicked",
-      });
-    } */
+    const uniquePapers = Array.from(
+      new Set(selectedPapers.map((paper) => paper._id)),
+    ).map((id) => selectedPapers.find((paper) => paper._id === id)) as IPaper[];
 
-    for (const paper of selectedPapers) {
-      const extension = paper.final_url.split(".").pop();
-      const fileName = `${extractBracketContent(paper.subject)}-${paper.exam}-${paper.slot}-${paper.year}.${extension}`;
-      await downloadFile(paper.final_url, fileName);
+    for (const paper of uniquePapers) {
+      await downloadFile(
+        getSecureUrl(paper.final_url),
+        generateFileName(paper),
+      );
     }
   }, [selectedPapers]);
 
@@ -272,7 +258,7 @@ const CatalogueContent = () => {
 
   return (
     <div className="relative flex min-h-screen justify-center p-0 md:justify-normal">
-      <div className="hidden w-[30%] min-w-fit md:block">
+      <div className="hidden !w-[22%] min-w-[22%] max-w-[22%] flex-shrink-0 md:block">
         <SideBar
           filtersNotPulled={filtersNotPulled}
           loading={loading}

src/components/Footer.tsx

@@ -110,38 +110,36 @@ export default function Footer() {
         </div>
 
         {/* Suggestions */}
-        <div className="flex w-full flex-col gap-2 text-black dark:text-white sm:w-[45%] lg:w-[25%]">
+        <div className="flex w-full flex-col gap-4 text-black dark:text-white sm:w-[45%] lg:w-[25%]">
           <h3 className="font-jost text-xl font-semibold">
             Drop Your Suggestions:
           </h3>
           <Link
             href={`mailto:[email protected]`}
-            className="mx-auto flex items-center center gap-2 sm:mx-0"
+            className="flex items-center gap-2"
           >
             <Mail size={18} />
             <span>[email protected]</span>
           </Link>
 
-          <div className="mt-4 flex w-full max-w-xs flex-col gap-2">
-            <h3 className="font-jost text-2xl font-semibold">
-              Subscribe For Updates:
-            </h3>
-            <div className="relative w-full">
-              <Input
-                id="email"
-                type="email"
-                placeholder="Enter Your Email"
-                className="pr-24"
-                value={email}
-                onChange={(e) => setEmail(e.target.value)}
-              />
-              <Button
-                onClick={handleSubscribe}
-                className="absolute right-0 top-0 h-full rounded-l-none rounded-r-md bg-[#562EE7] px-4 text-white hover:bg-[#4531b3]"
-              >
-                Subscribe!
-              </Button>
-            </div>
+          <h3 className="mt-4 font-jost text-xl font-semibold">
+            Subscribe For Updates:
+          </h3>
+          <div className="flex gap-2">
+            <Input
+              id="email"
+              type="email"
+              placeholder="Enter Your Email"
+              className="flex-1"
+              value={email}
+              onChange={(e) => setEmail(e.target.value)}
+            />
+            <Button
+              onClick={handleSubscribe}
+              className="rounded-md bg-[#562EE7] px-4 text-white hover:bg-[#4531b3]"
+            >
+              Subscribe!
+            </Button>
           </div>
         </div>
       </div>