From b20a6b4e0fd80059c4c6c5258b55a5d0f58101c7 Mon Sep 17 00:00:00 2001 From: Anneshu Nag <132702983+NK-Works@users.noreply.github.com> Date: Tue, 22 Oct 2024 02:10:41 +0530 Subject: [PATCH 1/2] Update .gitattributes --- .gitattributes | 1 - 1 file changed, 1 deletion(-) diff --git a/.gitattributes b/.gitattributes index a37a4a8..40f31f9 100644 --- a/.gitattributes +++ b/.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 From a5a73e6eca5de0adefcff9c31fa4009734af3310 Mon Sep 17 00:00:00 2001 From: Anneshu Nag <132702983+NK-Works@users.noreply.github.com> Date: Tue, 22 Oct 2024 02:11:22 +0530 Subject: [PATCH 2/2] updated-signup-login-ui --- .../components/GoogleButton/GoogleButton.js | 2 + frontend/src/components/Login/Login.js | 42 +++++++++++--- frontend/src/components/Signup/Signup.js | 57 ++++++++++++++++--- 3 files changed, 83 insertions(+), 18 deletions(-) diff --git a/frontend/src/components/GoogleButton/GoogleButton.js b/frontend/src/components/GoogleButton/GoogleButton.js index ac06266..98251f5 100644 --- a/frontend/src/components/GoogleButton/GoogleButton.js +++ b/frontend/src/components/GoogleButton/GoogleButton.js @@ -24,6 +24,8 @@ const GoogleButton = () => { borderRadius: '8px', padding: '8px 16px', fontSize: '14px', + width: '100%', + height: '50px' }} > diff --git a/frontend/src/components/Login/Login.js b/frontend/src/components/Login/Login.js index 2a2aa39..b86d1b5 100644 --- a/frontend/src/components/Login/Login.js +++ b/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
+ setPassword(e.target.value)} required + /> setShowPassword(!showPassword)} > {showPassword ? "visibility_off" : "visibility"} +
-

Or

@@ -106,10 +107,32 @@ function Login() { }, [navigate]); return ( + <> +
-
+
+ ); } diff --git a/frontend/src/components/Signup/Signup.js b/frontend/src/components/Signup/Signup.js index 8d2c37c..d71ea93 100644 --- a/frontend/src/components/Signup/Signup.js +++ b/frontend/src/components/Signup/Signup.js @@ -102,19 +102,58 @@ function Signup() { return ( <> @@ -227,8 +266,8 @@ function Signup() {
-
+