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/BrowserView.jsx          | 17 ++---
 client/components/Browser/Files/FileListView.jsx   | 68 ++++++++++++++++++
 .../components/Browser/Files/FileUploadButton.jsx  |  1 -
 client/components/Browser/Files/Files.jsx          | 81 ----------------------
 client/components/Browser/Folders/FolderForm.jsx   | 47 -------------
 .../components/Browser/Folders/FolderListView.jsx  | 24 +++++++
 client/components/Browser/Folders/Folders.jsx      | 56 ---------------
 .../components/Browser/Folders/NewFolderView.jsx   | 24 +++++++
 8 files changed, 122 insertions(+), 196 deletions(-)
 create mode 100644 client/components/Browser/Files/FileListView.jsx
 delete mode 100644 client/components/Browser/Files/Files.jsx
 delete mode 100644 client/components/Browser/Folders/FolderForm.jsx
 create mode 100644 client/components/Browser/Folders/FolderListView.jsx
 delete mode 100644 client/components/Browser/Folders/Folders.jsx
 create mode 100644 client/components/Browser/Folders/NewFolderView.jsx

(limited to 'client/components/Browser')

diff --git a/client/components/Browser/BrowserView.jsx b/client/components/Browser/BrowserView.jsx
index 604d952..e510fc7 100644
--- a/client/components/Browser/BrowserView.jsx
+++ b/client/components/Browser/BrowserView.jsx
@@ -1,7 +1,8 @@
 import { h, Component } from 'preact'
 
-import Folders from './Folders/Folders.jsx'
-import Files from './Files/Files.jsx'
+import NewFolder from '../../containers/newFolder.js'
+import FolderList from '../../containers/folderList.js'
+import FileList from '../../containers/fileList.js'
 
 export default function BrowserView (props) {
   const openFolders = (props.openFolders || []).map((folder_id) => {
@@ -9,20 +10,14 @@ export default function BrowserView (props) {
     if (! folder_list.length) return
     const folder = folder_list[0]
     return (
-      <Files
-        folder={folder}
-        addFiles={props.addFiles}
-        onClose={() => props.closeFolder(folder)}
-      />
+      <FileList folder={folder} />
     )
   })
   
   return (
     <div class='column'>
-      <Folders folders={props.folders}
-        openFolder={(folder) => props.openFolder(folder)}
-        addFolder={(folder) => props.addFolder(folder)}
-      />
+      <NewFolder />
+      <FolderList />
       {openFolders}
     </div>
   )
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
diff --git a/client/components/Browser/Folders/FolderForm.jsx b/client/components/Browser/Folders/FolderForm.jsx
deleted file mode 100644
index ad3e321..0000000
--- a/client/components/Browser/Folders/FolderForm.jsx
+++ /dev/null
@@ -1,47 +0,0 @@
-import { h, Component } from 'preact'
-
-import client from '../../../client.js'
-
-export default class FolderForm extends Component {
-  constructor(props) {
-    super()
-    this.state = {
-      name: '',
-    }
-    this.updateState = this.updateState.bind(this)
-    this.handleSubmit = this.handleSubmit.bind(this)
-  }
-  updateState(event){
-    const name = event.target.name
-    let value = event.target.value
-    console.log(name, value)
-    this.setState({
-      [name]: value,
-      error: null,
-    })
-  }
-  handleSubmit(event) {
-    event.preventDefault()
-    let rec = Object.assign({}, this.state)
-    delete rec.error
-    this.props.onClose()
-    client.folder.create( rec ).then( (data) => {
-      this.props.addFolder( data )
-    })
-  }
-  render() {
-    return (
-      <div class='form'>
-        <h1>new folder</h1>
-        <div>
-          <label for='folders_folder_name'>Name</label>
-          <input type='text' id='folders_folder_name' name='name' value={this.state.name} onChange={this.updateState} />
-        </div>
-        <div>
-          <label></label>
-          <button onClick={this.handleSubmit}>Create</button>
-        </div>
-      </div>
-    )
-  }
-}
diff --git a/client/components/Browser/Folders/FolderListView.jsx b/client/components/Browser/Folders/FolderListView.jsx
new file mode 100644
index 0000000..1ee76d8
--- /dev/null
+++ b/client/components/Browser/Folders/FolderListView.jsx
@@ -0,0 +1,24 @@
+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>
+    </div>
+  ))
+  
+  return (
+    <div class='window'>
+      <div class='heading'>
+        <b>browser</b>
+        <div class='buttons'>
+          <button onClick={props.initNewFolder}>+ folder</button>
+        </div>
+      </div>
+      <div class='list'>
+        {folders}
+      </div>
+    </div>
+  )
+}
diff --git a/client/components/Browser/Folders/Folders.jsx b/client/components/Browser/Folders/Folders.jsx
deleted file mode 100644
index 2c85e80..0000000
--- a/client/components/Browser/Folders/Folders.jsx
+++ /dev/null
@@ -1,56 +0,0 @@
-import { h, Component } from 'preact'
-
-import Modal from '../../UI/Modal.jsx'
-import FolderForm from './FolderForm.jsx'
-
-import client from '../../../client.js'
-
-export default class Folders extends Component {
-  constructor(props) {
-    super()
-    this.state = {
-      adding: false,
-    }
-  }
-  openModal() {
-    this.setState({ adding: true })
-  }
-  closeModal() {
-    this.setState({ adding: false })
-  }
-  toggle(folder) {
-    folder.open = ! folder.open
-    if (folder.open && ! folder.files) {
-      client.file.index({ 'folder_id': folder.id }).then( files => {
-        console.log(files)
-        folder.files = files
-        this.props.openFolder(folder)
-      })
-    }
-  }
-  render() {
-    const folders = (this.props.folders || []).map( (folder,i) => {
-      return (
-        <div key={i} onClick={() => this.toggle(folder)}>
-          <span class='name'>{folder.name}</span>
-        </div>
-      )
-    })
-    return (
-      <div class='window'>
-        <div class='heading'>
-          <b>browser</b>
-          <div class='buttons'>
-            <button onClick={() => this.openModal()}>+ folder</button>
-          </div>
-        </div>
-        <div class='list'>
-          {folders}
-        </div>
-        <Modal visible={this.state.adding} onClose={() => this.closeModal()}>
-          <FolderForm addFolder={this.props.addFolder} onClose={() => this.closeModal()} />
-        </Modal>
-      </div>
-    )
-  }
-}
diff --git a/client/components/Browser/Folders/NewFolderView.jsx b/client/components/Browser/Folders/NewFolderView.jsx
new file mode 100644
index 0000000..7573450
--- /dev/null
+++ b/client/components/Browser/Folders/NewFolderView.jsx
@@ -0,0 +1,24 @@
+import { h, Component } from 'preact'
+
+export default function NewFolderView (props) {
+  console.log(props)
+  if (! props.visible) {
+    return null
+  }
+  return (
+    <div class='window'>
+      <div class='heading'>
+        <b>new folder</b>
+        <div class='buttons'>
+          <button onClick={props.onClose}>x</button>
+        </div>
+      </div>
+      <input type='text'
+        autofocus
+        placeholder='Enter a name'
+        value={props.name}
+        onChange={props.onChange}
+      />
+    </div>
+  )
+}
-- 
cgit v1.2.3-70-g09d2