ClaytonWWilson/CS307-Team24
1
0
Fork 0
mirror of https://github.com/ClaytonWWilson/CS307-Team24.git synced 2025-12-16 10:18:48 +00:00
Code Issues Actions Packages Projects Releases Wiki Activity

Revert "Modified code for posts in homes"

Browse Source 
This reverts commit 71b6965830.

   reversing commit
This commit is contained in:
Aditya Sankaran 2019-10-02 21:35:23 -04:00
parent 71b6965830
commit 5acc7a64e0
3 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
twistter-frontend/package.json
View File

@ -31,5 +31,5 @@
"last 1 safari version" "last 1 safari version"
] ]
}, },
"proxy": "https://us-central1-twistter-e4649.cloudfunctions.net/api" "proxy": "https://us-central1-socialape-2619.cloudfunctions.net/api"
} }

10
twistter-frontend/src/pages/Home.js
View File

@ -8,7 +8,7 @@ import Grid from '@material-ui/core/Grid';
class home extends Component { class home extends Component {
/*state = { state = {
screams: null screams: null
} }
componentDidMount() { componentDidMount() {
@ -20,15 +20,15 @@ class home extends Component {
}); });
}) })
.catch(err => console.log(err)); .catch(err => console.log(err));
}*/ }
render() { render() {
/*let recentScreamsMarkup = this.state.screams ? ( let recentScreamsMarkup = this.state.screams ? (
this.state.screams.map(scream => <p>{scream.body}</p>) this.state.screams.map(scream => <p>{scream.body}</p>)
) : (<p>Loading...</p>)*/ ) : (<p>Loading...</p>)
return ( return (
<Grid container spacing={16}> <Grid container spacing={16}>
<Grid item sm={8} xs={12}> <Grid item sm={8} xs={12}>
<p>Posts</p> {recentScreamsMarkup}
</Grid> </Grid>
<Grid item sm={4} xs={12}> <Grid item sm={4} xs={12}>
<p>Profile</p> <p>Profile</p>

10
twistter-frontend/src/pages/signup.js
View File

@ -41,7 +41,7 @@ class signup extends Component {
super(); super();
this.state = { this.state = {
email: '', email: '',
handle: '', username: '',
password: '', password: '',
confirmPassword: '', confirmPassword: '',
errors: {} errors: {}
@ -51,7 +51,7 @@ class signup extends Component {
event.preventDefault(); event.preventDefault();
const newUserData = { const newUserData = {
email: this.state.email, email: this.state.email,
handle: this.state.handle, username: this.state.username,
password: this.state.password, password: this.state.password,
confirmPassword: this.state.confirmPassword confirmPassword: this.state.confirmPassword
}; };
@ -87,9 +87,9 @@ class signup extends Component {
helperText={errors.email} error={errors.email ? true : false} helperText={errors.email} error={errors.email ? true : false}
value={this.state.email} onChange={this.handleChange} /> value={this.state.email} onChange={this.handleChange} />
<br /> <br />
<TextField id="handle" name="handle" type="text" label="handle" className={classes.textField} <TextField id="username" name="username" type="text" label="Username" className={classes.textField}
helperText={errors.handle} error={errors.handle ? true : false} helperText={errors.username} error={errors.username ? true : false}
value={this.state.handle} onChange={this.handleChange} /> value={this.state.username} onChange={this.handleChange} />
<br /> <br />
<TextField id="password" name="password" type="password" label="Password" className={classes.textField} <TextField id="password" name="password" type="password" label="Password" className={classes.textField}
helperText={errors.password} error={errors.password ? true : false} helperText={errors.password} error={errors.password ? true : false}