summaryrefslogtreecommitdiff
path: root/client/components
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2017-07-07 19:18:48 +0200
committerJules Laplace <julescarbon@gmail.com>2017-07-07 19:18:48 +0200
commit3d3a7b80d34c100846c8ae130b424b63ba3c0784 (patch)
tree83ba690e72c353b16a3b78c95c2b77ff4c5eee39 /client/components
parentb89147ecd38b0f95a2e4917aba7f44bf3bb70327 (diff)
socket io communication
Diffstat (limited to 'client/components')
-rw-r--r--client/components/App.jsx12
-rw-r--r--client/components/Browser/Folder/Files.jsx8
-rw-r--r--client/components/UI/AudioPlayer.jsx1
3 files changed, 15 insertions, 6 deletions
diff --git a/client/components/App.jsx b/client/components/App.jsx
index 0af326f..b3da081 100644
--- a/client/components/App.jsx
+++ b/client/components/App.jsx
@@ -8,6 +8,18 @@ import Tasks from './Tasks/Tasks.jsx'
import client from '../client'
+var socket = io(window.location.origin)
+
+socket.on('connect', (data) => {
+ console.log('connected')
+})
+socket.on('worker', (data) => {
+ console.log('worker connected', data)
+})
+socket.on('processed', (data) => {
+ console.log('processed', data)
+})
+
const App = () => {
return (
<div>
diff --git a/client/components/Browser/Folder/Files.jsx b/client/components/Browser/Folder/Files.jsx
index 7d439c5..f0ad95e 100644
--- a/client/components/Browser/Folder/Files.jsx
+++ b/client/components/Browser/Folder/Files.jsx
@@ -27,10 +27,6 @@ export default class Files extends Component {
this.setState({ files })
}
handleClick(file) {
- if (file.type === 'audio') {
- audioPlayFile(file)
- document.body.style.backgroundImage = 'url(' + pngpath(file) + ')'
- }
this.setState({ selected: file })
}
render() {
@@ -39,8 +35,8 @@ export default class Files extends Component {
return (
<div key={i} class={this.state.selected === file ? 'selected' : ''}>
<span class='name'><FileLink file={file}>{file.name}</FileLink></span>
- <span class='mime'>{file.mime}</span>
- <span class='duration'>{file.duration.toFixed(1) + 's'}</span>
+ <span class='mime'>{file.processed ? file.mime : 'working...'}</span>
+ <span class='duration'>{file.duration ? (file.duration.toFixed(1) + 's') : ''}</span>
<span class='actions'>
<TaskContentLink file={file}>content</TaskContentLink>
<TaskStyleLink file={file}>style</TaskStyleLink>
diff --git a/client/components/UI/AudioPlayer.jsx b/client/components/UI/AudioPlayer.jsx
index de6502c..1a68518 100644
--- a/client/components/UI/AudioPlayer.jsx
+++ b/client/components/UI/AudioPlayer.jsx
@@ -4,6 +4,7 @@ const audio = document.createElement('audio')
export default function AudioPlayer (props) {
if (props.file) {
+ document.body.style.backgroundImage = 'url(' + pngpath(file) + ')'
audio.src = mp3path(props.file)
audio.play()
return (