-
Notifications
You must be signed in to change notification settings - Fork 20
H2 #13
New issue
Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.
By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.
Already on GitHub? Sign in to your account
Open
kaflan
wants to merge
7
commits into
romabelka:master
Choose a base branch
from
kaflan:h2
base: master
Could not load branches
Branch not found: {{ refName }}
Loading
Could not load tags
Nothing to show
Loading
Are you sure you want to change the base?
Some commits from the old base branch may be removed from the timeline,
and old review comments may become outdated.
Open
H2 #13
Changes from 6 commits
Commits
Show all changes
7 commits
Select commit
Hold shift + click to select a range
File filter
Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
There are no files selected for viewing
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,59 @@ | ||
| import React, { Component } from 'react' | ||
| import { reduxForm, Field } from 'redux-form' | ||
| import ErrorField from '../common/ErrorField' | ||
| import emailValidator from 'email-validator' | ||
| import { moduleName, addUser} from '../../ducks/people' | ||
| import { connect } from 'react-redux' | ||
|
|
||
| class PeopleForm extends Component { | ||
| render() { | ||
| const { handleSubmit, submitting, reset } = this.props; | ||
| return ( | ||
| <div> | ||
| <h2> | ||
| Add person | ||
| </h2> | ||
| <form onSubmit={handleSubmit(this.props.addUser)}> | ||
| <Field name="first_name" component={ErrorField} /> | ||
| <Field name="last_name" component={ErrorField} /> | ||
| <Field name="email" component={ErrorField} /> | ||
| <div> | ||
| <input type="submit" disabled={submitting} onClick={reset} /> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| const validate = ({first_name, last_name, email}) => { | ||
| const errors = {} | ||
|
|
||
| if (!email) errors.email = 'email is required' | ||
| else if (!emailValidator.validate(email)) errors.email = 'invalid email' | ||
|
|
||
| if (!first_name) errors.first_name = 'first_name is required' | ||
|
|
||
| if(!last_name) errors.last_name = 'last_name is required' | ||
|
|
||
| return errors | ||
| } | ||
|
|
||
| const mapStateToProps = (state) => ({ | ||
| loading: state[moduleName.loading] | ||
| }); | ||
|
|
||
| const mapDispatchToProps = (dispatch) => ({ | ||
|
|
||
| addUser: ({first_name, last_name, email}) => dispatch(addUser({first_name, last_name, email})) | ||
| }); | ||
|
|
||
| PeopleForm = connect( | ||
| mapStateToProps, | ||
| mapDispatchToProps | ||
| )(PeopleForm); | ||
|
|
||
| export default reduxForm({ | ||
| form: 'people', | ||
| validate, | ||
| })(PeopleForm); | ||
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -1,13 +1,13 @@ | ||
| import firebase from 'firebase' | ||
|
|
||
| export const appName = "advreact-21-08" | ||
| export const appName = "adv-21-08" | ||
| export const firebaseConfig = { | ||
| apiKey: "AIzaSyDjA6CeIHuni5lNm4ML1b-TSxJltsYUO8g", | ||
| apiKey: "AIzaSyAFf2xnTf-RQAxK0W_QWKbsf8nEW0vJ66Y", | ||
| authDomain: `${appName}.firebaseapp.com`, | ||
| databaseURL: `https://${appName}.firebaseio.com`, | ||
| projectId: appName, | ||
| storageBucket: `${appName}.appspot.com`, | ||
| messagingSenderId: "789814589283" | ||
| messagingSenderId: "497019564518" | ||
| } | ||
|
|
||
| firebase.initializeApp(firebaseConfig) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
| Original file line number | Diff line number | Diff line change |
|---|---|---|
| @@ -0,0 +1,48 @@ | ||
| import { | ||
| SIGN_IN_REQUEST, | ||
| SIGN_UP_REQUEST, | ||
| SIGN_IN_SUCCESS, | ||
| SIGN_UP_SUCCESS, | ||
| SIGN_IN_ERROR, | ||
| SIGN_UP_ERROR, | ||
| signIn, | ||
| signUp, | ||
| signUpSaga, | ||
| signInSaga, | ||
| signOut | ||
| } from './auth' | ||
| import firebase from 'firebase' | ||
| import {call, put, take} from 'redux-saga/effects' | ||
| const AUTH = firebase.auth() | ||
| const person = { | ||
| email: 'kaf_90@mail.ru', | ||
| password: '11111111' | ||
| } | ||
|
|
||
| it('auth by sign up', () => { | ||
|
|
||
| const saga = signUpSaga() | ||
| expect(saga.next().value).toEqual(take(SIGN_UP_REQUEST)) | ||
| expect(saga.next({type: SIGN_UP_REQUEST, payload: person}).value).toEqual(call([AUTH, AUTH.createUserWithEmailAndPassword], person.email, person.password)); | ||
| expect(saga.next(person).value).toEqual(put({ | ||
| type:SIGN_UP_SUCCESS, | ||
| payload:{user:person} | ||
| })) | ||
| // expect(saga.throw()).toEqual({ | ||
| // type: SIGN_UP_ERROR | ||
| // }) | ||
| }) | ||
|
|
||
|
|
||
| it('auth by sign in', () => { | ||
| const saga = signInSaga() | ||
| expect(saga.next().value).toEqual(take(SIGN_IN_REQUEST)) | ||
| expect(saga.next({type: SIGN_IN_REQUEST, payload: person}).value).toEqual(call([AUTH, AUTH.signInWithEmailAndPassword], person.email, person.password)); | ||
| expect(saga.next(person).value).toEqual(put({ | ||
| type:SIGN_IN_SUCCESS, | ||
| payload:{user:person} | ||
| })) | ||
| // expect(saga.throw()).toEqual({ | ||
| // type: SIGN_UP_ERROR | ||
| // }) | ||
| }) |
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains hidden or bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Возможно у тебя у тебя какие-то особые соображения, поделись. Но вся суть в том, что ты можешь ресетить как часть декларативной логики, при успешном сабмите, а не по клику
There was a problem hiding this comment.
Choose a reason for hiding this comment
The reason will be displayed to describe this comment to others. Learn more.
Ясно