Merge branch 'main' into main

.gitattributes

@@ -1,4 +1,3 @@
-*.js filter=lfs diff=lfs merge=lfs -text
 *.yml filter=lfs diff=lfs merge=lfs -text
 *.jsx filter=lfs diff=lfs merge=lfs -text
 *.png filter=lfs diff=lfs merge=lfs -text

README.md

@@ -11,6 +11,12 @@
     <a href="https://github.com/Vin205/Enyanjyoti/graphs/contributors"><img src="https://custom-icon-badges.demolab.com/github/contributors/Vin205/Enyanjyoti?label=Contributors&labelColor=302d41&color=c9cbff&logoColor=d9e0ee&logo=people&style=for-the-badge"/></a>
   <p>
     <img src="http://forthebadge.com/images/badges/license-mit.svg"/>
+    <!-- <img src="https://raw.githubusercontent.com/devSouvik/devSouvik/master/gif3.gif" alt=Aryanshukla/> -->
+  <p>
+  <p>
+  <a href="https://github.com/Symbiote07">
+  <img src="https://raw.githubusercontent.com/devSouvik/devSouvik/master/gif3.gif" alt=Aryanshukla/>
+
   <p>
    <img height=40 src="https://skillicons.dev/icons?i=html,css,js,react,firebase,nodejs,bootstrap">
 </div>
@@ -51,7 +57,7 @@ We aim to bridge the gap between education and employment while providing essent
 
 <div align="center">
   <a href="https://github.com/Vin205/Enyanjyoti/graphs/contributors">
-    <img src="https://contrib.rocks/image?repo=Vin205/Enyanjyoti&max=57&cachebust=3" />
+    <img src="https://contrib.rocks/image?repo=Vin205/Enyanjyoti&max=60&cachebust=3" />
   </a>
 </div>
 

frontend/src/components/Footer/Footer.js

@@ -2,6 +2,7 @@ import React from "react";
 import "./footer.css";
 import { FaInstagram, FaLinkedin, FaGithub } from "react-icons/fa";
 import { FaXTwitter } from "react-icons/fa6";
+import { Link } from 'react-router-dom';
 
 function Footer() {
   return (
@@ -18,19 +19,19 @@ function Footer() {
           <h3>Quick Links</h3>
           <ul>
             <li>
-              <a href="#education">Education</a>
+              <Link to="/educ">Education</Link>
             </li>
             <li>
-              <a href="#career">Career</a>
+              <Link to="/career">Career</Link>
             </li>
             <li>
-              <a href="#grants">Grants & Loans</a>
+              <Link to="/loan">Grants & Loans</Link>
             </li>
             <li>
-              <a href="#contact">Contact Us</a>
+              <Link to="/contact">Contact Us</Link>
             </li>
           </ul>
-        </div>
+      </div>
         <div className="footer-section">
           <h3>Contact Us</h3>
           <form className="contact-form">

frontend/src/components/Footer/footer.css

@@ -6,6 +6,7 @@
   position: relative;
   z-index: 1;
   margin-top: 30px;
+  width: 99.5vw
 }
 
 .footer-content {

frontend/src/components/ForgotPassword/ForgotPassword.js

@@ -1,9 +1,10 @@
-import React, { useState, useEffect } from "react";
+import React, { useState } from "react";
 import { useNavigate } from "react-router-dom";
 import { auth } from "../Firebase/firebase";
 import { sendPasswordResetEmail } from "firebase/auth";
+import Footer from "../Footer/Footer";
 
-function Login() {
+function ForgotPassword() {
     const [email, setEmail] = useState("");
     const [loading, setLoading] = useState(false);
     const [message, setMessage] = useState("");
@@ -25,58 +26,75 @@ function Login() {
     };
 
     return (
-        <div
-            className="container mt-5 justify-content-center"
-            style={{ height: "auto" }}
-        >
-            <div className="row justify-content-center" style={{ width: "100%" }}>
-                <div className="col-md-6">
-                    <div className="card shadow">
-                        <div className="card-body">
-                            <h2 className="text-center mb-4">Forgot Password</h2>
-                            {error && <div className="alert alert-danger">{error}</div>}
-                            {message && (
-                                <div className="alert alert-success">{message}</div>
-                            )}
-                            <form onSubmit={handleResetPassword}>
-                                <div className="mb-3">
-                                    <label htmlFor="email" className="form-label">
-                                        Email:
-                                    </label>
-                                    <input
-                                        type="email"
-                                        id="email"
-                                        className="form-control"
-                                        placeholder="Enter your email"
-                                        value={email}
-                                        onChange={(e) => setEmail(e.target.value)}
-                                        required
-                                    />
-                                </div>
-                                <button
-                                    type="submit"
-                                    className="btn btn-primary w-100"
-                                    disabled={loading}
-                                >
-                                    {loading ? "Requesting..." : "Request password link"}
-                                </button>
-                            </form>
-                            <p className="mt-3 text-center">
-                                Remember you password {" "}
-                                <span
-                                    className="text-primary"
-                                    style={{ cursor: "pointer" }}
-                                    onClick={() => navigate("/login")}
-                                >
-                                    Login
-                                </span>
-                            </p>
+        <>
+            <style>
+                {`.forgot-password-card {
+                    background: linear-gradient(135deg, #74ebd5 0%, #ACB6E5 100%);
+                    border-radius: 20px;
+                    box-shadow: 0 8px 20px rgba(0, 0, 0, 0.2);
+                    padding: 2rem;
+                    transition: transform 0.3s ease-in-out, box-shadow 0.3s ease-in-out;
+                }
+                .forgot-password-card:hover {
+                    box-shadow: 0 12px 25px rgba(0, 0, 0, 0.3);
+                    transform: translateY(-5px);
+                }
+                .forgot-password-title {
+                    font-size: 1.8rem;
+                    font-weight: bold;
+                    color: #333;
+                    text-align: center;
+                    margin-bottom: 1.5rem;
+                }
+                `}
+            </style>
+            <div className="container mx-auto mt-5 flex flex-col justify-center bg-cyan-500" style={{ height: "auto" }}>
+                <div className="row justify-content-center" style={{ width: "100%" }}>
+                    <div className="col-md-6">
+                        <div className="card shadow forgot-password-card">
+                            <div className="card-body">
+                                <h2 className="forgot-password-title">Forgot Password</h2>
+                                {error && <div className="alert alert-danger">{error}</div>}
+                                {message && <div className="alert alert-success">{message}</div>}
+                                <form onSubmit={handleResetPassword}>
+                                    <div className="mb-3">
+                                        <label htmlFor="email" className="form-label">Email:</label>
+                                        <input
+                                            type="email"
+                                            id="email"
+                                            className="form-control"
+                                            placeholder="Enter your email"
+                                            value={email}
+                                            onChange={(e) => setEmail(e.target.value)}
+                                            required
+                                        />
+                                    </div>
+                                    <button
+                                        type="submit"
+                                        className="btn btn-primary w-100"
+                                        disabled={loading}
+                                    >
+                                        {loading ? "Requesting..." : "Request password link"}
+                                    </button>
+                                </form>
+                                <p className="mt-3 text-center">
+                                    Remember your password?{" "}
+                                    <span
+                                        className="text-primary"
+                                        style={{ cursor: "pointer" }}
+                                        onClick={() => navigate("/login")}
+                                    >
+                                        Login
+                                    </span>
+                                </p>
+                            </div>
                         </div>
                     </div>
                 </div>
+                <Footer />
             </div>
-        </div>
+        </>
     );
 }
 
-export default Login;
+export default ForgotPassword;

frontend/src/components/GoogleButton/GoogleButton.js

@@ -24,6 +24,8 @@ const GoogleButton = () => {
           borderRadius: '8px',
           padding: '8px 16px',
           fontSize: '14px',
+          width: '100%',
+          height: '50px'
         }}
       >
         <FaGoogle className="me-2" />

frontend/src/components/Login/Login.js

@@ -2,9 +2,7 @@ import React, { useEffect, useState } from "react";
 import { useSignInWithEmailAndPassword } from "react-firebase-hooks/auth";
 import { Link, useNavigate } from "react-router-dom";
 import { auth } from "../Firebase/firebase";
-
 import GoogleButton from '../GoogleButton/GoogleButton'; // Import the GoogleButton
-
 import toast from "react-hot-toast";
 import Footer from "../Footer/Footer";
 
@@ -33,6 +31,7 @@ const LoginForm = ({ email, setEmail, password, setPassword, showPassword, setSh
     </div>
     <div className="mb-3">
       <label htmlFor="password" className="form-label">Password:</label>
+
       <input
         type={showPassword ? "text" : "password"}
         id="password"
@@ -41,22 +40,28 @@ const LoginForm = ({ email, setEmail, password, setPassword, showPassword, setSh
         value={password}
         onChange={(e) => setPassword(e.target.value)}
         required
+
       />
       <span
-        style={{ color: "black", position: "absolute", top: "49%", right: "25px", border: "none", cursor: "pointer" }}
+        style={{ color: "black", position: "absolute", top: "40.5%", right: "60px", border: "none", cursor: "pointer" }}
         className="material-symbols-outlined"
         onClick={() => setShowPassword(!showPassword)}
       >
         {showPassword ? "visibility_off" : "visibility"}
       </span>
+
     </div>
-    <button 
-      type="submit" 
-      className="btn btn-primary w-100" 
-      style={{ fontSize: '0.8rem', padding: '0.5rem' }} // Smaller button size
+    <button
+      type="submit"
+      className="btn btn-primary w-100 mb-3"
+      style={{ fontSize: '1.1rem', padding: '0.5rem', height: '50px' }}
       disabled={loading}>
-        {loading ? "Logging in..." : "Login"}
+      {loading ? "Logging in..." : "Login"}
     </button>
+    <div className="text-center">
+      <p>Or</p>
+      <GoogleButton />
+    </div>
   </form>
 );
 
@@ -102,10 +107,32 @@ function Login() {
   }, [navigate]);
 
   return (
-    <div className="container mt-5 justify-content-center" style={{ height: "auto" }}>
+    <>
+      <style>
+        {`.signin-card {
+            background: linear-gradient(135deg, #74ebd5 0%, #ACB6E5 100%);
+            border-radius: 20px;
+            box-shadow: 0 8px 20px rgba(0, 0, 0, 0.2);
+            padding: 2rem;
+            transition: transform 0.3s ease-in-out, box-shadow 0.3s ease-in-out;
+          }
+          .signin-card:hover {
+            box-shadow: 0 12px 25px rgba(0, 0, 0, 0.3);
+            transform: translateY(-5px);
+          }
+          .signin-title {
+            font-size: 1.8rem;
+            font-weight: bold;
+            color: #333;
+            text-align: center;
+            margin-bottom: 1.5rem;
+          }
+        `}
+        </style>
+    <div className="container mx-auto mt-5 flex flex-col justify-center bg-cyan-500" style={{ height: "auto" }}>
       <div className="row justify-content-center" style={{ width: "100%" }}>
         <div className="col-md-6">
-          <div className="card shadow">
+          <div className="card shadow signin-card">
             <div className="card-body">
               <LoginHeader />
               <LoginForm
@@ -119,17 +146,14 @@ function Login() {
                 loading={loading}
                 error={error}
               />
-              {/* Add the GoogleButton component here */}
-              <div className="text-center mt-4">
-                <GoogleButton />
-              </div>
               <LoginFooter navigate={navigate} />
             </div>
           </div>
         </div>
       </div>
       <Footer />
     </div>
+    </>
   );
 }
 

frontend/src/components/Navbar/Navbar.css

@@ -15,10 +15,14 @@
   height: 60px;
   width: 100%;
   padding: 0;
+/*   for responsiveness */
+  flex-wrap: nowrap;
 }
 
 .logo {
-  height: 30px;
+  height: 90px;
+  margin-top: -10px;
+
 }
 
 .nav-list {
@@ -192,11 +196,20 @@
   }
 }
 .nav-link {
+  border-radius: 10px;
+  padding: 6px 9px;
+  border: 2px solid #6a6060;
   display: inline-block;
   text-decoration: none;
   position: relative;
   vertical-align: bottom;
 }
+.nav-link:hover{
+  background-color: #039aff;
+  color: black;
+  border: 2px solid black;
+}
+
 
 .nav-link::after {
   content: '';