included suggestions

backend/controller/admin.controller.js

@@ -82,7 +82,7 @@ async function loginAdmin(req, res) {
       message: "Login successful",
       token,
       role: "admin",
-      admin: { id: admin._id, name: admin.name, email: admin.email, role: "admin" },
+      admin: { id: admin._id, name: admin.name, email: admin.email, role: admin.role || "admin" },
     });
   } catch (error) {
     logger.error("Error logging in admin:", {

frontend/src/components/Pages/Admin.jsx

@@ -267,7 +267,7 @@ const Admin = () => {
           <div className="container grid grid-cols-1 gap-8 px-4 md:grid-cols-2 lg:grid-cols-1 md:px-6">
             <div className="event-list">
               {error && <p className="text-red-500">{error}</p>}
-              {events.map((event) => (
+              {events.length > 0 && events.map((event) => (
                 <div
                   key={event._id}
                   className="grid grid-cols-1 md:grid-cols-2 gap-10 lg:grid-cols-1 xl:grid-cols-2 md:px-6 lg:px-4 xl:px-0"

frontend/src/components/Pages/Admin/AdminLogin.jsx

@@ -26,6 +26,15 @@ const AdminLogin = () => {
 
   const handleSubmit = async (e) => {
     e.preventDefault();
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    if (!emailRegex.test(data.email)) {
+      setError('Please enter a valid email address');
+      return;
+    }
+    if (data.password.length < 8) {
+      setError('Password must be at least 8 characters long');
+      return;
+    }
     setIsLoading(true);
     setError(null);
     try {
@@ -122,8 +131,8 @@ const AdminLogin = () => {
           </Link>
         </h3>
 
-        <a
-          href={`${API_URL}/api/user/auth/google`}
+        <Link
+          to={`${API_URL}/api/user/auth/google`}
           className="w-full"
         >
           <button
@@ -132,7 +141,7 @@ const AdminLogin = () => {
           >
             Sign in with Google
           </button>
-        </a>
+        </Link>
 
         {error && <p className="text-red-500 mt-2">{error}</p>}
 

frontend/src/components/Pages/Admin/AdminSignup.jsx

@@ -42,7 +42,8 @@ const AdminSignup = () => {
       setIsLoading(false);
       return;
     }
-    if (!data.email.includes('@')) {
+    const emailRegex = /^[^\s@]+@[^\s@]+\.[^\s@]+$/;
+    if (!emailRegex.test(data.email)) {
       setError('Please enter a valid email address');
       setIsLoading(false);
       return;
@@ -163,11 +164,11 @@ const AdminSignup = () => {
             Login
           </Link>
         </h3>
-        <a href={`${API_URL}/api/user/auth/google`} className="w-full">
+        <Link to={`${API_URL}/api/user/auth/google`} className="w-full">
           <button className="button-confirm w-full h-10 rounded-md border-2 border-black bg-beige text-[17px] font-semibold shadow-[4px_4px_0px_0px_black] hover:text-green-300">
             Sign up with Google
           </button>
-        </a>
+        </Link>
         <button
           className="button-confirm w-full h-10 rounded-md border-2 border-black bg-beige text-[17px] font-semibold shadow-[4px_4px_0px_0px_black] mb-2 hover:text-green-300"
           onClick={handleSubmit}

frontend/src/components/Pages/Login.jsx

@@ -32,14 +32,14 @@ const Login = () => {
         body: JSON.stringify({ ...data, rememberMe }), // Include rememberMe in the body
       });
       const result = await response.json();
-      console.log(result);
+      // console.log(result);
 
       if (!response) {
         throw new Error(result.message || 'Login failed');
       }
       const res = JSON.stringify(result.user)
 
-      Cookies.set("authenticatedUser", res, {expires: 1, secure: true})
+      Cookies.set("authenticatedUser", res, {expires: 1, secure: true, sameSite: 'strict'})
 
       Cookies.set('authToken', result.token, {
         expires: rememberMe ? 7 : 1 / 24, // 7 days if Remember Me is checked, 1 hour otherwise

frontend/src/components/Pages/VerifyOtp.jsx

@@ -4,7 +4,7 @@ import React, { useState } from 'react';
 import { message } from 'antd';
 
 const VerifyOtp = () => {
-  const API_URL = process.env.VITE_BACKEND_URL || 'http://localhost:3000';
+  const API_URL = import.meta.env.VITE_BACKEND_URL || 'http://localhost:3000';
   const navigate = useNavigate(); // Use useNavigate for navigation
   const [otp, setOtp] = useState("")
 

frontend/src/context/userContext.jsx

@@ -1,13 +1,22 @@
 import React, { createContext, useState, useContext } from 'react';
 import Cookies from 'js-cookie';
 
-const UserContext = createContext();
+export const UserContext = createContext({
+  user: null,
+  setUser: () => {},
+});
 
 export const UserProvider = ({ children }) => {
   const data = Cookies.get("authenticatedUser");
 
-  const userData = data ? JSON.parse(data) : null;
-  console.log(userData);
+  let userData = null;
+  try {
+    userData = data ? JSON.parse(data) : null;
+  } catch (error) {
+    console.error('Invalid user data in cookie:', error);
+    Cookies.remove("authenticatedUser");
+  }
+
   const [user, setUser] = useState(userData);
 
   return (
@@ -17,4 +26,10 @@ export const UserProvider = ({ children }) => {
   );
 };
 
-export const useUser = () => useContext(UserContext);
+export const useUser = () => {
+  const context = useContext(UserContext);
+  if (context === undefined) {
+    throw new Error('useUser must be used within a UserProvider');
+  }
+  return context;
+};

frontend/src/router/ProtectedRoute.jsx

@@ -5,7 +5,11 @@ import { useUser } from '../context/userContext';
 const ProtectedRoute = ({ children }) => {
   const {user} = useUser();
 
-  return user.role == "admin" ? children : <Navigate to="/admin-login" />;
+  if (!user) {
+    return <Navigate to="/admin-login" />;
+  }
+
+  return user.role === "admin" ? children : <Navigate to="/admin-login" />;
 };
 
 export default ProtectedRoute;