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

Fix some code after merge

Browse Source
This commit is contained in:
Clayton Wilson 2019-12-02 16:40:22 -05:00
parent 4d97afcb09
commit 8244631d4d
2 changed files with 2 additions and 17 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -348,5 +348,4 @@ Quote.propTypes = {
user: PropTypes.object.isRequired user: PropTypes.object.isRequired
} }
// export default connect(mapStateToProps)(withStyles(styles)(Home)); export default connect(mapStateToProps)(withStyles(styles)(Home, Like, Quote));
export default connect(mapStateToProps)(Home, Like, Quote);

16
twistter-frontend/src/pages/user.js
View File

@ -13,7 +13,6 @@ import CardMedia from "@material-ui/core/CardMedia";
import CardContent from "@material-ui/core/CardContent"; import CardContent from "@material-ui/core/CardContent";
import Button from "@material-ui/core/Button"; import Button from "@material-ui/core/Button";
import Grid from "@material-ui/core/Grid"; import Grid from "@material-ui/core/Grid";
import withStyles from '@material-ui/styles/withStyles';
import Chip from "@material-ui/core/Chip"; import Chip from "@material-ui/core/Chip";
import Typography from "@material-ui/core/Typography"; import Typography from "@material-ui/core/Typography";
@ -48,7 +47,7 @@ const styles = {
// marginRight: "10%" // marginRight: "10%"
}, },
card: { card: {
marginBottom: 10 marginBottom: 5
}, },
profileImage: { profileImage: {
marginTop: 20 marginTop: 20
@ -161,7 +160,6 @@ class user extends Component {
render() { render() {
const { classes } = this.props; const { classes } = this.props;
let authenticated = this.props.user.authenticated; let authenticated = this.props.user.authenticated;
let {classes} = this.props;
let profileMarkup = this.state.profile ? ( let profileMarkup = this.state.profile ? (
<div> <div>
@ -207,18 +205,6 @@ class user extends Component {
); );
let postMarkup = this.state.posts ? ( let postMarkup = this.state.posts ? (
// this.state.posts.map(post =>
// <Card className={classes.card}>
// <CardContent>
// <Typography>
// {
// this.state.imageUrl ? (<img src={this.state.imageUrl} height="50" width="50" />) :
// (<img src={noImage} height="50" width="50"/>)
// }
// </Typography>
// <Typography variant="h7"><b>{post.userHandle}</b></Typography>
// <Typography variant="body2" color={"textSecondary"}>{this.formatDate(post.createdAt)}</Typography>
this.state.posts.map(post => ( this.state.posts.map(post => (
<Card className={classes.card}> <Card className={classes.card}>
<CardContent> <CardContent>