diff --git a/twistter-frontend/package.json b/twistter-frontend/package.json index c5ecb5e..a23dca4 100644 --- a/twistter-frontend/package.json +++ b/twistter-frontend/package.json @@ -31,5 +31,5 @@ "last 1 safari version" ] }, - "proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api" + "proxy": "https://us-central1-socialape-2619.cloudfunctions.net/api" } diff --git a/twistter-frontend/src/pages/Home.js b/twistter-frontend/src/pages/Home.js index d113238..93a760f 100644 --- a/twistter-frontend/src/pages/Home.js +++ b/twistter-frontend/src/pages/Home.js @@ -8,7 +8,7 @@ import Grid from '@material-ui/core/Grid'; class home extends Component { - /*state = { + state = { screams: null } componentDidMount() { @@ -20,15 +20,15 @@ class home extends Component { }); }) .catch(err => console.log(err)); - }*/ + } render() { - /*let recentScreamsMarkup = this.state.screams ? ( + let recentScreamsMarkup = this.state.screams ? ( this.state.screams.map(scream =>

{scream.body}

) - ) : (

Loading...

)*/ + ) : (

Loading...

) return ( -

Posts

+ {recentScreamsMarkup}

Profile

diff --git a/twistter-frontend/src/pages/signup.js b/twistter-frontend/src/pages/signup.js index 29bd185..706c8df 100644 --- a/twistter-frontend/src/pages/signup.js +++ b/twistter-frontend/src/pages/signup.js @@ -41,7 +41,7 @@ class signup extends Component { super(); this.state = { email: '', - handle: '', + username: '', password: '', confirmPassword: '', errors: {} @@ -51,7 +51,7 @@ class signup extends Component { event.preventDefault(); const newUserData = { email: this.state.email, - handle: this.state.handle, + username: this.state.username, password: this.state.password, confirmPassword: this.state.confirmPassword }; @@ -87,9 +87,9 @@ class signup extends Component { helperText={errors.email} error={errors.email ? true : false} value={this.state.email} onChange={this.handleChange} />
- +