1 files changed, 14 insertions, 3 deletions
diff --git a/client/components/Folder/Folder.jsx b/client/components/Folder/Folder.jsx
index e39b40d..20d3014 100644
--- a/client/components/Folder/Folder.jsx
+++ b/client/components/Folder/Folder.jsx
@@ -14,6 +14,9 @@ export default class Folder extends Component {
       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 }) )
+    }
   }
   addFiles(newFiles) {
     console.log(newFiles)
@@ -27,14 +30,22 @@ export default class Folder extends Component {
       if (! file) return
       return (
         <div key={i}>
-          {file.name}
+          <span class='name'>{file.name}</span>
         </div>
       )
     })
     return (
       <div class='folders'>
-        <b>{this.props.folder.name}</b> <FileUploadButton folder={this.props.folder} addFiles={this.addFiles} />
-        {files}
+        <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}>x</button>
+          </div>
+        </div>
+        <div class='list'>
+          {files}
+        </div>
       </div>
     )
   }