send task back from today tab to backlog tab (#18)

bukinoshita · Jan 5, 2018 · 72c4e78 · 72c4e78
1 parent 5a8ea0e
commit 72c4e78
Show file tree

Hide file tree

Showing 2 changed files with 45 additions and 7 deletions.
diff --git a/renderer/components/task.js b/renderer/components/task.js
@@ -8,6 +8,7 @@ import renderHTML from 'react-render-html'
 const Task = ({ task, onMove, onDelete, isDone }) => {
   const { id, title, description, project, type } = task
   const isToday = type === 'today' ? 'done' : 'today'
+  const nextType = type === 'today' ? 'today' : 'backlog'
   const desc =
     description.length >= 30 ? `${description.substr(0, 30)}...` : description
   const hasProject = project ? (
@@ -21,10 +22,34 @@ const Task = ({ task, onMove, onDelete, isDone }) => {
       `}</style>
     </span>
   ) : null
+  const backBacklog =
+    type === 'today' ? (
+      <li onClick={() => onMove('back', task)}>
+        backlog
+        <style jsx>{`
+          li {
+            color: white;
+            display: inline-block;
+            font-size: 11px;
+            font-weight: 600;
+            margin-right: 10px;
+            color: #868e96;
+            cursor: pointer;
+          }
+
+          li:hover {
+            color: white;
+          }
+        `}</style>
+      </li>
+    ) : null
   const hasFooter = isDone ? null : (
     <div>
       <ul>
-        <li onClick={() => onMove(task)}>{isToday}</li>
+        <li onClick={() => onMove(nextType, task)}>{isToday}</li>
+
+        {backBacklog}
+
         <li>
           <Link href={`/task?id=${id}`}>
             <span>view</span>

diff --git a/renderer/pages/start.js b/renderer/pages/start.js
@@ -52,9 +52,9 @@ class Home extends Component {
   }
 
   onMove(type, task) {
-    if (type === 'backlog') {
-      const { user } = getUser()
+    const { user } = getUser()
 
+    if (type === 'backlog') {
       const taskUpdated = user.tasks.map(t => {
         if (t.id === task.id) {
           t.type = 'today'
@@ -70,8 +70,6 @@ class Home extends Component {
     }
 
     if (type === 'today') {
-      const { user } = getUser()
-
       const taskUpdated = user.tasks.map(t => {
         if (t.id === task.id) {
           t.type = 'done'
@@ -85,6 +83,21 @@ class Home extends Component {
       updateUser(user)
       return this.setState({ user })
     }
+
+    if (type === 'back') {
+      const taskUpdated = user.tasks.map(t => {
+        if (t.id === task.id) {
+          t.type = 'backlog'
+          return t
+        }
+
+        return t
+      })
+
+      user.tasks = taskUpdated
+      updateUser(user)
+      return this.setState({ user })
+    }
   }
 
   render() {
@@ -101,7 +114,7 @@ class Home extends Component {
           <Today
             tasks={todayTasks}
             onDelete={this.onDelete}
-            onMove={task => this.onMove('today', task)}
+            onMove={(type, task) => this.onMove(type, task)}
           />
         )
         break
@@ -114,7 +127,7 @@ class Home extends Component {
           <Backlog
             tasks={backlogTasks}
             onDelete={this.onDelete}
-            onMove={task => this.onMove('backlog', task)}
+            onMove={(type, task) => this.onMove(type, task)}
           />
         )
         break