rename editProject to selectProject

This commit is contained in:
data 2019-06-22 07:31:29 -04:00 committed by notnull
parent a098f79c27
commit c704066e32
3 changed files with 9 additions and 13 deletions

View File

@ -30,13 +30,13 @@ class App extends React.Component {
this.deleteTask = this.deleteTask.bind(this) this.deleteTask = this.deleteTask.bind(this)
this.completeTask = this.completeTask.bind(this) this.completeTask = this.completeTask.bind(this)
this.createProject = this.createProject.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) this.deleteProject = this.deleteProject.bind(this)
} }
async fetchTasks() { async fetchTasks() {
try { try {
const { data } = await axios.get('/api/tasks') const { data } = await axios.get(api + '/api/tasks')
return data return data
} catch (error) { } catch (error) {
console.log(error) console.log(error)
@ -46,7 +46,7 @@ class App extends React.Component {
async fetchProjects() { async fetchProjects() {
try { try {
const { data } = await axios.get('/api/projects') const { data } = await axios.get(api + '/api/projects')
return data return data
} catch (error) { } catch (error) {
console.log(error) console.log(error)
@ -114,15 +114,11 @@ class App extends React.Component {
}) })
} }
// TODO: 'editProject' sounds like the functionality refers to editing, not selectProject(selectedProjectId) {
// just setting it on the state, so this should maybe be renamed to
// selectProject
editProject(selectedProjectId) {
this.setState({ selectedProjectId }) this.setState({ selectedProjectId })
this.navigate('project') this.navigate('project')
} }
async deleteProject(id) { async deleteProject(id) {
//e.preventDefault()
//this.setState({ projects: this.state.projects.filter(p => p.id !== id) }) //this.setState({ projects: this.state.projects.filter(p => p.id !== id) })
await axios.post(`/api/projects/${id}/delete`) await axios.post(`/api/projects/${id}/delete`)
// TODO: some delete success function // TODO: some delete success function
@ -143,7 +139,7 @@ class App extends React.Component {
navigate={this.navigate} navigate={this.navigate}
handleChange={this.handleChange} handleChange={this.handleChange}
createProject={this.createProject} createProject={this.createProject}
editProject={this.editProject} selectProject={this.selectProject}
deleteProject={this.deleteProject} deleteProject={this.deleteProject}
{...this.state} {...this.state}
/> />
@ -154,7 +150,7 @@ class App extends React.Component {
<Project <Project
handleChange={this.handleChange} handleChange={this.handleChange}
createProject={this.createProject} createProject={this.createProject}
editProject={this.editProject} selectProject={this.selectProject}
deleteProject={this.deleteProject} deleteProject={this.deleteProject}
addTask={this.addTask} addTask={this.addTask}
completeTask={this.completeTask} completeTask={this.completeTask}
@ -176,7 +172,7 @@ class App extends React.Component {
deleteTask={this.deleteTask} deleteTask={this.deleteTask}
filtered={filtered} filtered={filtered}
completed={completed} completed={completed}
editProject={this.editProject} selectProject={this.selectProject}
{...this.state} {...this.state}
/> />
) )

View File

@ -15,7 +15,7 @@ function Projects(props) {
X X
</button> </button>
{props.selectedProjectId ? null : ( {props.selectedProjectId ? null : (
<span onClick={() => props.editProject(project.id)}> <span onClick={() => props.selectProject(project.id)}>
{project.name}{' '} {project.name}{' '}
</span> </span>
)} )}

View File

@ -17,7 +17,7 @@ const TaskRow = props => {
{!props.selectedProjectId ? ( {!props.selectedProjectId ? (
<button <button
className="btn btn-outline-dark ml-5" className="btn btn-outline-dark ml-5"
onClick={() => props.editProject(task.projectId)} onClick={() => props.selectProject(task.projectId)}
> >
{projectName} {projectName}
</button> </button>