-
Notifications
You must be signed in to change notification settings - Fork 14
HT1 #2
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
mtsymlov
wants to merge
2
commits into
romabelka:master
Choose a base branch
from
mtsymlov:HT1
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
HT1 #2
Changes from all commits
Commits
Show all changes
2 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
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,13 @@ | ||
| import React, {Component} from 'react'; | ||
|
|
||
| class Loader extends Component { | ||
| render() { | ||
| return ( | ||
| <div> | ||
| <h2>Loading...</h2> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default Loader; |
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,30 @@ | ||
| import React, { Component } from 'react'; | ||
| import {reduxForm, Field} from 'redux-form' | ||
|
|
||
| class AddPeopleForm extends Component { | ||
| render() { | ||
| return ( | ||
| <div> | ||
| <h3>Add people</h3> | ||
| <form> | ||
| <div> | ||
| FirstName: <Field name='firstname' component='input'/> | ||
| </div> | ||
| <div> | ||
| LastName: <Field name='lastname' component='input'/> | ||
| </div> | ||
| <div> | ||
| Email: <Field name='email' component='input'/> | ||
| </div> | ||
| <div> | ||
| <input type='submit' /> | ||
| </div> | ||
| </form> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default reduxForm({ | ||
| form: 'addPeopleForm' | ||
| })(AddPeopleForm); | ||
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,14 @@ | ||
| import React, { Component } from 'react'; | ||
| import AddPeopleForm from './AddPeopleForm'; | ||
|
|
||
| class People extends Component { | ||
| render() { | ||
| return ( | ||
| <div> | ||
| <AddPeopleForm /> | ||
| </div> | ||
| ); | ||
| } | ||
| } | ||
|
|
||
| export default People; |
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 |
|---|---|---|
|
|
@@ -4,6 +4,7 @@ import {connect} from 'react-redux' | |
| import {signIn, signUp} from '../../../ducks/auth' | ||
| import SignInForm from '../../auth/SignInForm' | ||
| import SignUpForm from '../../auth/SignUpForm' | ||
| import Loader from '../../common/Loader' | ||
|
|
||
| class Auth extends Component { | ||
| static propTypes = { | ||
|
|
@@ -14,13 +15,22 @@ class Auth extends Component { | |
| return ( | ||
| <div> | ||
| <h2>Auth page</h2> | ||
| <ul> | ||
| <li><NavLink to = '/auth/sign-in' activeStyle={{color: 'red'}}>Sign In</NavLink></li> | ||
| <li><NavLink to = '/auth/sign-up' activeStyle={{color: 'red'}}>Sign Up</NavLink></li> | ||
| </ul> | ||
| {this.renderBody()} | ||
| </div> | ||
| ) | ||
| } | ||
|
|
||
| renderBody = () => { | ||
|
Owner
There was a problem hiding this comment. Choose a reason for hiding this commentThe reason will be displayed to describe this comment to others. Learn more. Еще обработку ошибок добавить надо было |
||
| const {auth} = this.props | ||
| if (this.props.auth.loading) return <Loader />; | ||
|
|
||
| return ( | ||
| <ul> | ||
| <li><NavLink to = '/auth/sign-in' activeStyle={{color: 'red'}}>Sign In</NavLink></li> | ||
| <li><NavLink to = '/auth/sign-up' activeStyle={{color: 'red'}}>Sign Up</NavLink></li> | ||
| <Route path='/auth/sign-in' render={() => <SignInForm onSubmit={this.onSignIn}/>} /> | ||
| <Route path='/auth/sign-up' render={() => <SignUpForm onSubmit={this.onSignUp}/>} /> | ||
| </div> | ||
| </ul> | ||
| ) | ||
| } | ||
|
|
||
|
|
@@ -29,4 +39,8 @@ class Auth extends Component { | |
|
|
||
| } | ||
|
|
||
| export default connect(null, { signIn, signUp })(Auth) | ||
| export default connect( | ||
| state => ({ | ||
| auth: state.auth | ||
| }), | ||
| { signIn, signUp })(Auth) | ||
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,14 +1,14 @@ | ||
| import firebase from 'firebase' | ||
|
|
||
| export const appName = 'advreact-04-12' | ||
| export const appName = 'advreact0412' | ||
|
|
||
| const config = { | ||
| apiKey: "AIzaSyCmDWlgYIhtEr1pWjgKYds3iXKWBl9wbjE", | ||
| apiKey: "AIzaSyCFY57-ViC6JCloWtC_2w5cIUIGcPiwhG0", | ||
| authDomain: `${appName}.firebaseapp.com`, | ||
| databaseURL: `https://${appName}.firebaseio.com`, | ||
| projectId: appName, | ||
| projectId: "advreact0412", | ||
| storageBucket: "", | ||
| messagingSenderId: "95255462276" | ||
| messagingSenderId: "513427030560" | ||
| } | ||
|
|
||
| firebase.initializeApp(config) |
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.
не обрабатываешь submit?