From b89147ecd38b0f95a2e4917aba7f44bf3bb70327 Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Fri, 7 Jul 2017 18:43:24 +0200
Subject: refactor audioplayer

---
 client/components/Browser/Browser.jsx       |  4 +-
 client/components/Browser/Folder/Files.jsx  | 83 +++++++++++++++++++++++++++++
 client/components/Browser/Folder/Folder.jsx | 79 ---------------------------
 client/components/Tasks/TaskFormView.jsx    |  2 +-
 client/components/Tasks/Tasks.jsx           | 17 ++++--
 client/components/UI/AudioPlayer.jsx        | 35 ++++++++++++
 client/components/UI/Header.jsx             |  2 +
 7 files changed, 137 insertions(+), 85 deletions(-)
 create mode 100644 client/components/Browser/Folder/Files.jsx
 delete mode 100644 client/components/Browser/Folder/Folder.jsx
 create mode 100644 client/components/UI/AudioPlayer.jsx

(limited to 'client/components')

diff --git a/client/components/Browser/Browser.jsx b/client/components/Browser/Browser.jsx
index 10b86c3..a7731f1 100644
--- a/client/components/Browser/Browser.jsx
+++ b/client/components/Browser/Browser.jsx
@@ -1,7 +1,7 @@
 import { h, Component } from 'preact'
 
 import Folders from './Folders/Folders.jsx'
-import Folder from './Folder/Folder.jsx'
+import Files from './Folder/Files.jsx'
 
 import client from '../../client'
 
@@ -36,7 +36,7 @@ class Browser extends Component {
       if (! folder_list.length) return
       const folder = folder_list[0]
       return (
-        <Folder
+        <Files
           folder={folder}
           onClose={() => this.closeFolder(folder)}
         />
diff --git a/client/components/Browser/Folder/Files.jsx b/client/components/Browser/Folder/Files.jsx
new file mode 100644
index 0000000..7d439c5
--- /dev/null
+++ b/client/components/Browser/Folder/Files.jsx
@@ -0,0 +1,83 @@
+import { h, Component } from 'preact'
+
+import { audioPlayFile } from '../../../actions'
+
+import client from '../../../client.js'
+
+import FileUploadButton from './FileUploadButton.jsx'
+import FileLink from '../../../containers/fileLink.js'
+import TaskContentLink from '../../../containers/taskContentLink.js'
+import TaskStyleLink from '../../../containers/taskStyleLink.js'
+
+export default class Files extends Component {
+  constructor(props) {
+    super()
+    this.state = {
+      files: props.folder.files || [],
+      selected: null,
+    }
+    this.addFiles = this.addFiles.bind(this)
+    if (! props.folder.files) {
+      client.file.index({ folder_id: props.folder.id }).then( files => this.setState({ files }) )
+    }
+  }
+  addFiles(newFiles) {
+    if (! newFiles) return
+    const files = this.state.files.concat(newFiles).sort( (a,b) => { return b.id - a.id } )
+    this.setState({ files })
+  }
+  handleClick(file) {
+    if (file.type === 'audio') {
+      audioPlayFile(file)
+      document.body.style.backgroundImage = 'url(' + pngpath(file) + ')'
+    }
+    this.setState({ selected: file })
+  }
+  render() {
+    const files = (this.state.files).map(toFilenamePair).sort(sortByFilename).map(fromPair).map( (file, i) => {
+      if (! file) return
+      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='actions'>
+            <TaskContentLink file={file}>content</TaskContentLink>
+            <TaskStyleLink file={file}>style</TaskStyleLink>
+          </span>
+        </div>
+      )
+    })
+    return (
+      <div class='window'>
+        <div class='heading'>
+          <b>{this.props.folder.name}</b>
+          <div class='buttons'>
+            <FileUploadButton folder={this.props.folder} addFiles={this.addFiles} />
+            <button onClick={this.props.onClose}>&times;</button>
+          </div>
+        </div>
+        <div class='list'>
+          {files}
+        </div>
+      </div>
+    )
+  }
+}
+
+function toFilenamePair (file) { return [file.name.toLowerCase(), file] }
+function sortByFilename (a,b) { return a[0] < b[0] ? -1 : a[0] == b[0] ? 0 : 1 }
+function fromPair (pair) { return pair[1] }
+
+function filepath (file) {
+  return '/data/' + file.folder_id + '/' + encodeURIComponent(file.name)
+}
+function mp3path (file) {
+  if (file.mime !== 'audio/mp3') {
+    return filepath(file) + '.mp3'
+  }
+  return filepath(file)
+}
+function pngpath (file) {
+  return filepath(file) + '.png'
+}
\ No newline at end of file
diff --git a/client/components/Browser/Folder/Folder.jsx b/client/components/Browser/Folder/Folder.jsx
deleted file mode 100644
index a3588f1..0000000
--- a/client/components/Browser/Folder/Folder.jsx
+++ /dev/null
@@ -1,79 +0,0 @@
-import { h, Component } from 'preact'
-
-import client from '../../../client.js'
-
-import FileUploadButton from './FileUploadButton.jsx'
-import TaskContentLink from '../../../containers/taskContentLink.js'
-import TaskStyleLink from '../../../containers/taskStyleLink.js'
-
-export default class Folder extends Component {
-  constructor(props) {
-    super()
-    this.state = {
-      files: props.folder.files || [],
-    }
-    this.addFiles = this.addFiles.bind(this)
-    if (! props.folder.files) {
-      client.file.index({ folder_id: props.folder.id }).then( files => this.setState({ files }) )
-    }
-    this.audio = document.createElement('audio')
-  }
-  addFiles(newFiles) {
-    if (! newFiles) return
-    const files = this.state.files.concat(newFiles).sort( (a,b) => { return b.id - a.id } )
-    this.setState({ files })
-  }
-  handleClick(file) {
-    if (file.type === 'audio') {
-      this.audio.setAttribute('src', mp3path(file))
-      this.audio.play()
-      document.body.style.backgroundImage = 'url(' + pngpath(file) + ')'
-    }
-  }
-  render() {
-    const files = (this.state.files).map(toFilenamePair).sort(sortByFilename).map(fromPair).map( (file, i) => {
-      if (! file) return
-      return (
-        <div key={i}>
-          <span class='name' onClick={() => this.handleClick(file)}>{file.name}</span>
-          <span class='mime'>{file.mime}</span>
-          <span class='actions'>
-            <TaskContentLink file={file}> content </TaskContentLink>
-            <TaskStyleLink file={file}> style </TaskStyleLink>
-          </span>
-        </div>
-      )
-    })
-    return (
-      <div class='window'>
-        <div class='heading'>
-          <b>{this.props.folder.name}</b>
-          <div class='buttons'>
-            <FileUploadButton folder={this.props.folder} addFiles={this.addFiles} />
-            <button onClick={this.props.onClose}>&times;</button>
-          </div>
-        </div>
-        <div class='list'>
-          {files}
-        </div>
-      </div>
-    )
-  }
-}
-
-function toFilenamePair (file) { return [file.name.toLowerCase(), file] }
-function sortByFilename (a,b) { return a[0] < b[0] ? -1 : a[0] == b[0] ? 0 : 1 }
-function fromPair (pair) { return pair[1] }
-
-function filepath (file) {
-  return '/data/' + file.folder_id + '/' + encodeURIComponent(file.name)
-}
-function mp3path (file) {
-  if (file.mime !== 'audio/mp3') {
-    return filepath(file) + '.mp3'
-  }
-  return filepath(file)
-}
-function pngpath (file) {
-  return filepath(file) + '.png'
-}
\ No newline at end of file
diff --git a/client/components/Tasks/TaskFormView.jsx b/client/components/Tasks/TaskFormView.jsx
index 36660de..e296a66 100644
--- a/client/components/Tasks/TaskFormView.jsx
+++ b/client/components/Tasks/TaskFormView.jsx
@@ -4,7 +4,7 @@ import { Link } from 'react-router-dom'
 import client from '../../client.js'
 
 export default function TaskFormView (props) {
-  console.log(props)
+  // console.log(props)
   return (
     <div class='form'>
       <div>
diff --git a/client/components/Tasks/Tasks.jsx b/client/components/Tasks/Tasks.jsx
index a107acf..263e669 100644
--- a/client/components/Tasks/Tasks.jsx
+++ b/client/components/Tasks/Tasks.jsx
@@ -10,14 +10,20 @@ export default class Tasks extends Component {
     super()
     this.state = {
       adding: false,
+      tasks: [],
     }
     client.task.index().then( tasks => this.setState({ tasks }) )
   }
   render() {
-    const tasks = (this.props.tasks || []).map( (task, i) => {
+//           <span class='name'>{task.result_file.name}</span>
+    const tasks = (this.state.tasks || []).map( (task, i) => {
       return (
         <div key={i} onClick={() => this.toggle(task)}>
-          <span class='name'>{task.name}</span>
+          <span>{task.id}</span>
+          <span>{task.created_at}</span>
+          <span class='name'>{task.content_file.name}</span>
+          <span class='name'>{task.style_file.name}</span>
+          <span>{task.alpha}</span>
         </div>
       )
     })
@@ -25,9 +31,14 @@ export default class Tasks extends Component {
       <div class='column'>
         <div class='window'>
           <div class='heading'>
-            <b>tasks</b>
+            <b>create task</b>
           </div>
           <TaskForm />
+        </div>
+        <div class='window'>
+          <div class='heading'>
+            <b>recent tasks</b>
+          </div>
           <div class='list'>
             {tasks}
           </div>
diff --git a/client/components/UI/AudioPlayer.jsx b/client/components/UI/AudioPlayer.jsx
new file mode 100644
index 0000000..de6502c
--- /dev/null
+++ b/client/components/UI/AudioPlayer.jsx
@@ -0,0 +1,35 @@
+import { h, Component } from 'preact'
+
+const audio = document.createElement('audio')
+
+export default function AudioPlayer (props) {
+  if (props.file) {
+    audio.src = mp3path(props.file)
+    audio.play()
+    return (
+      <div>
+        Playing {props.file.name}
+      </div>
+    )
+  }
+  else {
+    return (
+      <div>
+        Not Playing
+      </div>
+    )
+  }
+}
+
+function filepath (file) {
+  return '/data/' + file.folder_id + '/' + encodeURIComponent(file.name)
+}
+function mp3path (file) {
+  if (file.mime !== 'audio/mp3') {
+    return filepath(file) + '.mp3'
+  }
+  return filepath(file)
+}
+function pngpath (file) {
+  return filepath(file) + '.png'
+}
diff --git a/client/components/UI/Header.jsx b/client/components/UI/Header.jsx
index 1727f7a..55dd25f 100644
--- a/client/components/UI/Header.jsx
+++ b/client/components/UI/Header.jsx
@@ -1,5 +1,6 @@
 import { h, Component } from 'preact'
 // import { Link } from 'react-router-dom'
+import AudioPlayerContainer from '../../containers/audioPlayerContainer.js'
 
 export default class Header extends Component {
   constructor(props) {
@@ -11,6 +12,7 @@ export default class Header extends Component {
     return (
       <div class='header'>
         <b>spawn cortex</b>
+        <AudioPlayerContainer />
       </div>
     )
   }
-- 
cgit v1.2.3-70-g09d2