Merge branch 'main' into verified_users

RamakrushnaBiswal · Oct 29, 2024 · 212567c · 212567c
2 parents 4704cdd + 9056618
commit 212567c
Show file tree

Hide file tree

Showing 16 changed files with 245 additions and 61 deletions.
diff --git a/README.md b/README.md
@@ -260,6 +260,22 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
                 </a>
             </td>
             <td align="center">
+
+                <a href="https://github.com/haseebzaki-07">
+                    <img src="https://avatars.githubusercontent.com/u/147314463?v=4" width="100;" alt="haseebzaki-07"/>
+                    <br />
+                    <sub><b>Haseeb Zaki</b></sub>
+                </a>
+            </td>
+            <td align="center">
+                <a href="https://github.com/jainaryan04">
+                    <img src="https://avatars.githubusercontent.com/u/138214350?v=4" width="100;" alt="jainaryan04"/>
+                    <br />
+                    <sub><b>Aryan Ramesh Jain</b></sub>
+                </a>
+            </td>
+            <td align="center">
+
                 <a href="https://github.com/alo7lika">
                     <img src="https://avatars.githubusercontent.com/u/152315710?v=4" width="100;" alt="alo7lika"/>
                     <br />
@@ -274,19 +290,19 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
                 </a>
             </td>
             <td align="center">
-                <a href="https://github.com/itznayan">
-                    <img src="https://avatars.githubusercontent.com/u/136584376?v=4" width="100;" alt="itznayan"/>
+                <a href="https://github.com/tejasbenibagde">
+                    <img src="https://avatars.githubusercontent.com/u/124677750?v=4" width="100;" alt="tejasbenibagde"/>
                     <br />
-                    <sub><b>Mahera Nayan</b></sub>
+                    <sub><b>Tejas Benibagde</b></sub>
                 </a>
             </td>
 		</tr>
 		<tr>
             <td align="center">
-                <a href="https://github.com/tejasbenibagde">
-                    <img src="https://avatars.githubusercontent.com/u/124677750?v=4" width="100;" alt="tejasbenibagde"/>
+                <a href="https://github.com/itznayan">
+                    <img src="https://avatars.githubusercontent.com/u/136584376?v=4" width="100;" alt="itznayan"/>
                     <br />
-                    <sub><b>Tejas Benibagde</b></sub>
+                    <sub><b>Mahera Nayan</b></sub>
                 </a>
             </td>
             <td align="center">
@@ -327,27 +343,47 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
 		</tr>
 		<tr>
             <td align="center">
+
                 <a href="https://github.com/Suhas-Koheda">
                     <img src="https://avatars.githubusercontent.com/u/72063139?v=4" width="100;" alt="Suhas-Koheda"/>
                     <br />
                     <sub><b>Suhas Koheda</b></sub>
-                </a>
-            </td>
-            <td align="center">
+
                 <a href="https://github.com/Jay-1409">
                     <img src="https://avatars.githubusercontent.com/u/166749819?v=4" width="100;" alt="Jay-1409"/>
                     <br />
                     <sub><b>Jay shah</b></sub>
+
                 </a>
             </td>
             <td align="center">
+
+                <a href="https://github.com/Jay-1409">
+                    <img src="https://avatars.githubusercontent.com/u/166749819?v=4" width="100;" alt="Jay-1409"/>
+
                 <a href="https://github.com/vishnuprasad2004">
                     <img src="https://avatars.githubusercontent.com/u/116942066?v=4" width="100;" alt="vishnuprasad2004"/>
                     <br />
                     <sub><b>Vishnu Prasad Korada</b></sub>
                 </a>
             </td>
             <td align="center">
+                <a href="https://github.com/sajalbatra">
+                    <img src="https://avatars.githubusercontent.com/u/125984550?v=4" width="100;" alt="sajalbatra"/>
+
+                    <br />
+                    <sub><b>Jay shah</b></sub>
+                </a>
+            </td>
+            <td align="center">
+                <a href="https://github.com/PavanTeja2005">
+                    <img src="https://avatars.githubusercontent.com/u/98730339?v=4" width="100;" alt="PavanTeja2005"/>
+                    <br />
+                    <sub><b>PavanTeja2005</b></sub>
+                </a>
+            </td>
+            <td align="center">
+
                 <a href="https://github.com/sajalbatra">
                     <img src="https://avatars.githubusercontent.com/u/125984550?v=4" width="100;" alt="sajalbatra"/>
                     <br />
@@ -359,6 +395,12 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
                     <img src="https://avatars.githubusercontent.com/u/98730339?v=4" width="100;" alt="PavanTeja2005"/>
                     <br />
                     <sub><b>PavanTeja2005</b></sub>
+
+                <a href="https://github.com/AE-Hertz">
+                    <img src="https://avatars.githubusercontent.com/u/93651229?v=4" width="100;" alt="AE-Hertz"/>
+                    <br />
+                    <sub><b>Abhinandan</b></sub>
+
                 </a>
             </td>
             <td align="center">
@@ -377,6 +419,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
                     <sub><b>Navneet Dadhich</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/VinayLodhi1712">
                     <img src="https://avatars.githubusercontent.com/u/135756009?v=4" width="100;" alt="VinayLodhi1712"/>
@@ -421,6 +465,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
                     <sub><b>Tanishi Rai</b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/Picodes10">
                     <img src="https://avatars.githubusercontent.com/u/91375618?v=4" width="100;" alt="Picodes10"/>
@@ -450,14 +496,23 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
                 </a>
             </td>
             <td align="center">
+
+                <a href="https://github.com/meghanakn473">
+                    <img src="https://avatars.githubusercontent.com/u/165137755?v=4" width="100;" alt="meghanakn473"/>
+                    <br />
+                    <sub><b>K N Meghana</b></sub>
+                </a>
+            </td>
+		</tr>
+		<tr>
+            <td align="center">
+
                 <a href="https://github.com/Ayush215mb">
                     <img src="https://avatars.githubusercontent.com/u/154300084?v=4" width="100;" alt="Ayush215mb"/>
                     <br />
                     <sub><b>Ayush Yadav</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/smog-root">
                     <img src="https://avatars.githubusercontent.com/u/181578777?v=4" width="100;" alt="smog-root"/>
@@ -493,15 +548,15 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
                     <sub><b>Stuti </b></sub>
                 </a>
             </td>
+		</tr>
+		<tr>
             <td align="center">
                 <a href="https://github.com/Sapna127">
                     <img src="https://avatars.githubusercontent.com/u/91309280?v=4" width="100;" alt="Sapna127"/>
                     <br />
                     <sub><b>Sapna Kul</b></sub>
                 </a>
             </td>
-		</tr>
-		<tr>
             <td align="center">
                 <a href="https://github.com/MutiatBash">
                     <img src="https://avatars.githubusercontent.com/u/108807732?v=4" width="100;" alt="MutiatBash"/>
@@ -524,6 +579,17 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
                 </a>
             </td>
             <td align="center">
+
+                <a href="https://github.com/harjasae2001">
+                    <img src="https://avatars.githubusercontent.com/u/83627055?v=4" width="100;" alt="harjasae2001"/>
+                    <br />
+                    <sub><b>Harjas Singh</b></sub>
+                </a>
+            </td>
+		</tr>
+		<tr>
+            <td align="center">
+
                 <a href="https://github.com/mishradev1">
                     <img src="https://avatars.githubusercontent.com/u/118660840?v=4" width="100;" alt="mishradev1"/>
                     <br />
@@ -537,6 +603,13 @@ We extend our heartfelt gratitude to all the amazing contributors who have made
                     <sub><b>CHIKATLA RAKESH</b></sub>
                 </a>
             </td>
+            <td align="center">
+                <a href="https://github.com/AnushkaChouhan25">
+                    <img src="https://avatars.githubusercontent.com/u/157525924?v=4" width="100;" alt="AnushkaChouhan25"/>
+                    <br />
+                    <sub><b>Anushka Chouhan</b></sub>
+                </a>
+            </td>
             <td align="center">
                 <a href="https://github.com/AliGates915">
                     <img src="https://avatars.githubusercontent.com/u/128673394?v=4" width="100;" alt="AliGates915"/>

diff --git a/backend/controller/customer.controller.js b/backend/controller/customer.controller.js
@@ -97,16 +97,16 @@ async function loginCustomer(req, res) {
 
   try {
     const customer = await Customer.findOne({ email: req.body.email });
+
     if (!customer) {
       return res.status(401).json({ error: "Invalid email or password" });
     }
-
-    // Check if the customer is verified
     if (!customer.isVerified) {
       return res.status(403).json({ error: "Account not verified. Please verify your email." });
     }
 
     const validPassword = await bcrypt.compare(req.body.password, customer.password);
+
     if (!validPassword) {
       return res.status(401).json({ error: "Invalid email or password" });
     }
@@ -123,7 +123,21 @@ async function loginCustomer(req, res) {
       process.env.JWT_SECRET,
       { expiresIn: "1h" } // Expires in 1 hour
     );
-    res.json({
+
+
+    req.session.user = { 
+      id: customer._id, 
+      name: customer.name,
+    };
+
+    res.cookie("authToken", token, {
+      maxAge: 1000 * 60 * 60,
+      httpOnly: true,               
+      secure: true,                
+    });
+
+    return res.json({
+
       message: "Login successful",
       token,
       role: "customer",
@@ -135,6 +149,7 @@ async function loginCustomer(req, res) {
     });
   } catch (error) {
     console.error("Error during login:", error);
+
     res.status(500).json({ error: "Internal server error" });
   }
 }
@@ -165,9 +180,19 @@ async function resetPassword(req, res) {
   }
 }
 
+async function logout(req, res){
+  req.session.destroy((err) => {
+    if (err) {
+      return res.status(500).send("Failed to log out.");
+    }
+    res.send("Logged out successfully!");
+  });
+}
+
 module.exports = {
   createCustomer,
   loginCustomer,
   resetPassword,
+  logout,
   verifyOtp
 };
diff --git a/backend/index.js b/backend/index.js
@@ -9,6 +9,8 @@ const passport = require("passport");
 const { handleGoogleOAuth } = require("./controller/googleOAuth.controller");
 const app = express();
 const port = process.env.PORT || 3000;
+const session = require("express-session");
+const MongoStore = require("connect-mongo");
 
 // CORS configuration
 const corsOptions = {
@@ -42,6 +44,21 @@ mongoose
 // Initialize passport middleware
 app.use(passport.initialize());
 
+app.use(
+  session({
+    secret: process.env.SECRET_KEY,
+    resave: false,
+    saveUninitialized: false,
+    cookie: {
+      maxAge: 1000 * 60 * 60 * 24,
+      secure: false,
+    },
+    store: MongoStore.create({
+      mongoUrl: process.env.MONGO_URI,
+    }),
+  })
+);
+
 // API routes
 app.use("/api", require("./routes/index"));
 

diff --git a/backend/middlewares/sessionMiddleware.js b/backend/middlewares/sessionMiddleware.js
@@ -0,0 +1,12 @@
+const sessionMiddleware = async (req, res, next)=>{
+    console.log(req.session.user);
+
+
+    if (req.session.user !== undefined) {
+        next();
+    } else {
+        res.status(401).send("Invalid session. Please log in again.");
+    }
+}
+
+module.exports = sessionMiddleware;
diff --git a/backend/package.json b/backend/package.json
@@ -16,9 +16,11 @@
   "description": "",
   "dependencies": {
     "bcrypt": "^5.1.1",
+    "connect-mongo": "^5.1.0",
     "cors": "^2.8.5",
     "dotenv": "^16.4.5",
     "express": "^4.21.0",
+    "express-session": "^1.18.1",
     "jsonwebtoken": "^9.0.2",
     "mongoose": "^8.7.0",
     "nodemailer": "^6.9.15",

diff --git a/backend/routes/customerRouter.js b/backend/routes/customerRouter.js
@@ -3,6 +3,7 @@ const {
   loginCustomer,
   createCustomer,
   resetPassword,
+  logout,
   verifyOtp,
 } = require("../controller/customer.controller");
 const authenticateCustomer = require("../middlewares/authCustomer");
@@ -28,6 +29,7 @@ router.get(
 );
 
 router.post("/register", createCustomer);
+router.post("/logout", logout)
 router.post("/verify", verifyOtp);
 router.get(
   "/auth/google",

diff --git a/backend/routes/feedbackRouter.js b/backend/routes/feedbackRouter.js
@@ -3,8 +3,9 @@ const { createFeedback } = require("../controller/feedback.controller");
 const router = express.Router();
 const apiInfo = require("../config/api.info");
 const logger = require("../config/logger"); // Import your logger
+const sessionMiddleware = require("../middlewares/sessionMiddleware");
 
-router.post("/create", createFeedback);
+router.post("/create", sessionMiddleware, createFeedback);
 
 router.get("/", (req, res) => {
   try {

diff --git a/backend/routes/index.js b/backend/routes/index.js
@@ -49,7 +49,7 @@ router.get("/", (req, res) => {
 
 router.use("/event", eventRouter);
 router.use("/admin", require("./adminRouter"));
-router.use("/feedback", feedbackRouter);
+router.use("/feedback", require("./feedbackRouter"));
 router.use("/user", require("./customerRouter"));
 router.use("/reservation", require("./reservationRouter"));
 router.use("/newsletter", require("./newsletterRoute"));

diff --git a/backend/routes/orderRouter.js b/backend/routes/orderRouter.js
@@ -1,11 +1,12 @@
 const express = require("express");
 const { createOrder, getOrders, deleteOrder } = require("../controller/order.controller.js");
+const sessionMiddleware = require("../middlewares/sessionMiddleware.js");
 
 const router = express.Router();
 
 
-router.post("/create/:id", createOrder);
-router.get("/get/:id", getOrders);
-router.delete("/delete/:id", deleteOrder);
+router.post("/create/:id", sessionMiddleware, createOrder);
+router.get("/get/:id", sessionMiddleware, getOrders);
+router.delete("/delete/:id", sessionMiddleware, deleteOrder);
 
 module.exports = router;
diff --git a/backend/routes/reservationRouter.js b/backend/routes/reservationRouter.js
@@ -1,8 +1,9 @@
 const express = require("express");
 const { createReservation } = require("../controller/reservation.controller");
+const sessionMiddleware = require("../middlewares/sessionMiddleware");
 const router = express.Router();
 
-router.post("/create", createReservation);
+router.post("/create", sessionMiddleware, createReservation);
 router.get("/", (req, res) => {
   res.json({
     message: "Welcome to the restaurant reservation API!",

diff --git a/frontend/src/assets/Boardgames/CARROM.webp b/frontend/src/assets/Boardgames/CARROM.webp