+ + Suman Bhadra + +
+ 
diff --git a/backend/controller/event.controller.js b/backend/controller/event.controller.js
index 6b29ca6e..36cf46aa 100644
--- a/backend/controller/event.controller.js
+++ b/backend/controller/event.controller.js
@@ -1,4 +1,5 @@
const logger = require("../config/logger");
+const Customer = require("../models/customer.model");
const Event = require("../models/events.model");
// Create a new event
@@ -67,4 +68,56 @@ const getEvents = async (req, res) => {
}
};
-module.exports = { createEvent, getEvents, deleteEvent };
+
+const bookEvent = async (req, res) => {
+ try {
+ const { customerId, eventId } = req.body;
+
+ const customer = await Customer.findById(customerId);
+ const event = await Event.findById(eventId);
+
+ if (!customer || !event) {
+ return res.status(404).json({ message: "Customer or Event not found" });
+ }
+
+ if (customer.bookedEvents.includes(eventId)) {
+ return res.status(400).json({ message: "Event already booked" });
+ }
+
+ customer.bookedEvents.push(eventId);
+ await customer.save();
+
+ event.bookedCustomers.push(customerId);
+ await event.save();
+
+ res.status(200).json({ message: "Event booked successfully!" });
+ } catch (error) {
+ logger.error("Error booking event:", error);
+ res.status(500).json({ message: "Server error" });
+ }
+};
+
+// Get all booked events for a customer
+const getBookedEvents = async (req, res) => {
+ try {
+ const { customerId } = req.params;
+
+
+ const customer = await Customer.findById(customerId).populate("bookedEvents");
+
+ if (!customer) {
+ return res.status(404).json({ message: "Customer not found" });
+ }
+
+ res.status(200).json({ bookedEvents: customer.bookedEvents });
+ } catch (error) {
+ logger.error("Error fetching event:", error);
+ res.status(500).json({ message: "Server error" });
+ }
+};
+
+module.exports = {
+ getBookedEvents,
+};
+
+module.exports = { createEvent, getEvents, deleteEvent, bookEvent, getBookedEvents };
diff --git a/backend/index.js b/backend/index.js
index b8d9e76b..1bb24c71 100644
--- a/backend/index.js
+++ b/backend/index.js
@@ -3,7 +3,7 @@ require("dotenv").config();
const cors = require("cors");
const mongoose = require("mongoose");
const logger = require("./config/logger");
-const errorMiddleware = require("./middlewares/errorMiddleware"); // Corrected typo
+const errorMiddleware = require("./middlewares/errrorMiddleware"); // Corrected typo
const passport = require("passport");
const { handleGoogleOAuth } = require("./controller/googleOAuth.controller");
const app = express();
diff --git a/backend/models/customer.model.js b/backend/models/customer.model.js
index cd446f41..6047d222 100644
--- a/backend/models/customer.model.js
+++ b/backend/models/customer.model.js
@@ -1,4 +1,3 @@
-/* eslint-disable no-useless-escape */
const mongoose = require("mongoose");
const Schema = mongoose.Schema;
@@ -27,6 +26,10 @@ const customerSchema = new Schema(
},
bio: String,
profilePicture: String,
+ bookedEvents: [{
+ type: Schema.Types.ObjectId,
+ ref: "Event", // Reference to the Event model
+ }],
},
{ timestamps: true },
);
diff --git a/backend/models/events.model.js b/backend/models/events.model.js
index 0aebe08a..1c74d6de 100644
--- a/backend/models/events.model.js
+++ b/backend/models/events.model.js
@@ -1,9 +1,4 @@
-/* eslint-disable no-unused-vars */
-/* eslint-disable no-useless-escape */
-// models/Event.js
-
const mongoose = require("mongoose");
-const { string } = require("zod");
// Define the Event schema
const eventSchema = new mongoose.Schema({
@@ -41,7 +36,12 @@ const eventSchema = new mongoose.Schema({
message: (props) => `${props.value} is not a valid URL!`,
},
},
+ bookedCustomers: [{
+ type: mongoose.Schema.Types.ObjectId,
+ ref: 'Customer' // Reference to the Customer model
+ }]
});
+
// Create the Event model
const Event = mongoose.model("Event", eventSchema);
diff --git a/backend/routes/eventRouter.js b/backend/routes/eventRouter.js
index 7cdcece4..c66fc401 100644
--- a/backend/routes/eventRouter.js
+++ b/backend/routes/eventRouter.js
@@ -1,9 +1,14 @@
+// Add this at the top of eventRouter.js to check if it's being loaded correctly
+console.log("eventRouter loaded");
+
const express = require("express");
const logger = require("../config/logger");
const {
createEvent,
getEvents,
deleteEvent,
+ bookEvent,
+ getBookedEvents,
} = require("../controller/event.controller");
const router = express.Router();
@@ -16,6 +21,8 @@ router.get("/", async (req, res) => {
endpoints: {
CreateEvent: "/event/create",
GetEvents: "/event/all",
+ bookEvents : "/event/book-events",
+ GetBookedEvents : "/event/get-booked-events/:customerId",
},
documentation: "https://api-docs-url.com",
});
@@ -26,6 +33,8 @@ router.get("/", async (req, res) => {
});
router.post("/create", createEvent);
router.get("/all", getEvents);
-router.get("/delete", deleteEvent);
+router.delete("/delete/:id", deleteEvent);
+router.post("/book-events", bookEvent);
+router.get("/get-booked-events/:customerId", getBookedEvents);
module.exports = router;
diff --git a/frontend/package.json b/frontend/package.json
index 30175db5..e2a55a73 100644
--- a/frontend/package.json
+++ b/frontend/package.json
@@ -16,7 +16,7 @@
"@splidejs/react-splide": "^0.7.12",
"@splidejs/splide": "^4.1.4",
"@splidejs/splide-extension-auto-scroll": "^0.5.3",
- "antd": "^5.21.2",
+ "antd": "^5.21.5",
"autoprefixer": "^10.4.19",
"axios": "^1.7.7",
"clsx": "^2.1.1",
diff --git a/frontend/src/components/Pages/HelpAndSupport.jsx b/frontend/src/components/Pages/HelpAndSupport.jsx
new file mode 100644
index 00000000..a3bd1988
--- /dev/null
+++ b/frontend/src/components/Pages/HelpAndSupport.jsx
@@ -0,0 +1,116 @@
+import React, { useState } from 'react';
+import { MdKeyboardArrowDown } from 'react-icons/md';
+import { IoMdCall, IoMdMail } from 'react-icons/io';
+
+export default function HelpAndSupport() {
+ const FAqs = [
+ {
+ question: 'How to create an account?',
+ answer:
+ "To create an account, click on the 'Sign Up' button on the top right corner of the page. Fill in your details and click on 'Create Account'.",
+ },
+ {
+ question: 'How to reset password?',
+ answer:
+ "To reset your password, click on 'Forgot Password' on the login page. Enter your email address and follow the instructions sent to your email.",
+ },
+ {
+ question: 'What is Sip & Play?',
+ answer:
+ "Sip & Play is a board game cafe in Park Slope, Brooklyn. It's a place where you can come with friends and family to play board games, enjoy coffee, boba, sandwiches, and snacks.",
+ },
+ {
+ question: 'How does it work?',
+ answer:
+ "You can come in with your friends and family to play any board game from our library of 300+ games. There's no cover charge, just pay for your food and drinks.",
+ },
+ {
+ question: 'What kind of games do you have?',
+ answer:
+ 'We have a wide variety of board games, including classics like Monopoly and Scrabble, as well as newer and more unique games.',
+ },
+ {
+ question: 'Can I bring my own food and drinks?',
+ answer:
+ 'No, we do not allow outside food or drinks. We have a full menu of food and drinks available for purchase.',
+ },
+ {
+ question: 'Is there parking available?',
+ answer:
+ ' There is limited street parking available near the cafe. You may also want to consider using public transportation.',
+ },
+ {
+ question: 'Is there a cover charge?',
+ answer:
+ 'No, there is no cover charge. Just pay for your food and drinks.',
+ },
+ ];
+
+ const [activeFAQ, setActiveFAQ] = useState(null);
+
+ const handleFAQClick = (index) => {
+ if (activeFAQ === index) {
+ setActiveFAQ(null);
+ } else {
+ setActiveFAQ(index);
+ }
+ };
+
+ return (
+ <>
+ + Explore our FAQs, tutorials, and user guides to learn how to + make the most of our platform. If you can't find the answer + you're looking for, don't hesitate to contact our friendly + support team. We're always happy to help. +
++ {faq.answer} +
+