From 2f2c1ef4029dee17be0d16acdd60b7d1718d519f Mon Sep 17 00:00:00 2001
From: Jules Laplace <julescarbon@gmail.com>
Date: Wed, 19 Jul 2017 02:06:56 +0200
Subject: refactor file browser stuff

---
 client/components/Browser/Files/FileListView.jsx   | 68 ++++++++++++++++++
 .../components/Browser/Files/FileUploadButton.jsx  |  1 -
 client/components/Browser/Files/Files.jsx          | 81 ----------------------
 3 files changed, 68 insertions(+), 82 deletions(-)
 create mode 100644 client/components/Browser/Files/FileListView.jsx
 delete mode 100644 client/components/Browser/Files/Files.jsx

(limited to 'client/components/Browser/Files')

diff --git a/client/components/Browser/Files/FileListView.jsx b/client/components/Browser/Files/FileListView.jsx
new file mode 100644
index 0000000..1c5f952
--- /dev/null
+++ b/client/components/Browser/Files/FileListView.jsx
@@ -0,0 +1,68 @@
+import { h, Component } from 'preact'
+
+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 function FileListView (props) {
+  console.log(props)
+
+  let file_list;
+  if (props.folder && props.folder.files) {
+    file_list = props.folder.files
+  }
+  else {
+    file_list = []
+  }
+  const files = file_list.map(toFilenamePair)
+                         .sort(sortByFilename)
+                         .map(fromPair)
+                         .map( (file, i) => {
+    if (! file) return
+    return (
+      <div key={i} class={props.selected === file ? 'selected' : ''}>
+        <span class='name'><FileLink file={file}>{file.name}</FileLink></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>
+        </span>
+      </div>
+    )
+  })
+  return (
+    <div class='window'>
+      <div class='heading'>
+        <b>{props.folder.name}</b>
+        <div class='buttons'>
+          <FileUploadButton folder={props.folder} addFiles={props.addFiles} />
+          <button onClick={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/Files/FileUploadButton.jsx b/client/components/Browser/Files/FileUploadButton.jsx
index 2d25d3e..8a1bdda 100644
--- a/client/components/Browser/Files/FileUploadButton.jsx
+++ b/client/components/Browser/Files/FileUploadButton.jsx
@@ -15,7 +15,6 @@ export default class FileUploadButton extends Component {
       this.props.addFiles(got_files)
     })
   }
-
   render() {
     return (
       <div class='fileUploadButton'>
diff --git a/client/components/Browser/Files/Files.jsx b/client/components/Browser/Files/Files.jsx
deleted file mode 100644
index c4df74d..0000000
--- a/client/components/Browser/Files/Files.jsx
+++ /dev/null
@@ -1,81 +0,0 @@
-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 = {
-      selected: null,
-    }
-    this.addFiles = this.addFiles.bind(this)
-  }
-  addFiles(newFiles) {
-    if (! newFiles) return
-    this.props.addFiles( newFiles )
-  }
-  handleClick(file) {
-    this.setState({ selected: file })
-  }
-  render() {
-    let file_list;
-    if (this.props.folder && this.props.folder.files) {
-      file_list = this.props.folder.files
-    }
-    else {
-      file_list = []
-    }
-    const files = file_list.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.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>
-          </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
-- 
cgit v1.2.3-70-g09d2