task.completed === true)
const filtered = this.state.tasks.filter(
task =>
task.completed !== true &&
- this.state.search === task.desc.slice(0, this.state.search.length),
+ this.state.search === task.desc.slice(0, this.state.search.length)
)
const renderComponent = () =>
@@ -183,7 +194,11 @@ class App extends React.Component {
return (
-
+
{renderComponent()}
)
diff --git a/src/components/project.js b/src/components/project.js
index e1e6471..8e5eda7 100644
--- a/src/components/project.js
+++ b/src/components/project.js
@@ -2,13 +2,19 @@ import React from 'react'
import Tasks from './tasks'
function Project(props) {
- console.log(props.projects)
- const filtered = props.tasks.filter(t => t.project === props.project && !t.completed)
- const completed = props.tasks.filter(t => t.project === props.project && t.completed === true)
+ const projectName =
+ props.projects.find(p => p.id === props.selectedProjectId).name || 'Default'
+ const filtered = props.tasks.filter(
+ t => t.projectId === props.selectedProjectId && !t.completed
+ )
+ const completed = props.tasks.filter(
+ t =>
+ (t.projectId === props.selectedProjectId && t.completed === true) || null
+ )
return (
-
{props.projects[props.project].name}
+ {projectName}
)
diff --git a/src/components/projects.js b/src/components/projects.js
index 6e01336..2e4378d 100644
--- a/src/components/projects.js
+++ b/src/components/projects.js
@@ -1,6 +1,7 @@
import React from 'react'
function Projects(props) {
+ console.log('PROJECTS PROPS', props)
return (
Projects
@@ -13,7 +14,11 @@ function Projects(props) {
>
X
- props.editProject(project.id)}>{project.name}
+ {props.selectedProjectId ? null : (
+ props.editProject(project.id)}>
+ {project.name}{' '}
+
+ )}
))}