From 59e724674253370d4515e2073ba3c41e9f74ad30 Mon Sep 17 00:00:00 2001 From: Saksham2k3s Date: Fri, 7 Jun 2024 19:08:50 +0530 Subject: [PATCH] Redesigned Menu Cards --- server/controllers/Auth.js | 1 + src/pages/MenuPage.jsx | 91 +++++++++++++++++++++++++------------- 2 files changed, 62 insertions(+), 30 deletions(-) diff --git a/server/controllers/Auth.js b/server/controllers/Auth.js index 011b907..085ed28 100644 --- a/server/controllers/Auth.js +++ b/server/controllers/Auth.js @@ -7,6 +7,7 @@ const Session = require("../models/session"); require("dotenv").config(); exports.studentSignup = async (req, res) => { + console.log("This is jwt", process.env.JWT_SECRET); try { console.log(req.body); const { name, email, collegeName, accountType, password } = await req.body; diff --git a/src/pages/MenuPage.jsx b/src/pages/MenuPage.jsx index bd5014f..4a20eb9 100644 --- a/src/pages/MenuPage.jsx +++ b/src/pages/MenuPage.jsx @@ -1,12 +1,12 @@ -import React, { useState, useEffect } from "react"; +import React, { useState, useEffect, useContext } from "react"; import axios from "axios"; import { useParams } from "react-router-dom"; import { toast } from "react-hot-toast"; import Navbar from "../components/Navbar"; import Loader from "../components/Loader/Loader"; import Footer from "../components/Footer"; - +import { ThemeContext } from '../themeContext'; function MenuPage() { const { _id } = useParams(); const [breakfast, setBreakfast] = useState(); @@ -15,7 +15,7 @@ function MenuPage() { const [selectedDish, setSelectedDish] = useState(null); const [feedback, setFeedback] = useState(""); const [loading, setLoading] = useState(false); - + const { theme, toggleTheme } = useContext(ThemeContext); const getBreakfast = async () => { try { setLoading(true); @@ -117,7 +117,7 @@ function MenuPage() { } return ( -
+

Today's Menu

@@ -129,59 +129,90 @@ function MenuPage() {
{breakfast && ( -
-

Breakfast

+ +
+
+ Breakfast Icon + Breakfast +
+
    {breakfast.data.map((dish) => (
  • handleDishClick(dish.dishId)} // Add click handler - style={{ cursor: "pointer" }} - className="hover:bg-gradient-to-r from-green-300 to-green-500 transition-transform duration-300 ease-in-out transform hover:-translate-y-1" + className={`cursor-pointer hover:bg-gradient-to-r from-green-300 to-green-500 transition-transform duration-300 ease-in-out transform hover:-translate-y-1 px-5 py-2 ${theme === 'dark' ? 'text-white' : 'text-red-600'} hover:text-black mt-2 `} > • {dish.dish}
  • ))}
+
+ )} {lunch && ( -
-

Lunch

-
    + + +
    +
    + Breakfast Icon + Lunch +
    +
    +
      {lunch.data.map((dish) => ( -
    • handleDishClick(dish.dishId)} // Add click handler - style={{ cursor: "pointer" }} - className="hover:bg-gradient-to-r from-green-300 to-green-500 transition-transform duration-300 ease-in-out transform hover:-translate-y-1" - > - • {dish.dish} -
    • +
    • handleDishClick(dish.dishId)} // Add click handler + style={{ cursor: "pointer" }} + className={`hover:bg-gradient-to-r from-green-300 to-green-500 transition-transform duration-300 ease-in-out transform hover:-translate-y-1 px-5 py-2 ${theme === 'dark' ? 'text-white' : 'text-green-600'} hover:text-black mt-2 `} + > + • {dish.dish} +
    • ))}
    +
    )} {dinner && ( -
    -

    Dinner

    -
      + +
      +
      + Breakfast Icon + Dinner +
      +
      +
        {dinner.data.map((dish) => ( -
      • handleDishClick(dish.dishId)} // Add click handler - style={{ cursor: "pointer" }} - className="hover:bg-gradient-to-r from-green-300 to-green-500 transition-transform duration-300 ease-in-out transform hover:-translate-y-1" - > - • {dish.dish} -
      • +
      • handleDishClick(dish.dishId)} // Add click handler + style={{ cursor: "pointer" }} + className={`hover:bg-gradient-to-r from-yellow-300 to-yellow-500 transition-transform duration-300 ease-in-out transform hover:-translate-y-1 px-5 py-2 ${theme === 'dark' ? 'text-white' : 'text-yellow-600'} hover:text-black mt-2 `} + > + • {dish.dish} +
      • ))}
      +
      )}