diff --git a/src/App.js b/src/App.js index 3d2e230..ba0139e 100644 --- a/src/App.js +++ b/src/App.js @@ -30,13 +30,13 @@ class App extends React.Component { this.deleteTask = this.deleteTask.bind(this) this.completeTask = this.completeTask.bind(this) this.createProject = this.createProject.bind(this) - this.editProject = this.editProject.bind(this) + this.selectProject = this.selectProject.bind(this) this.deleteProject = this.deleteProject.bind(this) } async fetchTasks() { try { - const { data } = await axios.get('/api/tasks') + const { data } = await axios.get(api + '/api/tasks') return data } catch (error) { console.log(error) @@ -46,7 +46,7 @@ class App extends React.Component { async fetchProjects() { try { - const { data } = await axios.get('/api/projects') + const { data } = await axios.get(api + '/api/projects') return data } catch (error) { console.log(error) @@ -114,15 +114,11 @@ class App extends React.Component { }) } - // TODO: 'editProject' sounds like the functionality refers to editing, not - // just setting it on the state, so this should maybe be renamed to - // selectProject - editProject(selectedProjectId) { + selectProject(selectedProjectId) { this.setState({ selectedProjectId }) this.navigate('project') } async deleteProject(id) { - //e.preventDefault() //this.setState({ projects: this.state.projects.filter(p => p.id !== id) }) await axios.post(`/api/projects/${id}/delete`) // TODO: some delete success function @@ -143,7 +139,7 @@ class App extends React.Component { navigate={this.navigate} handleChange={this.handleChange} createProject={this.createProject} - editProject={this.editProject} + selectProject={this.selectProject} deleteProject={this.deleteProject} {...this.state} /> @@ -154,7 +150,7 @@ class App extends React.Component { ) diff --git a/src/components/projects.js b/src/components/projects.js index 2e4378d..6eb72f6 100644 --- a/src/components/projects.js +++ b/src/components/projects.js @@ -15,7 +15,7 @@ function Projects(props) { X {props.selectedProjectId ? null : ( - props.editProject(project.id)}> + props.selectProject(project.id)}> {project.name}{' '} )} diff --git a/src/components/task-row.js b/src/components/task-row.js index 0d0d86d..5fb9fc0 100644 --- a/src/components/task-row.js +++ b/src/components/task-row.js @@ -17,7 +17,7 @@ const TaskRow = props => { {!props.selectedProjectId ? (