Added Share feature on social media for restaurants

backend/controllers/authController.js

@@ -53,7 +53,7 @@ export const loginUser = async (req, res) => {
   }
 
   // Generate JWT
-  const token = generateToken(user._id);
+  const token = generateToken(user._id);  
 
   // Set JWT in secure, HTTP-only cookie
   res.cookie('token', token, {

backend/controllers/paymentController.js

@@ -22,7 +22,7 @@ export const createOrder = async (req, res) => {
     res.status(200).json({
       success: true,
       orderId: order.id,
-      amount: order.amount,
+      amount: order.amount, 
       currency: order.currency,
     });
   } catch (error) {

frontend/package.json

@@ -13,7 +13,7 @@
     "@emotion/react": "^11.14.0",
     "@emotion/styled": "^11.14.1",
     "@mui/material": "^7.3.2",
-    "axios": "^1.11.0",
+    "axios": "^1.12.1",
     "gsap": "^3.13.0",
     "html2pdf.js": "^0.10.3",
     "leaflet": "^1.9.4",

frontend/src/App.jsx

@@ -27,6 +27,11 @@ import ScrollToBottom from "./components/ScrollToBottomButton/ScrollToBottomButt
 import ReferralProgram from "./components/Referrals/ReferralProgram";
 import AboutUs from "./components/Aboutus/Aboutus";
 import FAQ from "./components/FAQ/FAQ";
+import MyProfile from "./pages/MyProfile/MyProfile";
+import MyOrder from "./pages/MyOrder/MyOrder";
+import ConfirmOrder from "./pages/ConfirmOrder.jsx/ConfirmOrder";
+import Payment from "./pages/Payment/Payment";
+import OrderSuccess from "./pages/OrderSuccess/OrderSuccess";
 import Privacy from "./components/Privacy/privacy";
 import FeedbackReviews from "./components/FeedbackReviews/FeedbackReviews";
 
@@ -96,6 +101,116 @@ const App = () => {
             <Route path="/referral" element={<ReferralProgram />} />
             <Route path="/restaurant/:id" element={<RestaurantDetail />} />
             <Route path="/aboutus" element={<AboutUs />} />
+            <Route
+              path="/profile/me"
+              element={
+                isLoggedIn ? (<MyProfile />) : (
+                  <div style={{ padding: "2rem", textAlign: "center" }}>
+                    <h2
+                      style={{
+                        color: "#f97316", // Tailwind's orange-500
+                        fontSize: "2rem",
+                        fontWeight: "bold",
+                        textShadow: "1px 1px 2px rgba(0,0,0,0.2)",
+                        marginBottom: "0.5rem",
+                      }}
+                    >
+                      Please Log In To Proceed
+                    </h2>
+                    <p style={{ color: "#fdba74", fontSize: "1rem" }}>
+                      Your journey continues after login 🔐
+                    </p>
+                  </div>
+                )
+              } />
+            <Route
+              path="/orders/me"
+              element={
+                isLoggedIn ? (<MyOrder />) : (
+                  <div style={{ padding: "2rem", textAlign: "center" }}>
+                    <h2
+                      style={{
+                        color: "#f97316", // Tailwind's orange-500
+                        fontSize: "2rem",
+                        fontWeight: "bold",
+                        textShadow: "1px 1px 2px rgba(0,0,0,0.2)",
+                        marginBottom: "0.5rem",
+                      }}
+                    >
+                      Please Log In To Proceed
+                    </h2>
+                    <p style={{ color: "#fdba74", fontSize: "1rem" }}>
+                      Your journey continues after login 🔐
+                    </p>
+                  </div>
+                )
+              } />
+              <Route 
+              path="/order/confirm" 
+              element={
+                isLoggedIn ? (<ConfirmOrder/>) : (
+                  <div style={{ padding: "2rem", textAlign: "center" }}>
+                    <h2
+                      style={{
+                        color: "#f97316", // Tailwind's orange-500
+                        fontSize: "2rem",
+                        fontWeight: "bold",
+                        textShadow: "1px 1px 2px rgba(0,0,0,0.2)",
+                        marginBottom: "0.5rem",
+                      }}
+                    >
+                      Please Log In To Proceed
+                    </h2>
+                    <p style={{ color: "#fdba74", fontSize: "1rem" }}>
+                      Your journey continues after login 🔐
+                    </p>
+                  </div>
+                )
+              }/>
+              <Route 
+              path="/order/payment" 
+              element={
+              isLoggedIn ? (<Payment/>) : (
+                <div style={{ padding: "2rem", textAlign: "center" }}>
+                    <h2
+                      style={{
+                        color: "#f97316", // Tailwind's orange-500
+                        fontSize: "2rem",
+                        fontWeight: "bold",
+                        textShadow: "1px 1px 2px rgba(0,0,0,0.2)",
+                        marginBottom: "0.5rem",
+                      }}
+                    >
+                      Please Log In To Proceed
+                    </h2>
+                    <p style={{ color: "#fdba74", fontSize: "1rem" }}>
+                      Your journey continues after login 🔐
+                    </p>
+                  </div>
+              )
+              }/>
+              <Route 
+              path="/order/Success" 
+              element={
+              isLoggedIn ? (<OrderSuccess/>) : (
+                <div style={{ padding: "2rem", textAlign: "center" }}>
+                    <h2
+                      style={{
+                        color: "#f97316", // Tailwind's orange-500
+                        fontSize: "2rem",
+                        fontWeight: "bold",
+                        textShadow: "1px 1px 2px rgba(0,0,0,0.2)",
+                        marginBottom: "0.5rem",
+                      }}
+                    >
+                      Please Log In To Proceed
+                    </h2>
+                    <p style={{ color: "#fdba74", fontSize: "1rem" }}>
+                      Your journey continues after login 🔐
+                    </p>
+                  </div>
+              )
+              }/>
             <Route path="/privacy" element={<Privacy />} />
             <Route path="*" element={<NotFound />} />
           </Routes>

frontend/src/components/LoginPopup/LoginPopup.jsx

@@ -132,13 +132,13 @@ const LoginPopup = ({ setShowLogin }) => {
   const handleResetPassword = (e) => {
     e.preventDefault();
     if (newPassword !== confirmPassword) return toast.error("Passwords do not match");
-      toast.success("Password reset successfully!");
-      setForgotFlow(false);
-      setStage(1);
-      setOtp(Array(6).fill(""));
-      setCurrState("Login");
-    };
-    const handleSubmit = async (e) => {
+    toast.success("Password reset successfully!");
+    setForgotFlow(false);
+    setStage(1);
+    setOtp(Array(6).fill(""));
+    setCurrState("Login");
+  };
+  const handleSubmit = async (e) => {
     e.preventDefault();
 
     const formData = new FormData(e.target);
@@ -148,8 +148,8 @@ const LoginPopup = ({ setShowLogin }) => {
     const confirmPassword = formData.get("confirmPassword");
 
     if (!email || !password || (currState === "Sign Up" && !name)) {
-        return toast.error("Please fill all fields");
-      }
+      return toast.error("Please fill all fields");
+    }
 
     if (currState === "Sign Up" && password !== confirmPassword) {
       return toast.error("Passwords do not match");
@@ -159,15 +159,17 @@ const LoginPopup = ({ setShowLogin }) => {
       currState === "Sign Up" ? "/api/auth/register" : "/api/auth/login";
 
     try {
-        const { data } = await apiRequest.post(endpoint, { name, email, password });
+      const { data } = await apiRequest.post(endpoint, { name, email, password }, {
+        headers: { "Content-Type": "application/json" },
+        withCredentials: true
+      });
 
       toast.success(`${currState} successful!`);
 
-      // Store user info and auth token locally
+      // Store user info locally (no token)
+      localStorage.setItem("authToken", data.token);
       localStorage.setItem("user", JSON.stringify(data.user));
-      if (data.token) {
-        localStorage.setItem("authToken", data.token);
-      }
+
 
       setShowLogin(false);
       window.location.reload();

frontend/src/components/Navbar/Navbar.css

@@ -136,9 +136,13 @@ body {
   flex: 0 0 auto;
   display: flex;
   align-items: center;
-  gap: 1rem;
+  gap: 0.5rem;
   /* gap: 10px; */
-  /* margin-right: 10px; */
+}
+.menu-item{
+  display:flex;
+  align-items: center;
+  gap:0.5vmax;
 }
 
 /* ACTION BUTTONS */