Merge branch 'master' of github.com:ParabolInc/action

ParabolInc · Aug 16, 2016 · a2c458b · a2c458b
2 parents 830a160 + fae8a47
commit a2c458b
Show file tree

Hide file tree

Showing 2 changed files with 19 additions and 7 deletions.
diff --git a/src/universal/modules/landing/components/Landing/Landing.js b/src/universal/modules/landing/components/Landing/Landing.js
@@ -23,11 +23,11 @@ export default class Landing extends Component {
   static propTypes = {
     // children included here for multi-part landing pages (FAQs, pricing, cha la la)
     // children: PropTypes.element,
-    onMeetingCreateClick: PropTypes.func.isRequired
+    handleLoginClick: PropTypes.func.isRequired
   };
 
   render() {
-    const {onMeetingCreateClick} = this.props;
+    const {handleLoginClick} = this.props;
 
     return (
       <div className={styles.layout}>
@@ -44,14 +44,21 @@ export default class Landing extends Component {
             </h2>
             <button
               className={styles.ctaButton}
-              onClick={onMeetingCreateClick}
+              onClick={handleLoginClick}
               title="Get Started"
             >
               Get Started
             </button>
             <br />
             {/* TODO: Add click handler for logging in */}
-            <a className={styles.headerLink} href="#" title="Log In">Or, log in</a>
+            <a
+              className={styles.headerLink}
+              href="#"
+              title="Log In"
+              onClick={handleLoginClick}
+            >
+              Or, log in
+            </a>
           </div>
         </div>
 

diff --git a/src/universal/modules/landing/containers/Landing/LandingContainer.js b/src/universal/modules/landing/containers/Landing/LandingContainer.js
@@ -12,15 +12,20 @@ const LandingContainer = (props) => {
   return (
     <div>
       <Helmet title="Welcome to Action" {...head} />
-      <Landing onMeetingCreateClick={showLockThunk} {...props} />
+      <Landing handleLoginClick={showLockThunk} {...props} />
     </div>
   );
 };
 
 LandingContainer.propTypes = {
+  auth: PropTypes.object,
+  user: PropTypes.shape({
+    email: PropTypes.string,
+    id: PropTypes.string,
+    picture: PropTypes.string,
+    preferredName: PropTypes.string
+  }),
   dispatch: PropTypes.func.isRequired,
-  authToken: PropTypes.string,
-  user: PropTypes.object
 };
 
 export default loginWithToken(LandingContainer);