✨ improve redirect on login

pouyio · Feb 5, 2024 · 0b37ee0 · 0b37ee0
1 parent a959c6e
commit 0b37ee0
Show file tree

Hide file tree

Showing 2 changed files with 16 additions and 2 deletions.
diff --git a/src/components/Login.tsx b/src/components/Login.tsx
@@ -17,7 +17,13 @@ const Login: React.FC<ILoginProps> = ({ code }) => {
   useEffect(() => {
     loginApi(code).then(({ data }) => {
       authService.session = data;
-      history('/movies');
+      const redirectPath = localStorage.getItem('redirect_path');
+      if (redirectPath) {
+        localStorage.removeItem('redirect_path');
+        history(redirectPath);
+      } else {
+        history('/movies');
+      }
     });
   });
 

diff --git a/src/components/LoginButton.tsx b/src/components/LoginButton.tsx
@@ -1,13 +1,21 @@
 import React from 'react';
+import { useLocation } from 'react-router-dom';
 const redirect_url = import.meta.env.VITE_REDIRECT_URL;
 
 export const LoginButton: React.FC<{ small?: boolean }> = ({ small }) => {
+  const location = useLocation();
+
+  const onClick = () => {
+    localStorage.setItem('redirect_path', location.pathname);
+  };
+
   return (
     <a
-      className={`bg-gray-400 rounded-full text-white ${
+      className={`bg-gray-400 cursor-pointer rounded-full text-white ${
         small ? 'p-2' : 'px-12 py-3'
       }`}
       style={{ lineHeight: '2em' }}
+      onClick={onClick}
       href={`https://trakt.tv/oauth/authorize?response_type=code&client_id=61afe7ed7ef7a2b6b2193254dd1cca580ba8dee91490df454d78fd68aed7e5f9&redirect_uri=${redirect_url}`}
     >
       Login