Merge branch 'master' into master

Author: dipexplorer

.github/workflows/auto-label.yml

@@ -1,36 +1,41 @@
-name: Auto Label Issue
+name: Auto Label Issue/PR
 
 on:
   issues:
     types: [opened, reopened, edited]
+  pull_request:
+    types: [opened, reopened, edited]
 
 jobs:
-  label_issue:
+  label_issue_pr:
     runs-on: ubuntu-latest
     permissions:
       issues: write
+      pull-requests: write
     steps:
-      - name: Label Issue
+      - name: Label Issue/PR
         uses: actions/github-script@v6
         with:
           github-token: ${{secrets.GITHUB_TOKEN}}
           script: |
-            const issue = context.payload.issue;
-            const issueBody = issue.body ? issue.body.toLowerCase() : '';
-            const issueTitle = issue.title.toLowerCase();
+            const isIssue = context.payload.issue !== undefined;
+            const item = isIssue ? context.payload.issue : context.payload.pull_request;
+            const itemBody = item.body ? item.body.toLowerCase() : '';
+            const itemTitle = item.title.toLowerCase();
 
-            // Add gssoc label to all issues
+            // Add labels to both issues and pull requests
             await github.rest.issues.addLabels({
               owner: context.repo.owner,
               repo: context.repo.repo,
-              issue_number: issue.number,
-              labels: ['gssoc-ext','hacktoberfest-accepted']
+              issue_number: item.number,
+              labels: ['gssoc-ext', 'hacktoberfest-accepted']
             });
+
             const addLabel = async (label) => {
               await github.rest.issues.addLabels({
                 owner: context.repo.owner,
                 repo: context.repo.repo,
-                issue_number: issue.number,
+                issue_number: item.number,
                 labels: [label]
               });
             };

backend/Controllers/UserController.js

@@ -1,9 +1,10 @@
 import bcrypt from "bcrypt";
 import User from "../models/User.js";
 import jwt from "jsonwebtoken";
-import dotenv from "dotenv"
+import dotenv from "dotenv";
 import nodemailer from "nodemailer";
-dotenv.config()
+
+dotenv.config();
 /**
  * @route {POST} /api/signup
  * @description Create a new user
@@ -50,7 +51,7 @@ const getAllUserName = async (req, res) => {
     names.forEach((val) => nameArr.push(val.username));
     res.status(200).json({ usernames: nameArr, success: true });
   } catch (error) {
-    console.log(error)
+    console.log(error);
     res.status(404).json({ success: false, message: "Internal server error" });
   }
 };
@@ -84,13 +85,9 @@ const Login = async (req, res) => {
         .json({ success: false, message: "Incorrect Password" });
 
     // If the password is correct, generate a JWT token
-    const token = jwt.sign(
-      { userId: user._id },
-      process.env.SECRET,
-      {
-        expiresIn: "30d",
-      }
-    );
+    const token = jwt.sign({ userId: user._id }, process.env.SECRET, {
+      expiresIn: "30d",
+    });
     res.status(200).json({ success: true, user: user, token: token });
   } catch (error) {
     console.log(error);
@@ -107,23 +104,22 @@ const Login = async (req, res) => {
  */
 const verifyUserByToken = async (req, res) => {
   try {
-    const user = await User.findById(req.user.userId)
-    return res.status(200).json({ success: true, user })
+    const user = await User.findById(req.user.userId);
+    return res.status(200).json({ success: true, user });
   } catch (error) {
     console.log(error);
     return res
       .status(404)
       .json({ success: false, message: "Internal Server Error" });
   }
-
-}
+};
 
 async function Sendcontactmail(req, res) {
   const { name, email, message, rating } = req.body; // Capture rating from the request
   console.log(req.body);
   try {
     const transporter = nodemailer.createTransport({
-      service: 'gmail',
+      service: "gmail",
       auth: {
         user: process.env.SMTP_EMAIL,
         pass: process.env.SMTP_PASSWORD,
@@ -132,8 +128,8 @@ async function Sendcontactmail(req, res) {
 
     // Create a string of stars based on the rating, filled and unfilled stars
     const totalStars = 5;
-    const filledStars = '★'.repeat(rating);   // Filled stars
-    const emptyStars = '☆'.repeat(totalStars - rating); // Empty stars
+    const filledStars = "★".repeat(rating); // Filled stars
+    const emptyStars = "☆".repeat(totalStars - rating); // Empty stars
 
     const mailOptions = {
       from: email,
@@ -157,20 +153,85 @@ async function Sendcontactmail(req, res) {
 
     await transporter.sendMail(mailOptions);
 
-    return res.status(200).json({ success: true, message: 'Message sent successfully!' });
+    return res
+      .status(200)
+      .json({ success: true, message: "Message sent successfully!" });
   } catch (error) {
-    console.error('Error sending email:', error);
-    return res.status(500).json({ success: false, message: 'Error sending email' });
+    console.error("Error sending email:", error);
+    return res
+      .status(500)
+      .json({ success: false, message: "Error sending email" });
   }
 }
+const forgotPassword = async function (req, res) {
+  const { email } = req.body;
+  const user = await User.findOne({ email });
+  try {
+    if (!user) {
+      return res
+        .status(404)
+        .json({ success: false, message: "Email doesnt exist" });
+    } else {
+      const token = jwt.sign({ userId: user._id }, process.env.SECRET, {
+        expiresIn: "5m",
+      });
+      var transporter = nodemailer.createTransport({
+        service: "gmail",
+        auth: {
+          user: process.env.SMTP_EMAIL,
+          pass: process.env.SMTP_PASSWORD,
+        },
+      });
+      var userFullName = user.firstName + " " + user.lastName;
+      var mailOptions = {
+        from: process.env.SMTP_EMAIL,
+        to: email,
+        subject: "Password Reset | TastyTrails",
+        html: `<p>Hi <b> ${userFullName},</b><br>Use the below link to reset you password. Remember, the link will expire in 10 minutes.<br> ${process.env.FRONT_END_URL}/reset_password/${token}`,
+      };
+
+      transporter.sendMail(mailOptions, function (error, info) {
+        if (error) {
+          return res
+            .status(404)
+            .json({ success: false, message: "Email not sent" });
+        } else {
+          return res
+            .status(200)
+            .json({ success: true, message: "Email sent succesfully" });
+        }
+      });
+    }
+  } catch (error) {
+    console.log(error);
+  }
+};
 
+const resetPassword = async function (req, res) {
+  const { token } = req.params;
+  const { password } = req.body;
+  try {
+    const decoded = jwt.verify(token, process.env.SECRET);
+    console.log(decoded);
+    const id = decoded.userId;
+    const hashPassword = await bcrypt.hash(password, 10);
+    await User.findByIdAndUpdate({ _id: id }, { password: hashPassword });
+    return res
+      .status(200)
+      .json({ success: true, message: "Password reset succesfully" });
+  } catch (error) {
+    return res.status(400).json({ success: false, message: "Invalid token" });
+  }
+};
 
 const UserController = {
   Signup,
   Login,
   getAllUserName,
   verifyUserByToken,
-  Sendcontactmail
+  forgotPassword,
+  resetPassword,
+  Sendcontactmail,
 };
 
 export default UserController;

backend/package-lock.json

@@ -31,6 +31,8 @@ router.post(
   RecipeController.addComment
 );
 router.post("/feedback", UserController.Sendcontactmail);
+router.post("/forgot_password", UserController.forgotPassword);
+router.post("/reset_password/:token", UserController.resetPassword);
 router.post("/recipe/like", authenticateToken, RecipeController.addRecipeLike);
 router.post(
   "/recipe/unlike",
@@ -43,5 +45,4 @@ router.delete(
   authenticateToken,
   RecipeController.deleteComment
 );
-
 export default router;

backend/routes/web.js

@@ -21,6 +21,25 @@ const allowedOrigins = [
   /https:\/\/deploy-preview-\d+--delightful-daifuku-a9f6ea\.netlify\.app/,
 ];
 
+
+app.use(
+    cors({
+        origin: function (origin, callback) {
+            // Allow requests with no `origin` (like from Postman or server-side scripts)
+            if (!origin || allowedOrigins.some((o) =>
+                typeof o === "string" ? o === origin : o.test(origin)
+            )) {
+                callback(null, true);
+            } else {
+                // Provide a more informative error message if necessary
+                callback(new Error("CORS policy: This origin is not allowed."));
+            }
+        },
+    })
+);
+
+// app.use(cors({origin:"http://localhost:5173"})) // for local use
+
 app.use(
   cors({
     origin: function (origin, callback) {
@@ -42,6 +61,7 @@ app.use(
 
 // app.use(cors({ origin: "http://localhost:5173" })) // for local use
 
+
 const collectDefaultMetrics = client.collectDefaultMetrics;
 
 collectDefaultMetrics({ register: client.register });

backend/server.js

@@ -1,4 +1,4 @@
 # Not suggested modifying the backend port
 VITE_BACKEND_URL="http://localhost:8080"
 # Add your google client ID here
-VITE_GOOGLE_CLIENT_ID=""
+VITE_GOOGLE_CLIENT_ID=""

frontend/.env

@@ -19,9 +19,11 @@
     "axios": "^1.6.3",
     "install": "^0.13.0",
     "jwt-decode": "^4.0.0",
+    "lucide-react": "^0.453.0",
     "react": "^18.2.0",
     "react-dom": "^18.2.0",
     "react-icons": "^5.3.0",
+    "react-responsive": "^10.0.0",
     "react-router-dom": "^6.26.2",
     "react-toastify": "^9.1.3"
   },

frontend/package.json

@@ -19,6 +19,8 @@ import UpdateRecipe from "./Pages/UpdateRecipe.jsx";
 import Contributors from "./Pages/Contributors.jsx"; // Import the Contributors component
 import PrivacyPolicy from "./Components/PrivacyPolicy.jsx";
 import NotFound from "./Pages/NotFound.jsx";
+import ResetPassword from "./Pages/ResetPassword.jsx";
+import ForgotPassword from "./Pages/ForgotPassword.jsx";
 import RecipeSuggestions from "./Pages/RecipeSuggestions.jsx";
 
 function App() {
@@ -59,6 +61,8 @@ function App() {
           <Route path="/" element={<Landing />} />
           <Route path="/login" element={<Login />} />
           <Route path="/signup" element={<Signup />} />
+          <Route path="/forgot_password" element={<ForgotPassword />} />
+          <Route path="/reset_password/:token" element={<ResetPassword />} />
           <Route
             path="/recipes"
             element={<Recipes key={"recipes"} type="" />}

frontend/src/App.jsx

@@ -130,8 +130,9 @@ const Cards = ({ dish, setRecipes, recipes, index }) => {
   };
 
   return (
-    <div className="p-4">
-      <div className="border-2 border-gray-200 border-opacity-60 rounded-lg overflow-hidden">
+
+    <div className="p-4 cursor-pointer" onClick={handleClick}>
+      <div className="border-2 border-gray-200 border-opacity-60 rounded-lg overflow-hidden transform transition-transform duration-300 ease-in-out hover:scale-105 hover:shadow-lg">
         <img
           className="lg:h-48 md:h-36 w-full object-cover object-center cursor-pointer"
           src={dish.image}
@@ -185,7 +186,7 @@ const Cards = ({ dish, setRecipes, recipes, index }) => {
 };
 
 Cards.propTypes = {
-  dish: PropTypes.object.isRequired,
+  dish: PropTypes.object.isRequired
 };
 
-export default Cards;
+export default Cards;