Merge branch 'main' into change

.github/pull_request_template.md

@@ -1,33 +1,32 @@
 Please include a summary of the changes and the related issue. Please also include relevant motivation and context. List any dependencies that are required for this change.
 
-
 Fixes # (issue)
 
-
 ## Type of change
 
-Please give a X on it which is applicable
+Please mark with an X the type that applies:
 
 - [ ] Bug fix (non-breaking change which fixes an issue)
 - [ ] New feature (non-breaking change which adds functionality)
-- [ ] Refactor Code
-- [ ] A documentation update
-- [ ] Others(mentioned in the issue number)
+- [ ] Refactor code
+- [ ] Documentation update
+- [ ] Other (mentioned in the issue number)
 
 # How Has This Been Tested?
 
-Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce. Please also list any relevant details for your test configuration
+Please describe the tests that you ran to verify your changes. Provide instructions so we can reproduce them. Please also list any relevant details for your test configuration.
+
+**_Test A: Describe here_**
 
-**_Test A Describe here_**
+**_Test B: Describe here (if required)_**
 
-**_Test B Describe here (if Requred)_**
+# Screenshots and Videos
 
-# Screenshorts and Vedios:
+Please provide screenshots and videos of the changes you made.
 
-give screenshorts and vedio of the changes you made
+# Checklist
 
-# Checklist:
-give a X on it which is applicable
+Please mark with an X the items that apply:
 
 - [ ] My code follows the style guidelines of this project
 - [ ] I have performed a self-review of my code

LICENSE

@@ -0,0 +1,21 @@
+MIT License
+
+Copyright (c) 2024 Vansh Waldeo
+
+Permission is hereby granted, free of charge, to any person obtaining a copy
+of this software and associated documentation files (the "Software"), to deal
+in the Software without restriction, including without limitation the rights
+to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
+copies of the Software, and to permit persons to whom the Software is
+furnished to do so, subject to the following conditions:
+
+The above copyright notice and this permission notice shall be included in all
+copies or substantial portions of the Software.
+
+THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
+IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
+FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
+AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
+LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
+OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
+SOFTWARE.

README.md

@@ -108,7 +108,16 @@ Welcome to Foodies, your go-to college dining companion! Designed for seamless c
    ```
    PORT=3000
    DATABASE_URL="http://localhost:21713/foods"
+   EMAIL="The email from which forgot the password email will be sent"
+   MAILPASS="password for the email ( app password )"
    ``` 
+   ### **STEP TO GENERATE APP PASSWORD**
+   1) Enable 2-step verification if not
+   **In https://myaccount.google.com/security, do you see 2-step verification set to ON**
+
+   2) Generate APP PASSWORD by clicking on below link 
+   **https://myaccount.google.com/apppasswords?rapt=AEjHL4PAhcbtFEpLwfNtVix3bfiGe71GdrW_Naiuvp_NVnMZyTd0UR07M2mVnEyWzkw9kB99YVhhfEVtjxTi3QWSZ39biK-zGwnghm0u778vwmlh6TFbmh4**
+
 
 6. **Start the Backend Server (in the terminal within the /server directory):** <br>
    In the terminal where you navigated to the /server directory, run the following command to start the backend server:

package.json

@@ -3,6 +3,8 @@
   "version": "0.1.0",
   "private": true,
   "dependencies": {
+    "@emailjs/browser": "^4.3.3",
+    "@react-icons/all-files": "^4.1.0",
     "@testing-library/jest-dom": "^5.17.0",
     "@testing-library/react": "^13.4.0",
     "@testing-library/user-event": "^13.5.0",
@@ -12,7 +14,7 @@
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-hot-toast": "^2.4.1",
-    "react-icons": "^4.11.0",
+    "react-icons": "^4.12.0",
     "react-icons-kit": "^2.0.0",
     "react-modal": "^3.16.1",
     "react-router-dom": "^6.16.0",

server/config/cloudinaryConfig.js

@@ -1,14 +1,26 @@
-const config = require("cloudinary").config;
-const uploader = require("cloudinary").uploader;
-const dotenv = require("dotenv");
+const cloudinary = require('cloudinary').v2;
+const dotenv = require('dotenv');
 dotenv.config();
 
 const cloudinaryConfig = (req, res, next) => {
-  config({
+  cloudinary.config({
     cloud_name: process.env.CLOUDINARY_CLOUD_NAME,
     api_key: process.env.CLOUDINARY_API_KEY,
     api_secret: process.env.CLOUDINARY_API_SECRET,
   });
   next();
 };
-module.exports = { cloudinaryConfig, uploader };
+
+const uploadImage = async (filePath) => {
+  try {
+    const result = await cloudinary.uploader.upload(filePath, {
+      folder: 'canteen_images', // Specify the folder where images should be uploaded
+    });
+    return result;
+  } catch (error) {
+    throw new Error('Error uploading image to Cloudinary');
+  }
+};
+
+module.exports = { cloudinaryConfig, uploadImage };
+

server/config/database.js

@@ -5,7 +5,6 @@ require("dotenv").config();
 
 const dbConnect = () =>{
     mongoose.connect(process.env.DATABASE_URL,{
-
         useNewUrlParser : true,
         useUnifiedTopology : true,
     })