made shit faster

NishantGupt786 · NishantGupt786 · commit a86fa785e6e1 · 2024-10-07T21:52:05.000+05:30
diff --git a/package.json b/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",
diff --git a/pnpm-lock.yaml b/pnpm-lock.yaml
diff --git a/src/app/api/auth/login/route.ts b/src/app/api/auth/login/route.ts
@@ -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 });
diff --git a/src/app/api/papers/route.ts b/src/app/api/papers/route.ts
@@ -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 }
     );
   }
 }
diff --git a/src/app/api/search/route.ts b/src/app/api/search/route.ts
@@ -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 }
     );
   }
 }
diff --git a/src/app/catalogue/page.tsx b/src/app/catalogue/page.tsx
@@ -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 (
diff --git a/src/app/papersadminlogin/page.tsx b/src/app/papersadminlogin/page.tsx
@@ -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);
diff --git a/src/components/Card.tsx b/src/components/Card.tsx
@@ -9,7 +9,6 @@ import {
 import { capsule } from "@/util/utils";
 import axios from "axios";
 import { useRouter } from "next/navigation";
-import Link from "next/link";
 
 const Card = ({
   paper,
diff --git a/src/components/CatalogueContent.tsx b/src/components/CatalogueContent.tsx
@@ -1,21 +1,15 @@
 import { useSearchParams } from "next/navigation";
 import { useEffect, useState } from "react";
 import axios, { type AxiosError } from "axios";
-import Cryptr from "cryptr";
 import { Button } from "@/components/ui/button";
 import { type Paper, 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 { RiLoader2Fill } from "react-icons/ri";
 import Loader from "./ui/loader";
 
-const cryptr = new Cryptr(
-  process.env.NEXT_PUBLIC_CRYPTO_SECRET ?? "default_crypto_secret",
-);
-
 const CatalogueContent = () => {
   const searchParams = useSearchParams();
   const router = useRouter();
@@ -121,14 +115,9 @@ const CatalogueContent = () => {
           const papersResponse = await axios.get("/api/papers", {
             params: { subject },
           });
-          const { res: encryptedPapersResponse } = papersResponse.data;
-          const decryptedPapersResponse = cryptr.decrypt(
-            encryptedPapersResponse,
-          );
-          const papersData: Paper[] = JSON.parse(
-            decryptedPapersResponse,
-          ).papers;
-          const filters: Filters = JSON.parse(decryptedPapersResponse);
+          const papersData: Paper[] = papersResponse.data.papers;
+          const filters: Filters = papersResponse.data;
+
           setFilterOptions(filters);
 
           const papersDataWithFilters = papersData.filter((paper) => {
@@ -189,8 +178,7 @@ const CatalogueContent = () => {
 
       {error && <p className="text-red-500">{error}</p>}
       {loading ? (
-           <Loader />
-
+        <Loader />
       ) : papers.length > 0 ? (
         <>
           <div className="mb-4 flex justify-center gap-2 md:justify-end 2xl:mr-4">
diff --git a/src/components/searchbar.tsx b/src/components/searchbar.tsx
@@ -3,14 +3,9 @@
 import { useState, useCallback } from "react";
 import axios, { AxiosError } from "axios";
 import { Search } from "lucide-react";
-import Cryptr from "cryptr";
 import debounce from 'debounce';
 import { useRouter } from "next/navigation";  
-import { Input } from "@/components/ui/input"
-
-const cryptr = new Cryptr(
-  process.env.NEXT_PUBLIC_CRYPTO_SECRET ?? "default_crypto_secret"
-);
+import { Input } from "@/components/ui/input";
 
 function SearchBar () {
   const router = useRouter();  
@@ -28,9 +23,7 @@ function SearchBar () {
             params: { text },
           });
 
-          const { res: encryptedSearchResponse } = searchResponse.data;
-          const decryptedSearchResponse = cryptr.decrypt(encryptedSearchResponse);
-          const { subjects } = JSON.parse(decryptedSearchResponse);
+          const { subjects } = searchResponse.data;
           const suggestionList = subjects.map((subjectObj: { subject: string }) => subjectObj.subject);
           setSuggestions(suggestionList);
           setError(null);
@@ -45,7 +38,7 @@ function SearchBar () {
         setSuggestions([]);
       }
     }, 500),
-    [cryptr]
+    []
   );
 
   const handleSearchChange = (e: React.ChangeEvent<HTMLInputElement>) => {
diff --git a/src/db/papers.ts b/src/db/papers.ts
@@ -4,12 +4,14 @@ import { type IPaper } from "@/interface";
 const paperSchema = new Schema<IPaper>({
   finalUrl: { type: String, required: true },
   thumbnailUrl: { type: String, required: true },
-  subject: { type: String, required: true },
+  subject: { type: String, required: true, index: true },
   slot: { type: String, required: true },
   year: { type: String, required: true },
   exam: { type: String, enum: ["CAT-1", "CAT-2", "FAT"], required: true },
 });
 
+paperSchema.index({ subject: 1 });
+
 const Paper: Model<IPaper> =
   mongoose.models.Paper ?? mongoose.model<IPaper>("Paper", paperSchema);
 
diff --git a/src/interface.ts b/src/interface.ts
@@ -61,7 +61,7 @@ export interface ConverttoPDFResponse {
 }
 
 export interface LoginResponse {
-  res: string;
+  token: string;
 }
 
 export interface ErrorResponse {
diff --git a/src/lib/mongoose.ts b/src/lib/mongoose.ts
@@ -13,7 +13,7 @@ export const connectToDatabase = async () => {
     return;
   }
 
-  if (mongoose.connection.readyState >= mongoose.ConnectionStates.connected) {
+  if (mongoose.connection.readyState === mongoose.ConnectionStates.connected) {
     isConnected = true;
     return;
   }
