Resolved the conflicts

dhairyagothi · Oct 3, 2024 · 488d723 · 488d723
1 parent 487be5e
commit 488d723
Show file tree

Hide file tree

Showing 2 changed files with 7 additions and 7 deletions.
diff --git a/frontend/src/Pages/LoginPage.jsx b/frontend/src/Pages/LoginPage.jsx
@@ -56,15 +56,15 @@ const Login = () => {
 
             {/* Login Form */}
             <form onSubmit={handleLogin} className="bg-white p-8 rounded-lg shadow-lg w-full max-w-md">
-                {/* Username Input */}
+                {/* Email Input */}
                 <div className="mb-6">
-                    <label className="block text-gray-700 font-semibold mb-2" htmlFor="username">Username</label>
+                    <label className="block text-gray-700 font-semibold mb-2" htmlFor="email">Email</label>
                     <input
                         type="text"
-                        id="username"
-                        value={username}
-                        onChange={(e) => setUsername(e.target.value)}
-                        placeholder="Enter your username"
+                        id="email"
+                        value={email}
+                        onChange={(e) => setEmail(e.target.value)}
+                        placeholder="Enter your email"
                         className="w-full px-4 py-3 border border-gray-300 rounded-lg focus:outline-none focus:ring-2 focus:ring-blue-500 transition duration-300"
                         required
                     />

diff --git a/frontend/src/Pages/Register.jsx b/frontend/src/Pages/Register.jsx
@@ -137,4 +137,4 @@ const Register = () => {
     );
 };
 
-export default Register;
+export default Register;
-Original file line number
+Diff line change
@@ Expand Up / @@ -137,4 +137,4 @@ const Register = () => { @@
         );
     };
-    export default Register;
+    export default Register;