diff options
Diffstat (limited to 'client/reducers')
| -rw-r--r-- | client/reducers/currentTask.js | 11 | ||||
| -rw-r--r-- | client/reducers/folders.js | 2 | ||||
| -rw-r--r-- | client/reducers/tasks.js | 13 |
3 files changed, 18 insertions, 8 deletions
diff --git a/client/reducers/currentTask.js b/client/reducers/currentTask.js index e760fba..126c35d 100644 --- a/client/reducers/currentTask.js +++ b/client/reducers/currentTask.js @@ -23,18 +23,15 @@ const currentTask = (state = {}, action) => { content_file_id: state.content.id, style_file_id: state.style.id, alpha: state.alpha || '0.001', - command: 'nsatf.py', + tool: 'nsatf', completed: false, } client.task.create( record ).then( (data) => { - addTask( data ) + data.content_file = state.content + data.style_file = state.file + // store.dispatch( addTask( data ) ) }) - return state -// case 'ADD_TASK': -// return { -// ...state -// } default: return state } diff --git a/client/reducers/folders.js b/client/reducers/folders.js index d6bdd46..a69df74 100644 --- a/client/reducers/folders.js +++ b/client/reducers/folders.js @@ -90,6 +90,7 @@ const folders = (state = {}, action) => { ...state, folders } + case 'UPDATE_FILE': file = action.file folders = state.folders.map( (folder) => { @@ -106,6 +107,7 @@ const folders = (state = {}, action) => { ...state, folders: folders } + default: return state } diff --git a/client/reducers/tasks.js b/client/reducers/tasks.js index d6ef8e1..9edd82a 100644 --- a/client/reducers/tasks.js +++ b/client/reducers/tasks.js @@ -1,10 +1,21 @@ // import { addTask } from '../actions' import client from '../client' -const tasks = (state = {}, action) => { +const tasks = (state = [], action) => { switch (action.type) { case 'LOAD_TASKS': return action.tasks + case 'ADD_TASK': + console.log(action) + return state.concat([action.task]) + case 'TASK_UPDATED': + const updated_tasks = state.map(task => { + if (task.id == id) { + return task + } + return id + }) + return updated_tasks default: return state } |
