feat: ensure partial rendering does not happen

This commit is contained in:
karishmas6
2024-09-25 16:09:23 +05:30
parent 1f570c04c3
commit ecd78e2f0f

View File

@@ -8,7 +8,8 @@ interface UserRouteProps {
} }
const UserRoute: React.FC<UserRouteProps> = ({ children }) => { const UserRoute: React.FC<UserRouteProps> = ({ children }) => {
const [ok, setOk] = useState<boolean>(true); // Default to true to allow rendering while fetching const [loading, setLoading] = useState(true);
const [ok, setOk] = useState<boolean>(false);
const navigate = useNavigate(); const navigate = useNavigate();
const { notify } = useGlobalInfoStore(); const { notify } = useGlobalInfoStore();
@@ -26,6 +27,8 @@ const UserRoute: React.FC<UserRouteProps> = ({ children }) => {
} }
} catch (err: any) { } catch (err: any) {
handleRedirect(err.response?.data?.error || 'An error occurred. Please login again.'); handleRedirect(err.response?.data?.error || 'An error occurred. Please login again.');
} finally {
setLoading(false); // Remove loading state regardless of success or failure
} }
}; };
@@ -33,13 +36,16 @@ const UserRoute: React.FC<UserRouteProps> = ({ children }) => {
setOk(false); setOk(false);
if (errorMessage) { if (errorMessage) {
notify('error', errorMessage); notify('error', errorMessage);
} else {
notify('error', 'Please login again to continue');
} }
navigate('/login'); navigate('/login');
}; };
// If ok is true, render the children (protected route) // Block rendering if loading the authentication status
if (loading) return null;
return <>{ok ? children : null}</>; return <>{ok ? children : null}</>;
}; };
export default UserRoute; export default UserRoute;