From 3d3a7b80d34c100846c8ae130b424b63ba3c0784 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Fri, 7 Jul 2017 19:18:48 +0200 Subject: socket io communication --- client/components/App.jsx | 12 ++++++++++++ client/components/Browser/Folder/Files.jsx | 8 ++------ client/components/UI/AudioPlayer.jsx | 1 + 3 files changed, 15 insertions(+), 6 deletions(-) (limited to 'client') 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 (
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 (
{file.name} - {file.mime} - {file.duration.toFixed(1) + 's'} + {file.processed ? file.mime : 'working...'} + {file.duration ? (file.duration.toFixed(1) + 's') : ''} content style 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 ( -- cgit v1.2.3-70-g09d2