Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
12 changes: 10 additions & 2 deletions client/components/App.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ class App extends React.Component {
constructor(props) {
super(props);
this.state = {
activeUser: { id: null, name: '', courses: [], interests: [], picture: '', createdAt: '' },
activeUser: { id: null, name: '', courses: [], interests: '', picture: '', createdAt: '', github: '' },
courses: [],
redirect: false,
edit: false
Expand All @@ -37,6 +37,14 @@ class App extends React.Component {
});
}

editProfileItem(field, val) {
let user = this.state.activeUser;
user[field] = val;
this.setState({
activeUser: user
});
}

fetchAllCourses() {
$.ajax({
url: `./api/courses`,
Expand Down Expand Up @@ -111,7 +119,7 @@ class App extends React.Component {
return (
<div className="container col-xs-12">
<div className="col-sm-3 col-xs-12">
<Profile user={this.state.activeUser} isCurrentUser={this.state.edit} signedIn={this.props.signedIn}/>
<Profile editProfileItem={this.editProfileItem.bind(this)} user={this.state.activeUser} isCurrentUser={this.state.edit} signedIn={this.props.signedIn}/>
</div>
<div id="social" className="col-sm-6 col-xs-12">
<Courses edit={this.state.edit} user={this.state.activeUser} allCourses={this.state.courses} addCourse={this.addCourse.bind(this)}/>
Expand Down
2 changes: 1 addition & 1 deletion client/components/edit/Edit.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ class Edit extends React.Component {
change: change
},
success: (result) => {
console.log('successful PUT request');
this.props.editProfileItem(this.props.field, change);
},
error: (err) => {
console.error(err);
Expand Down
6 changes: 3 additions & 3 deletions client/components/profile/Profile.jsx
Original file line number Diff line number Diff line change
Expand Up @@ -41,16 +41,16 @@ class Profile extends React.Component {
let editInterests = '';
if(this.props.isCurrentUser) {
editPic = <div className="col-xs-3 col-xs-offset-1">
<Edit field="picture">
<Edit editProfileItem={this.props.editProfileItem} field="picture">
Add a picture here
</Edit>
</div>;

editGithub = <Edit field="github">
editGithub = <Edit editProfileItem={this.props.editProfileItem} field="github">
Add your GitHub username
</Edit>

editInterests = <Edit field="interests">
editInterests = <Edit editProfileItem={this.props.editProfileItem} field="interests">
What are your interests?
</Edit>
}
Expand Down