ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-15 18:08:46 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Display loading icon when the user logs in or signs up

Browse Source
This commit is contained in:
Clayton Wilson 2019-11-25 13:55:03 -05:00
parent 64cc9bd156
commit 3814377817
2 changed files with 33 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

54
twistter-frontend/src/pages/Home.js
View File

@ -8,6 +8,7 @@ import axios from 'axios';
import Grid from '@material-ui/core/Grid';
import Card from '@material-ui/core/Card';
import CardContent from '@material-ui/core/CardContent';
import CircularProgress from '@material-ui/core/CircularProgress';
import Typography from "@material-ui/core/Typography";
// component
@ -32,6 +33,7 @@ class Home extends Component {
}
render() {
const { UI:{ loading } } = this.props;
let authenticated = this.props.user.authenticated;
let postMarkup = this.state.posts ? (
@ -68,40 +70,44 @@ class Home extends Component {
{postMarkup}
</Grid>
</Grid>
:
<div>
<div>
<img src={logo} className="app-logo" alt="logo" />
<br/><br/>
<b>Welcome to Twistter!</b>
<br/><br/>
<b>See the most interesting topics people are following right now.</b>
</div>
: loading ?
<CircularProgress size={60} style={{marginTop: "300px"}}></CircularProgress>
:
<div>
<div>
<img src={logo} className="app-logo" alt="logo" />
<br/><br/>
<b>Welcome to Twistter!</b>
<br/><br/>
<b>See the most interesting topics people are following right now.</b>
</div>
<br/><br/><br/><br/>
<br/><br/><br/><br/>
<div>
<b>Join today or sign in if you already have an account.</b>
<br/><br/>
<form action="./signup">
<button className="authButtons signup">Sign up</button>
</form>
<br/>
<form action="./login">
<button className="authButtons login">Sign in</button>
</form>
</div>
</div>
<div>
<b>Join today or sign in if you already have an account.</b>
<br/><br/>
<form action="./signup">
<button className="authButtons signup">Sign up</button>
</form>
<br/>
<form action="./login">
<button className="authButtons login">Sign in</button>
</form>
</div>
</div>
);
}
}
const mapStateToProps = (state) => ({
user: state.user
user: state.user,
UI: state.UI
})
Home.propTypes = {
user: PropTypes.object.isRequired
user: PropTypes.object.isRequired,
UI: PropTypes.object.isRequired
}
export default connect(mapStateToProps)(Home);

5
twistter-frontend/src/redux/actions/userActions.js
View File

@ -9,6 +9,7 @@ export const getUserData = () => (dispatch) => {
type: SET_USER,
payload: res.data,
})
dispatch({ type: CLEAR_ERRORS })
})
.catch((err) => console.error(err));
}
@ -21,7 +22,7 @@ export const loginUser = (loginData, history) => (dispatch) => {
// Save the login token
setAuthorizationHeader(res.data.token);
dispatch(getUserData());
dispatch({ type: CLEAR_ERRORS })
// dispatch({ type: CLEAR_ERRORS })
// Redirects to home page
history.push('/home');
})
@ -43,7 +44,7 @@ export const signupUser = (newUserData, history) => (dispatch) => {
// Save the signup token
setAuthorizationHeader(res.data.token);
dispatch(getUserData());
dispatch({ type: CLEAR_ERRORS })
// dispatch({ type: CLEAR_ERRORS })
// Redirects to home page
history.push('/home');
})