Merge pull request #1440 from processing/oauth-login-page

Fixes #1402 - Add Social Auth buttons to LoginView

Author: catarak

Diff for: client/modules/User/pages/SignupView.jsx

@@ -8,6 +8,7 @@ import { reduxForm } from 'redux-form';
 import * as UserActions from '../actions';
 import SignupForm from '../components/SignupForm';
 import { validateSignup } from '../../../utils/reduxFormUtils';
+import SocialAuthButton from '../components/SocialAuthButton';
 import Nav from '../../../components/Nav';
 
 const __process = (typeof global !== 'undefined' ? global : window).process;
@@ -33,6 +34,11 @@ class SignupView extends React.Component {
           <div className="form-container__content">
             <h2 className="form-container__title">Sign Up</h2>
             <SignupForm {...this.props} />
+            <h2 className="form-container__divider">Or</h2>
+            <div className="form-container__stack">
+              <SocialAuthButton service={SocialAuthButton.services.github} />
+              <SocialAuthButton service={SocialAuthButton.services.google} />
+            </div>
             <p className="form__navigation-options">
               Already have an account?&nbsp;
               <Link className="form__login-button" to="/login">Log In</Link>