Fix SignIn.tsx

aelassas · Dec 13, 2024 · 89ee703 · 89ee703
1 parent 8d7d83e
commit 89ee703
Show file tree

Hide file tree

Showing 2 changed files with 13 additions and 5 deletions.
diff --git a/frontend/src/components/SocialLogin.tsx b/frontend/src/components/SocialLogin.tsx
@@ -23,6 +23,7 @@ interface SocialLoginProps {
   facebook?: boolean
   apple?: boolean
   google?: boolean
+  redirectToHomepage?: boolean
   className?: string
   onError?: (error: any) => void
   onSignInError?: () => void
@@ -33,6 +34,7 @@ const SocialLogin = ({
   facebook,
   apple,
   google = true,
+  redirectToHomepage,
   className,
   onError,
   onSignInError,
@@ -56,6 +58,8 @@ const SocialLogin = ({
         if (onBlackListed) {
           onBlackListed()
         }
+      } else if (redirectToHomepage) {
+        navigate('/')
       } else {
         navigate(0)
       }

diff --git a/frontend/src/pages/SignIn.tsx b/frontend/src/pages/SignIn.tsx
@@ -20,6 +20,7 @@ import '@/assets/css/signin.css'
 
 const SignIn = () => {
   const navigate = useNavigate()
+
   const [email, setEmail] = useState('')
   const [password, setPassword] = useState('')
   const [error, setError] = useState(false)
@@ -45,6 +46,7 @@ const SignIn = () => {
       }
 
       const res = await UserService.signin(data)
+
       if (res.status === 200) {
         if (res.data.blacklisted) {
           await UserService.signout(false)
@@ -59,10 +61,12 @@ const SignIn = () => {
             if (from === 'checkout') {
               navigate(`/checkout${window.location.search}`)
             } else {
-              navigate(0)
+              // navigate(0)
+              navigate('/')
             }
           } else {
-            navigate(0)
+            // navigate(0)
+            navigate('/')
           }
         }
       } else {
@@ -136,13 +140,13 @@ const SignIn = () => {
                 <Link href="/forgot-password">{strings.RESET_PASSWORD}</Link>
               </div>
 
-              <SocialLogin />
+              <SocialLogin redirectToHomepage />
 
               <div className="signin-buttons">
-                <Button variant="contained" size="small" href="/sign-up" className="btn-secondary btn-margin btn-margin-bottom">
+                <Button variant="outlined" color="primary" href="/sign-up" className="btn-margin btn-margin-bottom">
                   {strings.SIGN_UP}
                 </Button>
-                <Button type="submit" variant="contained" size="small" className="btn-primary btn-margin btn-margin-bottom">
+                <Button type="submit" variant="contained" className="btn-primary btn-margin btn-margin-bottom">
                   {strings.SIGN_IN}
                 </Button>
               </div>