diff --git a/src/components/Route/IsLoggedRoute.js b/src/components/Route/IsLoggedRoute.js index f071b2b..2fb3617 100644 --- a/src/components/Route/IsLoggedRoute.js +++ b/src/components/Route/IsLoggedRoute.js @@ -9,6 +9,7 @@ class IsLoggedRoute extends Component { render() { return ( + !this.props.progress ? @@ -23,17 +24,19 @@ class IsLoggedRoute extends Component { /> ) } - /> + /> : null ); } } IsLoggedRoute.propTypes = { - isAuthenticated: PropTypes.bool.isRequired + isAuthenticated: PropTypes.bool.isRequired, + progress: PropTypes.bool.isRequired }; const mapStateToProps = state => ({ isAuthenticated: state.auth.isAuthenticated, + progress: state.auth.progress }); export default connect(mapStateToProps, null)(IsLoggedRoute); diff --git a/src/components/Route/PrivateRoute.js b/src/components/Route/PrivateRoute.js index ffd321a..0d41355 100644 --- a/src/components/Route/PrivateRoute.js +++ b/src/components/Route/PrivateRoute.js @@ -9,6 +9,7 @@ class PrivateRoute extends Component { render() { return ( + !this.props.progress ? @@ -25,17 +26,19 @@ class PrivateRoute extends Component { ) })() } - /> + /> : null ); } } PrivateRoute.propTypes = { - isAuthenticated: PropTypes.bool.isRequired + isAuthenticated: PropTypes.bool.isRequired, + progress: PropTypes.bool.isRequired }; const mapStateToProps = state => ({ - isAuthenticated: state.auth.isAuthenticated + isAuthenticated: state.auth.isAuthenticated, + progress: state.auth.progress }); export default connect(mapStateToProps, null)(withRouter(PrivateRoute)); diff --git a/src/components/Route/PrivateRouteCreator.js b/src/components/Route/PrivateRouteCreator.js index 0efd48c..e279969 100644 --- a/src/components/Route/PrivateRouteCreator.js +++ b/src/components/Route/PrivateRouteCreator.js @@ -9,6 +9,7 @@ class PrivateRoute extends Component { render() { return ( + !this.props.progress ? @@ -27,19 +28,21 @@ class PrivateRoute extends Component { ) })() } - /> + /> : null ); } } PrivateRoute.propTypes = { isAuthenticated: PropTypes.bool.isRequired, - user: PropTypes.object + user: PropTypes.object, + progress: PropTypes.bool.isRequired }; const mapStateToProps = state => ({ isAuthenticated: state.auth.isAuthenticated, - user: state.auth.user + user: state.auth.user, + progress: state.auth.progress }); export default connect(mapStateToProps, null)(withRouter(PrivateRoute));