Merge pull request #1440 from processing/oauth-login-page
Fixes #1402 - Add Social Auth buttons to LoginView
This commit is contained in:
		
						commit
						7a97c9163e
					
				
					 1 changed files with 6 additions and 0 deletions
				
			
		|  | @ -8,6 +8,7 @@ import { reduxForm } from 'redux-form'; | ||||||
| import * as UserActions from '../actions'; | import * as UserActions from '../actions'; | ||||||
| import SignupForm from '../components/SignupForm'; | import SignupForm from '../components/SignupForm'; | ||||||
| import { validateSignup } from '../../../utils/reduxFormUtils'; | import { validateSignup } from '../../../utils/reduxFormUtils'; | ||||||
|  | import SocialAuthButton from '../components/SocialAuthButton'; | ||||||
| import Nav from '../../../components/Nav'; | import Nav from '../../../components/Nav'; | ||||||
| 
 | 
 | ||||||
| const __process = (typeof global !== 'undefined' ? global : window).process; | const __process = (typeof global !== 'undefined' ? global : window).process; | ||||||
|  | @ -33,6 +34,11 @@ class SignupView extends React.Component { | ||||||
|           <div className="form-container__content"> |           <div className="form-container__content"> | ||||||
|             <h2 className="form-container__title">Sign Up</h2> |             <h2 className="form-container__title">Sign Up</h2> | ||||||
|             <SignupForm {...this.props} /> |             <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"> |             <p className="form__navigation-options"> | ||||||
|               Already have an account?  |               Already have an account?  | ||||||
|               <Link className="form__login-button" to="/login">Log In</Link> |               <Link className="form__login-button" to="/login">Log In</Link> | ||||||
|  |  | ||||||
		Loading…
	
		Reference in a new issue
	
	 Cassie Tarakajian
						Cassie Tarakajian