diff --git a/.github/workflows/close-old-issue.yml b/.github/workflows/close-old-issue.yml deleted file mode 100644 index 67b04051..00000000 --- a/.github/workflows/close-old-issue.yml +++ /dev/null @@ -1,41 +0,0 @@ -name: Auto Close Inactive Issues - -on: - schedule: - # Run the job once a day at midnight - - cron: '0 0 * * *' - -jobs: - close_inactive_issues: - runs-on: ubuntu-latest - steps: - - name: Checkout repository - uses: actions/checkout@v3 - - - name: Close inactive issues - uses: actions/github-script@v6 - with: - script: | - const now = new Date(); - const daysToClose = 3; // Close issues after 3 days of inactivity - - const issues = await github.paginate(github.issues.listForRepo, { - owner: context.repo.owner, - repo: context.repo.repo, - state: "open", - }); - - for (const issue of issues) { - const lastUpdated = new Date(issue.updated_at); - const daysSinceUpdate = (now - lastUpdated) / (1000 * 60 * 60 * 24); - - if (daysSinceUpdate >= daysToClose) { - await github.issues.update({ - owner: context.repo.owner, - repo: context.repo.repo, - issue_number: issue.number, - state: "closed" - }); - console.log(`Closed inactive issue #${issue.number}, inactive for ${daysSinceUpdate.toFixed(1)} days.`); - } - } diff --git a/CODE_OF_CONDUCT.md b/CODE_OF_CONDUCT.md index 7cf49ac4..2351d266 100644 --- a/CODE_OF_CONDUCT.md +++ b/CODE_OF_CONDUCT.md @@ -1,145 +1,53 @@ -# ✨Contributor Covenant Code of Conduct✨ +
---- +# Code of Conduct -## 🌟Our Pledge ---- -We as members, contributors, and leaders pledge to make participation in our -community a harassment-free experience for everyone, regardless of age, body -size, visible or invisible disability, ethnicity, sex characteristics, gender -identity and expression, level of experience, education, socio-economic status, -nationality, personal appearance, race, religion, or sexual identity -and orientation. +
-We pledge to act and interact in ways that contribute to an open, welcoming, -diverse, inclusive, and healthy community. +## Our Pledge ---- -## 🚦Our Standards +We as members, contributors, and leaders pledge to make participation in our community a harassment-free experience for everyone, regardless of age, body size, disability, ethnicity, gender identity and expression, level of experience, education, socio-economic status, nationality, personal appearance, race, religion, or sexual identity and orientation. -Examples of behavior that contributes to a positive environment for our -community include: +## Our Standards -* 💖Demonstrating empathy and kindness toward other people -* 🤝Being respectful of differing opinions, viewpoints, and experiences -* 📝Giving and gracefully accepting constructive feedback -* 🌱Accepting responsibility and apologizing to those affected by our mistakes, - and learning from the experience -* 🎯Focusing on what is best not just for us as individuals, but for the - overall community +Examples of behavior that contributes to creating a positive environment include: -Examples of unacceptable behavior include: +- Using welcoming and inclusive language +- Being respectful of differing viewpoints and experiences +- Gracefully accepting constructive criticism +- Focusing on what is best for the community +- Showing empathy towards other community members -* 🚫The use of sexualized language or imagery, and sexual attention or - advances of any kind -* 🛑Trolling, insulting or derogatory comments, and personal or political attacks -* ⚠️Public or private harassment -* 🔒Publishing others' private information, such as a physical or email - address, without their explicit permission -* ❌Other conduct which could reasonably be considered inappropriate in a - professional setting +Examples of unacceptable behavior by participants include: ---- +- The use of sexualized language or imagery and unwelcome sexual attention or advances +- Trolling, insulting or derogatory comments, and personal or political attacks +- Public or private harassment +- Publishing others' private information, such as a physical or electronic address, without explicit permission +- Other conduct which could reasonably be considered inappropriate in a professional setting -## 👨‍⚖️Enforcement Responsibilities +## Our Responsibilities -Community leaders are responsible for clarifying and enforcing our standards of -acceptable behavior and will take appropriate and fair corrective action in -response to any behavior that they deem inappropriate, threatening, offensive, -or harmful. +Project maintainers are responsible for clarifying the standards of acceptable behavior and are expected to take appropriate and fair corrective action in response to any instances of unacceptable behavior. -Community leaders have the right and responsibility to remove, edit, or reject -comments, commits, code, wiki edits, issues, and other contributions that are -not aligned to this Code of Conduct, and will communicate reasons for moderation -decisions when appropriate. +Maintainers have the right and responsibility to remove, edit, or reject comments, commits, code, wiki edits, issues, and other contributions that do not align with this Code of Conduct. By adopting this Code of Conduct, project maintainers commit themselves to fairly and consistently applying these principles to every aspect of managing this project. ---- -## 🌐Scope +## Scope -This Code of Conduct applies within all community spaces, and also applies when -an individual is officially representing the community in public spaces. -Examples of representing our community include using an official e-mail address, -posting via an official social media account, or acting as an appointed -representative at an online or offline event. +This Code of Conduct applies both within project spaces and in public spaces when an individual is representing the project or its community. Examples of representing a project or community include using an official project email address, posting via an official social media account, or acting as an appointed representative at an online or offline event. ---- -## 📋Pull Request Guidelines +## Enforcement -Contributions, including pull requests, must align with this Code of Conduct. -All contributors are expected to submit work that fosters a positive and inclusive community. -Inappropriate behavior, language, or content in pull requests may result in the rejection of -the contribution and further enforcement actions as outlined in the guidelines. +Instances of abusive, harassing, or otherwise unacceptable behavior may be reported by contacting the project owner. All complaints will be reviewed and investigated promptly and fairly. All project team members are obligated to respect the privacy and security of the reporter of any incident. ---- -## 🛡️Enforcement +Project maintainers who do not follow or enforce the Code of Conduct in good faith may face temporary or permanent repercussions as determined by other members of the project’s leadership. -Instances of abusive, harassing, or otherwise unacceptable behavior may be -reported to the community leaders responsible for enforcement at -. -All complaints will be reviewed and investigated promptly and fairly. +You can also tag the admin, if you find anything voilating the Code of Conduct. -All community leaders are obligated to respect the privacy and security of the -reporter of any incident. +## Attribution ---- -## 📖Enforcement Guidelines +This Code of Conduct is adapted from the [Contributor Covenant](https://www.contributor-covenant.org/version/2/1/code_of_conduct/), version 2.0, available at https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. -Community leaders will follow these Community Impact Guidelines in determining -the consequences for any action they deem in violation of this Code of Conduct: +Community Impact Guidelines were inspired by Mozilla's code of conduct enforcement ladder. -### 1. ✏️Correction - -**Community Impact**: Use of inappropriate language or other behavior deemed -unprofessional or unwelcome in the community. - -**Consequence**: A private, written warning from community leaders, providing -clarity around the nature of the violation and an explanation of why the -behavior was inappropriate. A public apology may be requested. - -### 2. ⚠️Warning - -**Community Impact**: A violation through a single incident or series -of actions. - -**Consequence**: A warning with consequences for continued behavior. No -interaction with the people involved, including unsolicited interaction with -those enforcing the Code of Conduct, for a specified period of time. This -includes avoiding interactions in community spaces as well as external channels -like social media. Violating these terms may lead to a temporary or -permanent ban. - -### 3. ⏳Temporary Ban - -**Community Impact**: A serious violation of community standards, including -sustained inappropriate behavior. - -**Consequence**: A temporary ban from any sort of interaction or public -communication with the community for a specified period of time. No public or -private interaction with the people involved, including unsolicited interaction -with those enforcing the Code of Conduct, is allowed during this period. -Violating these terms may lead to a permanent ban. - -### 4. 🚫Permanent Ban - -**Community Impact**: Demonstrating a pattern of violation of community -standards, including sustained inappropriate behavior, harassment of an -individual, or aggression toward or disparagement of classes of individuals. - -**Consequence**: A permanent ban from any sort of public interaction within -the community. - ---- -## 📜Attribution - -This Code of Conduct is adapted from the [Contributor Covenant][homepage], -version 2.0, available at -https://www.contributor-covenant.org/version/2/0/code_of_conduct.html. - -Community Impact Guidelines were inspired by [Mozilla's code of conduct -enforcement ladder](https://github.com/mozilla/diversity). - -[homepage]: https://www.contributor-covenant.org - -For answers to common questions about this code of conduct, see the FAQ at -https://www.contributor-covenant.org/faq. Translations are available at -https://www.contributor-covenant.org/translations. +For answers to common questions about this code of conduct, see the FAQ at https://www.contributor-covenant.org/faq. Translations are available at https://www.contributor-covenant.org/translations. diff --git a/README.md b/README.md index 7b045cc0..cf249873 100644 --- a/README.md +++ b/README.md @@ -121,6 +121,51 @@ The PlayCafe website communicates with a backend API to manage data. Here’s a | GET | `/api/bookings/:id` | Retrieves details of a specific booking by ID. | | DELETE | `/api/bookings/:id` | Cancels a specific booking by ID. | +## Troubleshooting + +If you encounter issues while setting up or using the PlayCafe website, here are some common problems and solutions: + +### 1. Issue: Unable to install dependencies +**Solution:** Make sure that you have Node.js installed. Run `npm install` again after confirming the Node.js installation. + +### 2. Issue: Website not starting +**Solution:** Run `npm start` and ensure that the correct port is open. If the error persists, check for any error logs in the terminal and ensure no other applications are using the same port. + +### 3. Issue: Database connection error +**Solution:** Verify that your database is running, and the connection details (host, username, password) are correct in the `.env` file. + +### 4. Issue: CSS/JavaScript not loading properly +**Solution:** Check if all static assets are being served correctly. Ensure that the paths to your CSS and JS files are correct and that they are being compiled if you're using a build tool like Webpack or Gulp. + +### 5. Issue: CORS (Cross-Origin Resource Sharing) error +**Solution:** Ensure the backend server has appropriate CORS policies configured to allow the frontend to communicate with it. If you're working with APIs, make sure that the necessary headers are included in server responses. + +### 6. Issue: Environment variables not working +**Solution:** Double-check the `.env` file configuration. Ensure that all required variables are defined and that the file is correctly loaded by your server or build system. + +### Debugging Tips +- Use `console.log` statements to track the flow of the code. +- Check browser developer tools for any front-end errors. +- Look into server logs for detailed error messages. +- **Use Logging Libraries:** Incorporate logging libraries like `winston` or `morgan` for better server-side error tracking. +- **Check Permissions:** If you're running the server on a remote machine, ensure that you have the necessary permissions (e.g., read/write access to necessary directories). +- **API Testing:** Use tools like Postman or Insomnia to test API endpoints individually if issues arise in data fetching. +- **Browser DevTools:** Use Chrome DevTools (F12) or Firefox Developer Tools (F12) for debugging. +- **React DevTools:** Install React Developer Tools browser extension for component debugging. +- **Network Tab:** Monitor API calls and responses in the Network tab. +- **Console Patterns:** Use `console.table()` for debugging arrays and objects. + +### Resources +- [Node.js Documentation](https://nodejs.org/en/docs/) +- [Express.js Guide](https://expressjs.com/en/starter/installing.html) +- [Common npm errors](https://docs.npmjs.com/common-errors) +- [How to Debug JavaScript Errors](https://developer.mozilla.org/en-US/docs/Learn/JavaScript/First_steps/What_went_wrong) +- [Troubleshooting Common CORS Issues](https://www.codecademy.com/articles/what-is-cors) +- [Webpack Documentation](https://webpack.js.org/concepts/) +- [React DevTools Guide](https://react.dev/learn/react-developer-tools) +- [React Error Boundaries](https://react.dev/reference/react/Component#catching-rendering-errors-with-an-error-boundary) +- [React Performance Optimization](https://react.dev/learn/render-and-commit) + ## 🤝 Contributing We love contributions! 💙 Whether you're a participant in **GSSoC** or an open-source enthusiast, we welcome your input. Here's how you can contribute: @@ -214,6 +259,20 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Arindam + + + jainaryan04 +
+ Aryan Ramesh Jain + + + + + haseebzaki-07 +
+ Haseeb Zaki + + alo7lika @@ -221,6 +280,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made alolika bhowmik + + Ashwinib26 @@ -235,8 +296,6 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Mahera Nayan - - tejasbenibagde @@ -251,6 +310,13 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Tyarla Shirisha + + + VinayLodhi1712 +
+ Vinay Anand Lodhi + + Amnyadav @@ -258,6 +324,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Aman Yadav + + NilanchalaPanda @@ -266,10 +334,17 @@ We extend our heartfelt gratitude to all the amazing contributors who have made - - haseebzaki-07 + + Suhas-Koheda
- Haseeb Zaki + Suhas Koheda + + + + + Sumanbhadra +
+ Suman Bhadra @@ -279,22 +354,22 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Sawan kushwah - - - - Suhas-Koheda + + PavanTeja2005
- Suhas Koheda + PavanTeja2005 - - Jay-1409 + + sajalbatra
- Jay shah + Sajal Batra + + vishnuprasad2004 @@ -303,17 +378,10 @@ We extend our heartfelt gratitude to all the amazing contributors who have made - - sajalbatra -
- Sajal Batra - - - - - PavanTeja2005 + + Jay-1409
- PavanTeja2005 + Jay shah @@ -323,8 +391,6 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Abhijit Motekar - - Navneetdadhich @@ -332,13 +398,6 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Navneet Dadhich - - - VinayLodhi1712 -
- Vinay Anand Lodhi - - lade6501 @@ -353,6 +412,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made MD REHAN + + T-Rahul-prabhu-38 @@ -367,8 +428,13 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Aditya Bakshi - - + + + vaishnavipal1869 +
+ vaishnavipal1869 + + tanishirai @@ -390,6 +456,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Sourabh Singh Rawat + + Shiva-Bajpai @@ -397,6 +465,13 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Shiva Bajpai + + + Pushpa472 +
+ Pushpa Vishwakarma + + devxMani @@ -411,8 +486,6 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Ayush Yadav - - smog-root @@ -427,6 +500,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Vaibhav._Y + + Vaibhav-Kumar-K-R @@ -455,8 +530,13 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Sapna Kul - - + + + Nikhil0-3 +
+ Nikhil More + + MutiatBash @@ -464,6 +544,8 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Bashua Mutiat + + Mohitranag18 @@ -478,6 +560,13 @@ We extend our heartfelt gratitude to all the amazing contributors who have made Jai Dhingra + + + harjasae2001 +
+ Harjas Singh + + mishradev1 diff --git a/backend/controller/event.controller.js b/backend/controller/event.controller.js index 36cf46aa..6b29ca6e 100644 --- a/backend/controller/event.controller.js +++ b/backend/controller/event.controller.js @@ -1,5 +1,4 @@ const logger = require("../config/logger"); -const Customer = require("../models/customer.model"); const Event = require("../models/events.model"); // Create a new event @@ -68,56 +67,4 @@ const getEvents = async (req, res) => { } }; - -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 }; +module.exports = { createEvent, getEvents, deleteEvent }; diff --git a/backend/index.js b/backend/index.js index 6ecbe3d8..76d882ac 100644 --- a/backend/index.js +++ b/backend/index.js @@ -3,10 +3,10 @@ require("dotenv").config(); const cors = require("cors"); const mongoose = require("mongoose"); const logger = require("./config/logger"); - // Corrected typo +const newsletterRoute = require('./routes/newsletterRoute'); +const errorMiddleware = require("./middlewares/errrorMiddleware"); // Corrected typo const passport = require("passport"); const { handleGoogleOAuth } = require("./controller/googleOAuth.controller"); -const errorMiddleware = require("./middlewares/errrorMiddleware"); const app = express(); const port = process.env.PORT || 3000; @@ -19,6 +19,7 @@ const corsOptions = { app.use(cors(corsOptions)); app.use(express.json()); +app.use('/api', newsletterRoute); // MongoDB connection mongoose diff --git a/backend/models/customer.model.js b/backend/models/customer.model.js index 1622fc0b..122eb524 100644 --- a/backend/models/customer.model.js +++ b/backend/models/customer.model.js @@ -1,4 +1,3 @@ -// models/Customer.js const mongoose = require("mongoose"); const Schema = mongoose.Schema; @@ -28,6 +27,7 @@ const customerSchema = new Schema( }, bio: String, profilePicture: String, + bookedEvents: [ { type: Schema.Types.ObjectId, @@ -40,6 +40,7 @@ const customerSchema = new Schema( ref: "Order", }, ], + }, { timestamps: true } ); diff --git a/backend/models/events.model.js b/backend/models/events.model.js index 1c74d6de..0aebe08a 100644 --- a/backend/models/events.model.js +++ b/backend/models/events.model.js @@ -1,4 +1,9 @@ +/* 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({ @@ -36,12 +41,7 @@ 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 c66fc401..7cdcece4 100644 --- a/backend/routes/eventRouter.js +++ b/backend/routes/eventRouter.js @@ -1,14 +1,9 @@ -// 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(); @@ -21,8 +16,6 @@ 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", }); @@ -33,8 +26,6 @@ router.get("/", async (req, res) => { }); router.post("/create", createEvent); router.get("/all", getEvents); -router.delete("/delete/:id", deleteEvent); -router.post("/book-events", bookEvent); -router.get("/get-booked-events/:customerId", getBookedEvents); +router.get("/delete", deleteEvent); module.exports = router; diff --git a/frontend/src/App.jsx b/frontend/src/App.jsx index c5a927fb..998c1300 100644 --- a/frontend/src/App.jsx +++ b/frontend/src/App.jsx @@ -6,6 +6,7 @@ import { Outlet } from 'react-router-dom'; import BackToTopButton from './components/Shared/BackToTopButton'; import Preloader from './components/Preloader'; + function App() { return ( <> @@ -14,6 +15,8 @@ function App() {