schuelerlabor-cleverlab/smarti
2
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

routing improvement

Browse Source
This commit is contained in:
Delucse 2020-12-14 15:15:08 +01:00
parent 42981a4f11
commit a99ecc36a4
3 changed files with 17 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
src/components/Route/IsLoggedRoute.js
View File

@ -9,6 +9,7 @@ class IsLoggedRoute extends Component {
render() { render() {
return ( return (
!this.props.progress ?
<Route <Route
{...this.props.exact} {...this.props.exact}
render={({ location }) => render={({ location }) =>
@ -23,17 +24,19 @@ class IsLoggedRoute extends Component {
/> />
) )
} }
/> /> : null
); );
} }
} }
IsLoggedRoute.propTypes = { IsLoggedRoute.propTypes = {
isAuthenticated: PropTypes.bool.isRequired isAuthenticated: PropTypes.bool.isRequired,
progress: PropTypes.bool.isRequired
}; };
const mapStateToProps = state => ({ const mapStateToProps = state => ({
isAuthenticated: state.auth.isAuthenticated, isAuthenticated: state.auth.isAuthenticated,
progress: state.auth.progress
}); });
export default connect(mapStateToProps, null)(IsLoggedRoute); export default connect(mapStateToProps, null)(IsLoggedRoute);

9
src/components/Route/PrivateRoute.js
View File

@ -9,6 +9,7 @@ class PrivateRoute extends Component {
render() { render() {
return ( return (
!this.props.progress ?
<Route <Route
{...this.props.exact} {...this.props.exact}
render={({ location }) => render={({ location }) =>
@ -25,17 +26,19 @@ class PrivateRoute extends Component {
) )
})() })()
} }
/> /> : null
); );
} }
} }
PrivateRoute.propTypes = { PrivateRoute.propTypes = {
isAuthenticated: PropTypes.bool.isRequired isAuthenticated: PropTypes.bool.isRequired,
progress: PropTypes.bool.isRequired
}; };
const mapStateToProps = state => ({ const mapStateToProps = state => ({
isAuthenticated: state.auth.isAuthenticated isAuthenticated: state.auth.isAuthenticated,
progress: state.auth.progress
}); });
export default connect(mapStateToProps, null)(withRouter(PrivateRoute)); export default connect(mapStateToProps, null)(withRouter(PrivateRoute));

9
src/components/Route/PrivateRouteCreator.js
View File

@ -9,6 +9,7 @@ class PrivateRoute extends Component {
render() { render() {
return ( return (
!this.props.progress ?
<Route <Route
{...this.props.exact} {...this.props.exact}
render={({ location }) => render={({ location }) =>
@ -27,19 +28,21 @@ class PrivateRoute extends Component {
) )
})() })()
} }
/> /> : null
); );
} }
} }
PrivateRoute.propTypes = { PrivateRoute.propTypes = {
isAuthenticated: PropTypes.bool.isRequired, isAuthenticated: PropTypes.bool.isRequired,
user: PropTypes.object user: PropTypes.object,
progress: PropTypes.bool.isRequired
}; };
const mapStateToProps = state => ({ const mapStateToProps = state => ({
isAuthenticated: state.auth.isAuthenticated, isAuthenticated: state.auth.isAuthenticated,
user: state.auth.user user: state.auth.user,
progress: state.auth.progress
}); });
export default connect(mapStateToProps, null)(withRouter(PrivateRoute)); export default connect(mapStateToProps, null)(withRouter(PrivateRoute));