Merge remote-tracking branch 'refs/remotes/origin/master'

Author: abhitrueprogrammer

package.json

@@ -26,7 +26,6 @@
     "cloudinary": "^2.2.0",
     "clsx": "^2.1.1",
     "cmdk": "1.0.0",
-    "cryptr": "^6.3.0",
     "debounce": "^2.1.1",
     "file-saver": "^2.0.5",
     "geist": "^1.3.0",
@@ -51,7 +50,6 @@
     "react-dom": "^18.3.0",
     "react-dropzone": "^14.2.3",
     "react-hot-toast": "^2.4.1",
-    "react-icons": "^5.3.0",
     "tailwind-merge": "^2.5.3",
     "tailwindcss-animate": "^1.0.7",
     "use-debounce": "^10.0.3",

pnpm-lock.yaml

@@ -1,15 +1,11 @@
 import { connectToDatabase } from "@/lib/mongoose";
 import bcrypt from "bcrypt";
-import Cryptr from "cryptr";
 import User, { type IUser } from "@/db/user";
 import { generateToken } from "@/lib/auth";
 import { NextResponse } from "next/server";
 import { type LoginRequest } from "@/interface";
 
-const cryptr = new Cryptr(process.env.CRYPTO_SECRET || "default_crypto_secret");
-
 export async function POST(req: Request) {
-  console.log(process.env.CRYPTO_SECRET);
   await connectToDatabase();
 
   const body = (await req.json()) as LoginRequest;
@@ -29,12 +25,10 @@ export async function POST(req: Request) {
 
     console.log("User logged in:", token);
 
-    const encryptedResponse = cryptr.encrypt(JSON.stringify({
+    return NextResponse.json({
       token,
       user: { id: user._id, email: user.email },
-    }));
-
-    return NextResponse.json({res: encryptedResponse}, { status: 200 });
+    }, { status: 200 });
   } catch (error) {
     console.error("Error logging in:", error);
     return NextResponse.json({ message: "Failed to login", error }, { status: 500 });

public/codechef_logo.svg

@@ -1,20 +1,15 @@
 import { NextResponse, NextRequest } from "next/server";
 import { connectToDatabase } from "@/lib/mongoose";
 import Paper from "@/db/papers";
-import Cryptr from "cryptr";
 import { type IPaper } from "@/interface";
 
-
-const cryptr = new Cryptr(process.env.CRYPTO_SECRET ?? "default_crypto_secret");
-
 export const dynamic = "force-dynamic";
 
 export async function GET(req: NextRequest) {
   try {
     await connectToDatabase();
     const url = req.nextUrl.searchParams;
     const subject = url.get("subject");
-    console.log("Subject:", subject);
     const escapeRegExp = (text: string) => {
       return text.replace(/[.*+?^${}()|[\]\\]/g, "\\$&");
     };
@@ -38,21 +33,20 @@ export async function GET(req: NextRequest) {
         { status: 404 },
       );
     }
-    
+
     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 encryptedResponse = cryptr.encrypt(
-      JSON.stringify({ papers, uniqueYears, uniqueSlots, uniqueExams }),
+    return NextResponse.json(
+      { papers, uniqueYears, uniqueSlots, uniqueExams },
+      { status: 200 }
     );
-
-    return NextResponse.json({ res: encryptedResponse }, { status: 200 });
   } catch (error) {
     console.error("Error fetching papers by subject:", error);
     return NextResponse.json(
       { message: "Failed to fetch papers", error },
-      { status: 500 },
+      { status: 500 }
     );
   }
 }

public/papers.png

@@ -1,9 +1,6 @@
 import { NextResponse } from "next/server";
 import { connectToDatabase } from "@/lib/mongoose";
 import Paper from "@/db/papers";
-import Cryptr from "cryptr";
-
-const cryptr = new Cryptr(process.env.CRYPTO_SECRET ?? "default_crypto_secret");
 
 export const dynamic = "force-dynamic";
 
@@ -16,7 +13,7 @@ export async function GET(req: Request) {
     if (!searchText) {
       return NextResponse.json(
         { message: "Text query parameter is required" },
-        { status: 400 },
+        { status: 400 }
       );
     }
 
@@ -29,18 +26,16 @@ export async function GET(req: Request) {
     if (subjects.length === 0) {
       return NextResponse.json(
         { message: "No subjects found for the specified text" },
-        { status: 404 },
+        { status: 404 }
       );
     }
 
-    const encryptedResponse = cryptr.encrypt(JSON.stringify({ subjects }));
-
-    return NextResponse.json({ res: encryptedResponse }, { status: 200 });
+    return NextResponse.json({ subjects }, { status: 200 });
   } catch (error) {
     console.error("Error fetching subjects:", error);
     return NextResponse.json(
       { message: "Failed to fetch subjects", error },
-      { status: 500 },
+      { status: 500 }
     );
   }
 }

src/app/api/auth/login/route.ts

@@ -3,7 +3,6 @@
 import CatalogueContent from "@/components/CatalogueContent";
 import { Suspense } from "react";
 import Navbar from "@/components/Navbar";
-import { RiLoader2Fill } from "react-icons/ri";
 import Loader from "@/components/ui/loader";
 const Catalogue = () => {
   return (

src/app/api/papers/route.ts

@@ -9,10 +9,10 @@ export const metadata: Metadata = {
   metadataBase: new URL("https://papers.codechefvit.com/"),
   title: "Papers",
   description: "Made with ♡ by CodeChef-VIT",
-  icons: [{ rel: "icon", url: "/chefshat.svg" }],
+  icons: [{ rel: "icon", url: "/codechef_logo.svg" }],
   openGraph: {
     title: "Papers",
-    images: [{ url: "/cookoff.png" }],
+    images: [{ url: "/papers.png" }],
     url: "https://papers.codechefvit.com/",
     type: "website",
     description: "Made with ♡ by CodeChef-VIT",
@@ -39,7 +39,7 @@ export default function RootLayout({
       <body>
         <ThemeProvider
           attribute="class"
-          defaultTheme="system"
+          defaultTheme="dark"
           enableSystem
           disableTransitionOnChange
         >

src/app/api/search/route.ts

@@ -5,56 +5,43 @@ import { useRouter } from "next/navigation";
 import {
   type LoginResponse,
   type ErrorResponse,
-  type DecryptedLoginResponse,
 } from "@/interface";
-import Cryptr from "cryptr";
 import { handleAPIError } from "@/util/error";
-import { totalmem } from "os";
 import toast from "react-hot-toast";
 import { ApiError } from "next/dist/server/api-utils";
-const cryptr = new Cryptr(
-  process.env.NEXT_PUBLIC_CRYPTO_SECRET ?? "default_crypto_secret",
-);
 
 const LoginPage = () => {
   const router = useRouter();
   const [email, setEmail] = useState("");
   const [password, setPassword] = useState("");
   const [error, setError] = useState<string | null>(null);
+
   async function apiLogin() {
     try {
       const response = await axios.post<LoginResponse>("/api/auth/login", {
         email,
         password,
       });
 
-      const { res } = response.data;
-      const decryptedToken = cryptr.decrypt(res);
-      try {
-        const message = JSON.parse(decryptedToken) as DecryptedLoginResponse;
-        const token = message.token;
-        localStorage.setItem("token", token);
-        return response.data;
-        // router.push("/adminupload");
-      } catch (error) {
-        toast.error(`Failed to parse decrypted token${error}`);
-      }
+      const { token } = response.data;
+      localStorage.setItem("token", token);
+      return response.data;
     } catch (error) {
       throw handleAPIError(error);
     }
   }
+
   const handleLogin = async () => {
     try {
       const response = await toast.promise(
         apiLogin(),
-
         {
           loading: "Logging you in...",
           success: "Logged in!",
           error: (err: ApiError) => err.message,
         },
       );
-      if (response && "res" in response) {
+      if (response) {
         setTimeout(() => {
           router.push("/adminupload");
         }, 1500);