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

Fix merge errors, but posts are not displaying on home.js

Browse Source
This commit is contained in:
Clayton Wilson 2019-12-06 12:07:36 -05:00
parent a459e6581e
commit f30a9ae27c
1 changed files with 55 additions and 59 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

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

@ -142,9 +142,7 @@ class Home extends Component {
console.log(hiddenBool); console.log(hiddenBool);
let postMarkup = this.state.posts ? ( let postMarkup = this.state.posts ? (
// <<<<<<< admin-delete // <<<<<<< admin-delete
this.state.posts.map(post => post.hidden ? null : this.state.posts.map(post => !post.hidden && this.state.following && this.state.following.includes(post.userHandle) ? (
this.state.following ?
this.state.following.includes(post.userHandle) ? (
<Card className={classes.card} key={post.postId}> <Card className={classes.card} key={post.postId}>
<CardContent> <CardContent>
<Typography> <Typography>
@ -200,8 +198,6 @@ class Home extends Component {
) : ( ) : (
<p></p> <p></p>
) )
) : (
<p></p>
) )
// ======= // =======
// this.state.posts.map(post => // this.state.posts.map(post =>
@ -214,7 +210,7 @@ class Home extends Component {
// <p></p> // <p></p>
// ) // )
// >>>>>>> master // >>>>>>> master
)
) : ( ) : (
<p>Loading post...</p> <p>Loading post...</p>
); );