diff --git a/README.md b/README.md
index 857acad35..6dcf12d27 100644
--- a/README.md
+++ b/README.md
@@ -91,7 +91,7 @@ Technologies Used :
 - [Check it out here :eyes:](https://www.figma.com/design/sttuMcIvVuk7AORRMS70s5/VigyBag-Redesign?node-id=0-1&t=hA6fe3u7c9kflZzx-0)
 
 
-We accpet contributions to our project pertaining to the [Code of Conduct](https://github.com/codervivek5/VigyBag?tab=coc-ov-file) and [Contributing Guidelines](https://github.com/codervivek5/VigyBag/blob/main/CONTRIBUTING.md) stated below.
+We accept contributions to our project pertaining to the [Code of Conduct](https://github.com/codervivek5/VigyBag?tab=coc-ov-file) and [Contributing Guidelines](https://github.com/codervivek5/VigyBag/blob/main/CONTRIBUTING.md) stated below.
 
     
 ## :handshake: Contributing <a name="contributing"></a>
diff --git a/src/User/components/Popular_Categories/ProductGrid.jsx b/src/User/components/Popular_Categories/ProductGrid.jsx
index cd2b310a1..6558a85c9 100644
--- a/src/User/components/Popular_Categories/ProductGrid.jsx
+++ b/src/User/components/Popular_Categories/ProductGrid.jsx
@@ -6,6 +6,7 @@ import toast from "react-hot-toast";
 import { useNavigate } from "react-router-dom";
 import { FaHeart, FaRegHeart } from "react-icons/fa";
 import PaymentPage from "../../pages/Payment/Payment";
+import { useAuth } from "../../../context/AuthContext";
 
 // ProductGrid component to display a grid of products
 function ProductGrid({ products, headingText }) {
@@ -35,6 +36,7 @@ function ProductGrid({ products, headingText }) {
 function ProductCard({ product }) {
   const navigate = useNavigate();
   const dispatch = useDispatch();
+  const { isLoggedIn } = useAuth();
   const cartItems = useSelector((state) => state.cart.items);
   const wishlistItems = useSelector((state) => state.wishlist.items);
 
@@ -43,11 +45,21 @@ function ProductCard({ product }) {
   };
 
   const handleBuyNow = () => {
+    if (!isLoggedIn) {
+      toast.error("Please login to buy products!");
+      navigate("/auth");
+      return;
+    }
     navigate(`/checkout`);
   };
 
   // Function to add product to cart
   const onAddToCart = (product) => {
+    if (!isLoggedIn) {
+      toast.error("Please login to add items to cart!");
+      navigate("/auth");
+      return;
+    }
     const quantity = 1;
     dispatch(manageCartItem({ product, quantity }));
     toast.success("Successfully added to cart!");
@@ -66,6 +78,11 @@ function ProductCard({ product }) {
         <button
           className="mt-2 md:ml-48 ml-80 text-red-600 absolute top-0 right-2 p-2 bg-red-100 rounded-full hover:bg-red-200 transition"
           onClick={() => {
+            if (!isLoggedIn) {
+              toast.error("Please login to manage wishlist!");
+              navigate("/auth");
+              return;
+            }
             onAddToWishlist(product);
             toast.success("Item removed from wishlist!");
           }}>
@@ -75,6 +92,11 @@ function ProductCard({ product }) {
         <button
           className="mt-2 md:ml-48 ml-80 text-red-600 absolute top-0 right-2 p-2 bg-red-100 rounded-full hover:bg-red-200 transition"
           onClick={() => {
+            if (!isLoggedIn) {
+              toast.error("Please login to add items to wishlist!");
+              navigate("/auth");
+              return;
+            }
             onAddToWishlist(product);
             toast.success("Item added to wishlist!");
           }}>
diff --git a/src/User/components/ProductCard/ProductCard.jsx b/src/User/components/ProductCard/ProductCard.jsx
index 89d42ff6b..35112405a 100644
--- a/src/User/components/ProductCard/ProductCard.jsx
+++ b/src/User/components/ProductCard/ProductCard.jsx
@@ -1,7 +1,23 @@
 import React from "react";
 import { FaStar } from "react-icons/fa";
+import { useAuth } from "../../../context/AuthContext";
+import { useNavigate } from "react-router-dom";
 
 const ProductCard = ({ image, title, price, rating }) => {
+  const { isLoggedIn } = useAuth();
+  const navigate = useNavigate();
+
+  const handleAddToCart = () => {
+    if (!isLoggedIn) {
+      alert("Please login to add items to your cart!");
+      navigate("/auth");
+      return;
+    }
+    
+    // Add to cart logic here
+    alert(`${title} added to cart!`);
+  };
+
   return (
     <div className="bg-white rounded-lg shadow-md p-4 h-full flex flex-col">
       <img
@@ -22,6 +38,7 @@ const ProductCard = ({ image, title, price, rating }) => {
         </div>
 
         <button
+          onClick={handleAddToCart}
           className="mt-auto w-full bg-green-500 text-white py-2 rounded-md hover:bg-green-600"
           style={{
             display: "flex",
diff --git a/src/context/AuthContext.jsx b/src/context/AuthContext.jsx
index 6d6572b24..a7a0d1303 100644
--- a/src/context/AuthContext.jsx
+++ b/src/context/AuthContext.jsx
@@ -4,12 +4,35 @@ const AuthContext = createContext();
 
 export const AuthProvider = ({ children }) => {
   const [isAdmin, setIsAdmin] = useState(false);
+  const [isLoggedIn, setIsLoggedIn] = useState(false);
+  const [user, setUser] = useState(null);
 
-  const loginAsAdmin = () => setIsAdmin(true);
-  const loginAsUser = () => setIsAdmin(false);
+  const loginAsAdmin = () => {
+    setIsAdmin(true);
+    setIsLoggedIn(true);
+  };
+  
+  const loginAsUser = (userData = null) => {
+    setIsAdmin(false);
+    setIsLoggedIn(true);
+    setUser(userData);
+  };
+
+  const logout = () => {
+    setIsAdmin(false);
+    setIsLoggedIn(false);
+    setUser(null);
+  };
 
   return (
-    <AuthContext.Provider value={{ isAdmin, loginAsAdmin, loginAsUser }}>
+    <AuthContext.Provider value={{ 
+      isAdmin, 
+      isLoggedIn, 
+      user, 
+      loginAsAdmin, 
+      loginAsUser, 
+      logout 
+    }}>
       {children}
     </AuthContext.Provider>
   );