click signup redirects to the right place in jam-ui
This commit is contained in:
parent
624853c868
commit
753f35b24d
|
|
@ -75,8 +75,8 @@ const JKRegistrationForm = ({ hasLabel, jamTrack, jamTrackArtistName }) => {
|
||||||
console.log('redirecting to jamtracks artist landing');
|
console.log('redirecting to jamtracks artist landing');
|
||||||
history.push(`/jamtracks?artist=${jamTrackArtistName}`);
|
history.push(`/jamtracks?artist=${jamTrackArtistName}`);
|
||||||
} else {
|
} else {
|
||||||
console.log('redirecting to downloads');
|
console.log('redirecting to profile');
|
||||||
history.push('/public/downloads');
|
history.push('/profile');
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}, [currentUser, jamTrack, jamTrackArtistName]);
|
}, [currentUser, jamTrack, jamTrackArtistName]);
|
||||||
|
|
|
||||||
|
|
@ -1,11 +1,27 @@
|
||||||
import React, { Fragment } from 'react';
|
import React, { Fragment, useEffect } from 'react';
|
||||||
import { Col, Row } from 'reactstrap';
|
import { Col, Row } from 'reactstrap';
|
||||||
import { Link } from 'react-router-dom';
|
import { Link, useHistory, useLocation } from 'react-router-dom';
|
||||||
import LoginForm from '../LoginForm';
|
import LoginForm from '../LoginForm';
|
||||||
import { useTranslation } from 'react-i18next';
|
import { useTranslation } from 'react-i18next';
|
||||||
|
import { useAuth } from '../../../context/UserAuth';
|
||||||
|
|
||||||
const Login = () => {
|
const Login = () => {
|
||||||
const { t } = useTranslation('auth');
|
const { t } = useTranslation('auth');
|
||||||
|
const { isAuthenticated, isLoading } = useAuth();
|
||||||
|
const history = useHistory();
|
||||||
|
const location = useLocation();
|
||||||
|
|
||||||
|
useEffect(() => {
|
||||||
|
if (!isLoading && isAuthenticated) {
|
||||||
|
const { from } = location.state || { from: { pathname: '/profile' } };
|
||||||
|
const finalDestination = from.pathname === '/' ? { pathname: '/profile' } : from;
|
||||||
|
history.replace(finalDestination);
|
||||||
|
}
|
||||||
|
}, [isAuthenticated, isLoading, history, location]);
|
||||||
|
|
||||||
|
if (isLoading || isAuthenticated) {
|
||||||
|
return null; // Or a loading spinner
|
||||||
|
}
|
||||||
|
|
||||||
return (
|
return (
|
||||||
<Fragment>
|
<Fragment>
|
||||||
|
|
|
||||||
Loading…
Reference in New Issue