diff options
Diffstat (limited to 'client')
| -rw-r--r-- | client/actions/index.js | 4 | ||||
| -rw-r--r-- | client/components/Browser/Files/FileListView.jsx | 2 | ||||
| -rw-r--r-- | client/components/Browser/Folders/FolderListView.jsx | 1 | ||||
| -rw-r--r-- | client/components/Browser/Folders/NewFolderView.jsx | 1 | ||||
| -rw-r--r-- | client/components/Tasks/TaskFormView.jsx | 1 | ||||
| -rw-r--r-- | client/components/Tasks/TaskListView.jsx | 7 | ||||
| -rw-r--r-- | client/components/UI/Link.jsx | 4 | ||||
| -rw-r--r-- | client/containers/fileLink.js | 2 | ||||
| -rw-r--r-- | client/reducers/tasks.js | 3 |
9 files changed, 12 insertions, 13 deletions
diff --git a/client/actions/index.js b/client/actions/index.js index 72df1c4..6a552ac 100644 --- a/client/actions/index.js +++ b/client/actions/index.js @@ -30,8 +30,8 @@ export const addTask = (task) => ({ type: 'ADD_TASK', task, }) -export const taskUpdated = (task) => ({ - type: 'TASK_UPDATED', +export const updateTask = (task) => ({ + type: 'UPDATE_TASK', task, }) diff --git a/client/components/Browser/Files/FileListView.jsx b/client/components/Browser/Files/FileListView.jsx index 1c5f952..4615cf7 100644 --- a/client/components/Browser/Files/FileListView.jsx +++ b/client/components/Browser/Files/FileListView.jsx @@ -6,8 +6,6 @@ import TaskContentLink from '../../../containers/taskContentLink.js' import TaskStyleLink from '../../../containers/taskStyleLink.js' export default function FileListView (props) { - console.log(props) - let file_list; if (props.folder && props.folder.files) { file_list = props.folder.files diff --git a/client/components/Browser/Folders/FolderListView.jsx b/client/components/Browser/Folders/FolderListView.jsx index 1ee76d8..0a0d0e2 100644 --- a/client/components/Browser/Folders/FolderListView.jsx +++ b/client/components/Browser/Folders/FolderListView.jsx @@ -1,7 +1,6 @@ import { h, Component } from 'preact' export default function FolderListView (props) { - console.log(props) const folders = props.folders.map( (folder, i) => ( <div key={i} onClick={() => props.openFolder(folder)}> <span class='name'>{folder.name}</span> diff --git a/client/components/Browser/Folders/NewFolderView.jsx b/client/components/Browser/Folders/NewFolderView.jsx index 7573450..3badb82 100644 --- a/client/components/Browser/Folders/NewFolderView.jsx +++ b/client/components/Browser/Folders/NewFolderView.jsx @@ -1,7 +1,6 @@ import { h, Component } from 'preact' export default function NewFolderView (props) { - console.log(props) if (! props.visible) { return null } diff --git a/client/components/Tasks/TaskFormView.jsx b/client/components/Tasks/TaskFormView.jsx index e296a66..01265b8 100644 --- a/client/components/Tasks/TaskFormView.jsx +++ b/client/components/Tasks/TaskFormView.jsx @@ -4,7 +4,6 @@ import { Link } from 'react-router-dom' import client from '../../client.js' export default function TaskFormView (props) { - // console.log(props) return ( <div class='form'> <div> diff --git a/client/components/Tasks/TaskListView.jsx b/client/components/Tasks/TaskListView.jsx index dc1d9b4..47be794 100644 --- a/client/components/Tasks/TaskListView.jsx +++ b/client/components/Tasks/TaskListView.jsx @@ -8,9 +8,10 @@ export default function TaskListView (props) { <div key={i}> <span>{task.id}</span> <span>{task.created_at}</span> - <span class='name'><FileLink file={task.content_file}>{task.content_file.name}</FileLink></span> - <span class='name'><FileLink file={task.style_file}>{task.style_file.name}</FileLink></span> - <span>{task.alpha}</span> + <span class='name'><FileLink file={task.content_file} /></span> + <span class='name'><FileLink file={task.style_file} /></span> + <span>α={task.alpha}</span> + <span class='name'><FileLink file={task.output_file} /></span> </div> ) // <span class='name'>{task.result_file.name}</span> diff --git a/client/components/UI/Link.jsx b/client/components/UI/Link.jsx index f801979..d71582b 100644 --- a/client/components/UI/Link.jsx +++ b/client/components/UI/Link.jsx @@ -2,14 +2,16 @@ import { h, Component } from 'preact' import React from 'react' // import PropTypes from 'prop-types' -const Link = ({ active, children, onClick }) => { +const Link = ({ active, children, onClick, disabled }) => { if (active) { return <span>{children}</span> } + const className = disabled ? 'disabled' : '' return ( // eslint-disable-next-line <a href="#" + class={className} onClick={e => { e.preventDefault() onClick() diff --git a/client/containers/fileLink.js b/client/containers/fileLink.js index cb55c1c..92933cf 100644 --- a/client/containers/fileLink.js +++ b/client/containers/fileLink.js @@ -3,6 +3,8 @@ import { audioPlayFile } from '../actions' import Link from '../components/UI/Link.jsx' const mapStateToProps = (state, ownProps) => ({ + children: ownProps.children || ownProps.file ? ownProps.file.name : "(~)", + disabled: ownProps.disabled || ! ownProps.file }) const mapDispatchToProps = (dispatch, ownProps) => ({ diff --git a/client/reducers/tasks.js b/client/reducers/tasks.js index c5f2c06..9c2b0b4 100644 --- a/client/reducers/tasks.js +++ b/client/reducers/tasks.js @@ -1,4 +1,3 @@ -// import { addTask } from '../actions' import client from '../client' const tasks = (state = [], action) => { @@ -9,7 +8,7 @@ const tasks = (state = [], action) => { case 'ADD_TASK': return [action.task].concat(state) - case 'TASK_UPDATED': + case 'UPDATE_TASK': const updated_tasks = state.map(task => { if (task.id == id) { return task |
