From 5460f7f5c5538a4476f7817c0bf6c03538aff7b3 Mon Sep 17 00:00:00 2001 From: Divyansh Seth Date: Sat, 29 Jun 2024 17:59:43 +0530 Subject: [PATCH] join: Navigate to game upon login during game join. fixes: #174 --- frontend/src/pages/Login.tsx | 8 +++++--- 1 file changed, 5 insertions(+), 3 deletions(-) diff --git a/frontend/src/pages/Login.tsx b/frontend/src/pages/Login.tsx index b34a35a9..20b9d190 100644 --- a/frontend/src/pages/Login.tsx +++ b/frontend/src/pages/Login.tsx @@ -1,7 +1,7 @@ import React, { useState } from 'react'; import Button from '../library/button'; import Input from '../library/input'; -import { Link, useNavigate } from 'react-router-dom'; +import { Link, useLocation, useNavigate } from 'react-router-dom'; import { useAuth } from '../contexts/AuthContext'; import '../index.css'; @@ -10,6 +10,7 @@ const Login: React.FC = () => { const [password, setPassword] = useState(''); const auth = useAuth(); const navigate = useNavigate(); + const location = useLocation(); const handleUsernameChange = ( event: React.ChangeEvent @@ -27,8 +28,9 @@ const Login: React.FC = () => { event.preventDefault(); console.log('Form submitted'); await auth.authenticate(username, password); - //todo: Check query params for a join game link - navigate('/'); + //Check query params for a join game link + const navigateTo = location.search; + navigateTo ? navigate(navigateTo) : navigate('/'); }; return (