From 68379cb1fa81a75dc2850ad995ca9dc0f2cacce6 Mon Sep 17 00:00:00 2001
From: Uday kiran <98547514+UdaykiranRegimudi@users.noreply.github.com>
Date: Sat, 8 Jun 2024 13:56:21 +0530
Subject: [PATCH 1/2] Update News.jsx

Aligned cards to center, enhancing the website's visual appeal and user experience
---
 src/pages/News.jsx | 10 ++++++----
 1 file changed, 6 insertions(+), 4 deletions(-)

diff --git a/src/pages/News.jsx b/src/pages/News.jsx
index 7b94bfa..b338434 100644
--- a/src/pages/News.jsx
+++ b/src/pages/News.jsx
@@ -43,10 +43,12 @@ function News() {
                 Trending Food and Health News
               </h1>
               <main className="mt-24 p-4">
-                <div className="container grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-4">
-                  {articles.map((article, index) => (
-                    <NewsCard key={index} article={article} />
-                  ))}
+                <div style={{display:"flex",justifyContent:"center"}}>
+                  <div className="container grid grid-cols-1 sm:grid-cols-2 md:grid-cols-3 gap-5 ">
+                    {articles.map((article, index) => (
+                      <NewsCard key={index} article={article} />
+                    ))}
+                  </div>
                 </div>
               </main>
               <Footer />

From 5dd498cd1e08f940e87f3c12b7f1abb1866c80ba Mon Sep 17 00:00:00 2001
From: anuragnegi000 <anurag.negi862@gmail.com>
Date: Sat, 8 Jun 2024 18:02:59 +0530
Subject: [PATCH 2/2] fixed the login and signup issue

---
 src/pages/Login.jsx  | 151 ++++++++++++-------------------------------
 src/pages/Signup.jsx |   2 +-
 2 files changed, 44 insertions(+), 109 deletions(-)

diff --git a/src/pages/Login.jsx b/src/pages/Login.jsx
index be1b9a2..e6c9cdf 100644
--- a/src/pages/Login.jsx
+++ b/src/pages/Login.jsx
@@ -1,15 +1,6 @@
-import React, {
-  useState,
-  useEffect,
-} from "react";
-import {
-  AiOutlineEye,
-  AiOutlineEyeInvisible,
-} from "react-icons/ai";
-import {
-  Link,
-  useNavigate,
-} from "react-router-dom";
+import React, { useState } from "react";
+import { AiOutlineEye, AiOutlineEyeInvisible } from "react-icons/ai";
+import { Link, useNavigate } from "react-router-dom";
 import { toast } from "react-hot-toast";
 import axios from "axios";
 import logo from "../assets/logo2.png";
@@ -23,7 +14,7 @@ function Login() {
   });
 
   const [showPassword, setShowPassword] = useState(false);
-  const [loading, setLoading] = useState(false)
+  const [loading, setLoading] = useState(false);
   const navigate = useNavigate();
 
   function changeHandler(event) {
@@ -33,50 +24,36 @@ function Login() {
     }));
   }
 
-
   async function submitHandler(event) {
     event.preventDefault();
+    setLoading(true);
 
     if (formData.accountType === "User") {
-      //Loader will show till the api fetching is done as show as promise is resolved the loader will be not shown
-      setLoading(true);
-
-      // const apiUrl = `${process.env.REACT_APP_BASE_URL}/studentLogin`;
-       const apiUrl = `http://localhost:4000/api/v1/studentLogin`;
+      const apiUrl = `http://localhost:3000/api/v1/studentLogin`;
 
-       try {
-        setLoading(true);
-      
+      try {
         const response = await axios.post(apiUrl, formData);
-      
-        toast.success("Unable to login!"); 
+        toast.success("Logged in successfully!");
         navigate("/home");
       } catch (error) {
-        toast.error("Failed To Login. Please try again."); 
-        console.error(error); 
+        toast.error("Failed To Login. Please try again.");
+        console.error(error);
       } finally {
         setLoading(false);
       }
-    }
+    } else {
+      const apiUrl = `http://localhost:4000/api/v1/canteenLogin`;
 
-    else{
-      const apiUrl = `${process.env.REACT_APP_BASE_URL}/canteenLogin`;
-      setLoading(true);
-
-      axios
-        .post(apiUrl, formData)
-        .then((response) => {
-          setLoading(false);
-          toast.success("User Logged in ");
-          navigate(
-            `/section/${response.data.cantId}`
-          );
-        })
-        .catch((error) => {
-          //Loader will show till the api fetching is done as show as promise is resolved the loader will be not shown
-          setLoading(false);
-          toast.error("Failed to login");
-        });
+      try {
+        const response = await axios.post(apiUrl, formData);
+        toast.success("User Logged in");
+        navigate(`/section/${response.data.cantId}`);
+      } catch (error) {
+        toast.error("Failed to login. Please try again.");
+        console.error(error);
+      } finally {
+        setLoading(false);
+      }
     }
   }
 
@@ -88,15 +65,8 @@ function Login() {
         <div className="h-screen md:flex">
           <div className="relative overflow-hidden md:flex w-1/2 bg-gradient-to-t from-blue-950 via-blue-950 to-gray-900 bg-no-repeat justify-around items-center hidden">
             <div>
-              <img
-                src={logo}
-                alt="logo"
-                className="w-48 h-12 mb-2"
-              />
-              <p className="text-white mt-1 ml-3">
-                Connecting You to Your College
-                Canteens
-              </p>
+              <img src={logo} alt="logo" className="w-48 h-12 mb-2" />
+              <p className="text-white mt-1 ml-3">Connecting You to Your College Canteens</p>
             </div>
 
             <div className="absolute -bottom-32 -left-40 w-80 h-80 border-4 rounded-full border-opacity-30 border-t-8"></div>
@@ -106,15 +76,9 @@ function Login() {
           </div>
 
           <div className="flex md:w-1/2 justify-center py-10 items-center bg-white">
-            <form
-              className="bg-white p-8 rounded shadow-lg w-80"
-              onSubmit={submitHandler}>
-              <h1 className="text-gray-800 font-bold text-2xl mb-1">
-                Hello Again!
-              </h1>
-              <p className="text-sm font-normal text-gray-600 mb-7">
-                Welcome Back
-              </p>
+            <form className="bg-white p-8 rounded shadow-lg w-80" onSubmit={submitHandler}>
+              <h1 className="text-gray-800 font-bold text-2xl mb-1">Hello Again!</h1>
+              <p className="text-sm font-normal text-gray-600 mb-7">Welcome Back</p>
 
               <div className="mb-4">
                 <input
@@ -134,20 +98,13 @@ function Login() {
                   name="accountType"
                   onChange={changeHandler}
                   value={formData.accountType}
-                  className="mt-1 p-2 w-full border rounded-2xl">
-                  <option
-                    value=""
-                    disabled
-                    selected
-                    hidden>
+                  className="mt-1 p-2 w-full border rounded-2xl"
+                >
+                  <option value="" disabled hidden>
                     Login as
                   </option>
-                  <option value="User">
-                    User
-                  </option>
-                  <option value="Canteen">
-                    Canteen
-                  </option>
+                  <option value="User">User</option>
+                  <option value="Canteen">Canteen</option>
                 </select>
               </div>
 
@@ -155,11 +112,7 @@ function Login() {
                 <input
                   required
                   className="w-full py-2 px-3 border border-gray-300 rounded-2xl"
-                  type={
-                    showPassword
-                      ? "text"
-                      : "password"
-                  }
+                  type={showPassword ? "text" : "password"}
                   placeholder="Password"
                   name="password"
                   value={formData.password}
@@ -167,25 +120,18 @@ function Login() {
                 />
                 <span
                   className="absolute right-3 top-3 cursor-pointer"
-                  onClick={() =>
-                    setShowPassword(
-                      (prev) => !prev
-                    )
-                  }>
-                  {showPassword ? (
-                    <AiOutlineEye size={20} />
-                  ) : (
-                    <AiOutlineEyeInvisible
-                      size={20}
-                    />
-                  )}
+                  onClick={() => setShowPassword((prev) => !prev)}
+                >
+                  {showPassword ? <AiOutlineEye size={20} /> : <AiOutlineEyeInvisible size={20} />}
                 </span>
               </div>
 
               <button
                 type="submit"
-                className="w-full bg-gradient-to-t from-blue-950 via-blue-950 to-gray-900 py-2 rounded-2xl text-white font-semibold mb-2">
-                Login
+                className="w-full bg-gradient-to-t from-blue-950 via-blue-950 to-gray-900 py-2 rounded-2xl text-white font-semibold mb-2"
+                disabled={loading}
+              >
+                {loading ? 'Loading...' : 'Login'}
               </button>
 
               <Link to="/signup">
@@ -195,20 +141,9 @@ function Login() {
               </Link>
             </form>
           </div>
-          <button type="submit" className="w-full bg-gradient-to-t from-blue-950 via-blue-950 to-gray-900 py-2 rounded-2xl text-white font-semibold mb-2" disabled = {loading} >
-            {loading ? 'Loading...' : 'Login'}
-          </button>
-
-          <Link to="/signup">
-            <span className="text-sm ml-2 hover:text-blue-500 cursor-pointer">Don't have an account? Sign Up</span>
-          </Link>
-          
-        </form>
-
-      </div>
-
-    </div>
-
+        </div>
+      )}
+    </>
   );
 }
 
diff --git a/src/pages/Signup.jsx b/src/pages/Signup.jsx
index e3695e0..1f0aa04 100644
--- a/src/pages/Signup.jsx
+++ b/src/pages/Signup.jsx
@@ -99,7 +99,7 @@ function Signup() {
     ) {
       if (formData.accountType === "User") {
          // const apiUrl = `${process.env.REACT_APP_BASE_URL}/studentSignup`;
-          const apiUrl = `http://localhost:8000/api/v1/studentSignup`;
+          const apiUrl = `http://localhost:3000/api/v1/studentSignup`;
          try {
           setLoading(true);