This commit is contained in:
Artem Tarasov 2020-07-03 12:20:07 +03:00
parent da9423bfdc
commit 6f456eaa4e
3 changed files with 12 additions and 2 deletions

View File

@ -18,7 +18,7 @@ const App = () => {
fallback={<Loader className="pageLoader" type="rombs" size='40px' />}
>
<Switch>
<PublicRoute path="/wizard" component={Wizard} />
<Route path="/wizard" component={Wizard} />
<PublicRoute exact path={["/login","/login/error=:error", "/login/confirmed-email=:confirmedEmail"]} component={Login} />
<Route path="/confirm" component={Confirm} />
<PrivateRoute exact path={["/","/error=:error"]} component={Home} />

View File

@ -25,7 +25,7 @@ const PrivateRoute = ({ component: Component, ...rest }) => {
const renderComponent = useCallback(
props => {
console.log(!token && fakeToken)
if (fakeToken) {
return (
<Redirect

View File

@ -8,6 +8,16 @@ export const PublicRoute = ({ component: Component, ...rest }) => {
const renderComponent = useCallback(
props => {
if(!token) {
return (
<Redirect
to={{
pathname: "/wizard",
state: { from: props.location }
}}
/>
);
}
if(token) {
return (
<Redirect