From a4c59e524e242229a8477daf3a8a4a67b111be83 Mon Sep 17 00:00:00 2001 From: Parth Date: Thu, 30 Oct 2025 22:42:04 +0530 Subject: [PATCH 1/5] feat(auth): left Back button and add theme toggle on Login & Signup --- frontend/src/pages/Login.jsx | 40 ++++++++++++++++++++++++++++++++--- frontend/src/pages/Signup.jsx | 40 ++++++++++++++++++++++++++++++++--- 2 files changed, 74 insertions(+), 6 deletions(-) diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsx index 12bc4c0..d748317 100644 --- a/frontend/src/pages/Login.jsx +++ b/frontend/src/pages/Login.jsx @@ -4,6 +4,7 @@ import { ArrowLeft, Eye, EyeOff, FileText } from 'lucide-react'; import { authAPI } from '../utils/api'; import toast from 'react-hot-toast'; import authContext from '../context/AuthProvider'; +import themeContext from '../context/ThemeProvider'; import OAuthButtons from '../components/OAuthButtons'; import Input from '../components/ui/Input'; @@ -16,6 +17,7 @@ const Login = () => { const navigate = useNavigate(); const location = useLocation(); const { setuser } = useContext(authContext); + const { theme, settheme } = useContext(themeContext); // Handle OAuth errors from URL parameters useEffect(() => { @@ -139,16 +141,48 @@ const Login = () => { {/* Right Side - Login Form */}
{/* Back Link */} -
+
{ + e.preventDefault(); + navigate(-1); + }} className="flex items-center gap-2 text-base-content/70 hover:text-base-content transition-colors" > - Home + Back
+ {/* Theme Toggle */} +
+ +
+ {/* Mobile Logo (visible on small screens) */}
diff --git a/frontend/src/pages/Signup.jsx b/frontend/src/pages/Signup.jsx index 667f25a..06c3617 100644 --- a/frontend/src/pages/Signup.jsx +++ b/frontend/src/pages/Signup.jsx @@ -4,6 +4,7 @@ import { ArrowLeft, Eye, EyeOff, FileText } from 'lucide-react'; import { authAPI } from '../utils/api'; import toast from 'react-hot-toast'; import authContext from '../context/AuthProvider'; +import themeContext from '../context/ThemeProvider'; import OAuthButtons from '../components/OAuthButtons'; import Input from '../components/ui/Input'; @@ -18,6 +19,7 @@ const Signup = () => { const navigate = useNavigate(); const location = useLocation(); const { setuser } = useContext(authContext); + const { theme, settheme } = useContext(themeContext); // Handle OAuth errors from URL params useEffect(() => { @@ -159,16 +161,48 @@ const Signup = () => { {/* Right Side - Signup Form */}
{/* Back Link */} -
+
{ + e.preventDefault(); + navigate(-1); + }} className="flex items-center gap-2 text-base-content/70 hover:text-base-content transition-colors" > - Home + Back
+ {/* Theme Toggle */} +
+ +
+ {/* Mobile Logo (visible on small screens) */}
From b0ee2495a5e8115333d94080fcf057d9143e691c Mon Sep 17 00:00:00 2001 From: Parth Date: Thu, 30 Oct 2025 22:46:39 +0530 Subject: [PATCH 2/5] fix(auth): Back button falls back to / when no history (Login & Signup) --- frontend/src/pages/Login.jsx | 3 ++- frontend/src/pages/Signup.jsx | 3 ++- 2 files changed, 4 insertions(+), 2 deletions(-) diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsx index d748317..5334869 100644 --- a/frontend/src/pages/Login.jsx +++ b/frontend/src/pages/Login.jsx @@ -146,7 +146,8 @@ const Login = () => { to="#" onClick={(e) => { e.preventDefault(); - navigate(-1); + if (window.history.length > 1) navigate(-1); + else navigate('/'); }} className="flex items-center gap-2 text-base-content/70 hover:text-base-content transition-colors" > diff --git a/frontend/src/pages/Signup.jsx b/frontend/src/pages/Signup.jsx index 06c3617..c103626 100644 --- a/frontend/src/pages/Signup.jsx +++ b/frontend/src/pages/Signup.jsx @@ -166,7 +166,8 @@ const Signup = () => { to="#" onClick={(e) => { e.preventDefault(); - navigate(-1); + if (window.history.length > 1) navigate(-1); + else navigate('/'); }} className="flex items-center gap-2 text-base-content/70 hover:text-base-content transition-colors" > From 073dd67e54caee6087181292debb6cc59e08db3d Mon Sep 17 00:00:00 2001 From: Parth Date: Fri, 31 Oct 2025 00:29:36 +0530 Subject: [PATCH 3/5] Done the required Changes --- frontend/src/pages/Login.jsx | 84 +++++++++++++++++------------------ frontend/src/pages/Signup.jsx | 84 +++++++++++++++++------------------ 2 files changed, 84 insertions(+), 84 deletions(-) diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsx index 5334869..61a7995 100644 --- a/frontend/src/pages/Login.jsx +++ b/frontend/src/pages/Login.jsx @@ -138,50 +138,50 @@ const Login = () => {
- {/* Right Side - Login Form */} -
- {/* Back Link */} -
- { - e.preventDefault(); - if (window.history.length > 1) navigate(-1); - else navigate('/'); - }} - className="flex items-center gap-2 text-base-content/70 hover:text-base-content transition-colors" - > - - Back - -
- {/* Theme Toggle */} -
-
- {/* Right Side - Signup Form */} -
- {/* Back Link */} -
- { - e.preventDefault(); - if (window.history.length > 1) navigate(-1); - else navigate('/'); - }} - className="flex items-center gap-2 text-base-content/70 hover:text-base-content transition-colors" - > - - Back - -
- {/* Theme Toggle */} -
-
-
diff --git a/frontend/src/pages/Signup.jsx b/frontend/src/pages/Signup.jsx index 6d1b0f0..ccde8b0 100644 --- a/frontend/src/pages/Signup.jsx +++ b/frontend/src/pages/Signup.jsx @@ -158,7 +158,6 @@ const Signup = () => {
-
From f1e6fe19b77e39a4653626cf03c8948c5ac66c6e Mon Sep 17 00:00:00 2001 From: Parth Date: Fri, 31 Oct 2025 02:41:30 +0530 Subject: [PATCH 5/5] fixed the size --- frontend/src/pages/Login.jsx | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/frontend/src/pages/Login.jsx b/frontend/src/pages/Login.jsx index 840dd15..7b81dfe 100644 --- a/frontend/src/pages/Login.jsx +++ b/frontend/src/pages/Login.jsx @@ -139,7 +139,7 @@ const Login = () => {
-
+