Merge branch 'main' into main

Vin205 · Oct 6, 2024 · 884c7e0 · 884c7e0
2 parents f64dd82 + 9d935e6
commit 884c7e0
Show file tree

Hide file tree

Showing 3 changed files with 12 additions and 22 deletions.
diff --git a/frontend/src/components/Login/Login.js b/frontend/src/components/Login/Login.js
@@ -33,17 +33,8 @@ function Login() {
   };
 
   return (
-    <div className="container" style={{
-      position:'fixed',
-      width:"1500px",
-      height:'auto'
-    }}>
-      <div className="row justify-content-center" style={{
-        width:'1000px',
-        position:"relative",
-        top:'100px',
-        left:'250px'
-      }}>
+    <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">

diff --git a/frontend/src/components/Navbar/Navbar.js b/frontend/src/components/Navbar/Navbar.js
@@ -19,13 +19,21 @@ function Navbar() {
         <button className="navbar-toggle" onClick={toggleNavbar}>
           ☰ {/* Hamburger icon */}
         </button>
+        <ul className="nav-links desktop-links">
+          <li><a href="/">Home</a></li>
+          <li><a href="/about">About Us</a></li>
+          <li><a href="/contact">Contact Us</a></li>
+        </ul>
       </div>
+
       <ul className="nav-links desktop-links">
         <li><a href="/">Home</a></li>
         <li><a href="/about">About Us</a></li>
         <li><a href="/contact">Contact Us</a></li>
         <li><a href="/loan">Loan</a></li>
       </ul>
+
+
       <div className={`nav-menu ${isActive ? 'active' : ''}`}>
         <button className="close-button" onClick={closeNavbar}>
           &times; {/* Close icon */}

diff --git a/frontend/src/components/Signup/Signup.js b/frontend/src/components/Signup/Signup.js
@@ -42,17 +42,8 @@ function Signup() {
   };
 
   return (
-    <div className="container" style={{
-      position:'fixed',
-      width:"1500px",
-      height:'auto'
-    }}>
-      <div className="row justify-content-center" style={{
-        width:'1000px',
-        position:"relative",
-        top:'50px',
-        left:'250px'
-      }}>
+    <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">