Updated state object and added loader to polls section

abohannon · Apr 1, 2018 · a54849f · a54849f
1 parent f5c5710
commit a54849f
Show file tree

Hide file tree

Showing 2 changed files with 4 additions and 4 deletions.
diff --git a/client/src/components/LandingPage/PollsSection.js b/client/src/components/LandingPage/PollsSection.js
@@ -47,14 +47,14 @@ class PollsSection extends Component {
       gridContainerStyle,
       titleStyle,
     } = styles;
-
+    console.log(this.props.polls.loading);
     return (
       <div style={pollsSectionContainerStyle}>
         <h2 id="polls" style={titleStyle}>Latest Polls</h2>
         <div style={gridContainerStyle}>
-          { !this.props.polls
+          { this.props.polls.loading
           ? <Loader />
-          : <GridDisplay polls={this.props.polls} />
+          : <GridDisplay polls={this.props.polls.all} />
         }
         </div>
         <div style={{ color: COLOR_BLUE_80 }}>

diff --git a/client/src/components/LandingPage/index.js b/client/src/components/LandingPage/index.js
@@ -46,6 +46,6 @@ class LandingPage extends Component {
   }
 }
 
-const mapStateToProps = state => ({ polls: state.polls.all });
+const mapStateToProps = state => ({ polls: state.polls });
 
 export default connect(mapStateToProps, { pollsFetch })(LandingPage);