From 8244631d4dfa3c33fbbeb1c64f568db08aefc73c Mon Sep 17 00:00:00 2001 From: Clayton Wilson Date: Mon, 2 Dec 2019 16:40:22 -0500 Subject: [PATCH] Fix some code after merge --- twistter-frontend/src/pages/Home.js | 3 +-- twistter-frontend/src/pages/user.js | 16 +--------------- 2 files changed, 2 insertions(+), 17 deletions(-) diff --git a/twistter-frontend/src/pages/Home.js b/twistter-frontend/src/pages/Home.js index ab1cc71..72c5c5a 100644 --- a/twistter-frontend/src/pages/Home.js +++ b/twistter-frontend/src/pages/Home.js @@ -348,5 +348,4 @@ Quote.propTypes = { user: PropTypes.object.isRequired } -// export default connect(mapStateToProps)(withStyles(styles)(Home)); -export default connect(mapStateToProps)(Home, Like, Quote); +export default connect(mapStateToProps)(withStyles(styles)(Home, Like, Quote)); diff --git a/twistter-frontend/src/pages/user.js b/twistter-frontend/src/pages/user.js index f9b443a..97258b0 100644 --- a/twistter-frontend/src/pages/user.js +++ b/twistter-frontend/src/pages/user.js @@ -13,7 +13,6 @@ import CardMedia from "@material-ui/core/CardMedia"; import CardContent from "@material-ui/core/CardContent"; import Button from "@material-ui/core/Button"; import Grid from "@material-ui/core/Grid"; -import withStyles from '@material-ui/styles/withStyles'; import Chip from "@material-ui/core/Chip"; import Typography from "@material-ui/core/Typography"; @@ -48,7 +47,7 @@ const styles = { // marginRight: "10%" }, card: { - marginBottom: 10 + marginBottom: 5 }, profileImage: { marginTop: 20 @@ -161,7 +160,6 @@ class user extends Component { render() { const { classes } = this.props; let authenticated = this.props.user.authenticated; - let {classes} = this.props; let profileMarkup = this.state.profile ? (
@@ -207,18 +205,6 @@ class user extends Component { ); let postMarkup = this.state.posts ? ( -// this.state.posts.map(post => -// -// -// -// { -// this.state.imageUrl ? () : -// () -// } -// -// {post.userHandle} -// {this.formatDate(post.createdAt)} - this.state.posts.map(post => (