1 files changed, 127 insertions, 26 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 4337723..ab48687 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -1740,7 +1740,7 @@ exports.default = {
     for (var i = 0; i < files.length; i++) {
       data.append('file', files[i]);
     }
-    return fetch('/folders/' + folder_id, postBody(files)).then(function (req) {
+    return fetch('/folders/' + folder_id, postBody(data)).then(function (req) {
       return req.json();
     }).catch(error);
   }
@@ -2749,9 +2749,10 @@ var App = function (_Component) {
 
     var _this = _possibleConstructorReturn(this, (App.__proto__ || Object.getPrototypeOf(App)).call(this));
 
+    var openFolders = JSON.parse(localStorage['openFolders'] || 'null');
     _this.state = {
       folders: null,
-      openFolders: []
+      openFolders: openFolders || []
     };
     _client2.default.folder.index().then(function (folders) {
       return _this.setState({ folders: folders });
@@ -2767,6 +2768,11 @@ var App = function (_Component) {
       }
     }
   }, {
+    key: 'addFolder',
+    value: function addFolder(folder) {
+      this.setState({ folders: this.state.folders.concat([folder]) });
+    }
+  }, {
     key: 'render',
     value: function render() {
       var _this2 = this;
@@ -2780,6 +2786,8 @@ var App = function (_Component) {
         (0, _preact.h)(_Header2.default, null),
         (0, _preact.h)(_Folders2.default, { folders: this.state.folders, openFolder: function openFolder(folder) {
             return _this2.openFolder(folder);
+          }, addFolder: function addFolder(folder) {
+            return _this2.addFolder(folder);
           } }),
         openFolders
       );
@@ -5861,6 +5869,8 @@ var Folders = function (_Component) {
       folder.open = !folder.open;
       if (folder.open && !folder.files) {
         _client2.default.file.index({ 'folder_id': folder.id }).then(function (files) {
+          console.log(files);
+          folder.files = files;
           _this2.props.openFolder(folder);
         });
       }
@@ -5902,7 +5912,7 @@ var Folders = function (_Component) {
           { visible: this.state.adding, onClose: function onClose() {
               return _this3.closeModal();
             } },
-          (0, _preact.h)(_FolderForm2.default, null)
+          (0, _preact.h)(_FolderForm2.default, { addFolder: this.props.addFolder })
         )
       );
     }
@@ -5973,11 +5983,13 @@ var FolderForm = function (_Component) {
   }, {
     key: 'handleSubmit',
     value: function handleSubmit(event) {
+      var _this2 = this;
+
       event.preventDefault();
       var rec = Object.assign({}, this.state);
       delete rec.error;
       _client2.default.folder.create(rec).then(function (data) {
-        console.log(data);
+        _this2.props.addFolder(data);
       });
     }
   }, {
@@ -6051,6 +6063,10 @@ var _client = __webpack_require__(9);
 
 var _client2 = _interopRequireDefault(_client);
 
+var _FileUploadButton = __webpack_require__(58);
+
+var _FileUploadButton2 = _interopRequireDefault(_FileUploadButton);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
@@ -6068,36 +6084,32 @@ var Folder = function (_Component) {
     var _this = _possibleConstructorReturn(this, (Folder.__proto__ || Object.getPrototypeOf(Folder)).call(this));
 
     _this.state = {
-      adding: false
+      files: props.folder.files || []
     };
+    _this.addFiles = _this.addFiles.bind(_this);
     return _this;
   }
 
   _createClass(Folder, [{
-    key: 'toggle',
-    value: function toggle(folder) {
-      var _this2 = this;
-
-      folder.open = !folder.open;
-      if (folder.open && !folder.files) {
-        _client2.default.files.index({ 'folder_id': folder.id }).then(function (files) {
-          _this2.props.openFolder(folder);
-        });
-      }
+    key: 'addFiles',
+    value: function addFiles(newFiles) {
+      console.log(newFiles);
+      if (!newFiles) return;
+      var files = this.state.files.concat(newFiles).sort(function (a, b) {
+        return b.id - a.id;
+      });
+      this.setState({ files: files });
     }
   }, {
     key: 'render',
     value: function render() {
-      var _this3 = this;
-
       console.log(this.props);
-      var folders = (this.props.folders || []).map(function (folder, i) {
+      var files = this.state.files.map(function (file, i) {
+        if (!file) return;
         return (0, _preact.h)(
           'div',
-          { key: i, onClick: function onClick() {
-              return _this3.toggle(folder);
-            } },
-          folder.name
+          { key: i },
+          file.name
         );
       });
       return (0, _preact.h)(
@@ -6109,12 +6121,101 @@ var Folder = function (_Component) {
           this.props.folder.name
         ),
         ' ',
+        (0, _preact.h)(_FileUploadButton2.default, { folder: this.props.folder, addFiles: this.addFiles }),
+        files
+      );
+    }
+  }]);
+
+  return Folder;
+}(_preact.Component);
+
+exports.default = Folder;
+
+/***/ }),
+/* 58 */
+/***/ (function(module, exports, __webpack_require__) {
+
+"use strict";
+
+
+Object.defineProperty(exports, "__esModule", {
+  value: true
+});
+
+var _createClass = function () { function defineProperties(target, props) { for (var i = 0; i < props.length; i++) { var descriptor = props[i]; descriptor.enumerable = descriptor.enumerable || false; descriptor.configurable = true; if ("value" in descriptor) descriptor.writable = true; Object.defineProperty(target, descriptor.key, descriptor); } } return function (Constructor, protoProps, staticProps) { if (protoProps) defineProperties(Constructor.prototype, protoProps); if (staticProps) defineProperties(Constructor, staticProps); return Constructor; }; }();
+
+var _preact = __webpack_require__(3);
+
+var _reactRouterDom = __webpack_require__(6);
+
+var _Modal = __webpack_require__(21);
+
+var _Modal2 = _interopRequireDefault(_Modal);
+
+var _client = __webpack_require__(9);
+
+var _client2 = _interopRequireDefault(_client);
+
+var _FileUploadButton = __webpack_require__(58);
+
+var _FileUploadButton2 = _interopRequireDefault(_FileUploadButton);
+
+function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
+
+function _classCallCheck(instance, Constructor) { if (!(instance instanceof Constructor)) { throw new TypeError("Cannot call a class as a function"); } }
+
+function _possibleConstructorReturn(self, call) { if (!self) { throw new ReferenceError("this hasn't been initialised - super() hasn't been called"); } return call && (typeof call === "object" || typeof call === "function") ? call : self; }
+
+function _inherits(subClass, superClass) { if (typeof superClass !== "function" && superClass !== null) { throw new TypeError("Super expression must either be null or a function, not " + typeof superClass); } subClass.prototype = Object.create(superClass && superClass.prototype, { constructor: { value: subClass, enumerable: false, writable: true, configurable: true } }); if (superClass) Object.setPrototypeOf ? Object.setPrototypeOf(subClass, superClass) : subClass.__proto__ = superClass; }
+
+var Folder = function (_Component) {
+  _inherits(Folder, _Component);
+
+  function Folder(props) {
+    _classCallCheck(this, Folder);
+
+    var _this = _possibleConstructorReturn(this, (Folder.__proto__ || Object.getPrototypeOf(Folder)).call(this));
+
+    _this.state = {};
+    _this.updateFiles = _this.updateFiles.bind(_this);
+    return _this;
+  }
+
+  _createClass(Folder, [{
+    key: 'updateFiles',
+    value: function updateFiles(event) {
+      var _this2 = this;
+
+      var name = event.target.name;
+      var files = event.target.files;
+      console.log(name, files);
+
+      _client2.default.upload(this.props.folder.id, files).then(function (got_files) {
+        console.log(got_files);
+        _this2.props.addFiles(got_files);
+      });
+    }
+  }, {
+    key: 'render',
+    value: function render() {
+      console.log(this.props);
+      var files = (this.props.folder.files || []).map(function (file, i) {
+        return (0, _preact.h)(
+          'div',
+          { key: i },
+          file.name
+        );
+      });
+      return (0, _preact.h)(
+        'div',
+        { 'class': 'fileUploadButton' },
+        (0, _preact.h)('input', { type: 'file', multiple: true, name: 'files', onChange: this.updateFiles }),
         (0, _preact.h)(
-          'button',
-          { onClick: function onClick() {} },
+          'span',
+          null,
           '+ file'
-        ),
-        folders
+        )
       );
     }
   }]);