refactor all the worker stuff

1 files changed, 59 insertions, 38 deletions

diff --git a/public/bundle.js b/public/bundle.js
index 46ae5ce..eca7d7a 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -1574,9 +1574,16 @@ var createTask = exports.createTask = function createTask() {
     type: 'CREATE_TASK'
   };
 };
-var addTask = exports.addTask = function addTask() {
+var addTask = exports.addTask = function addTask(task) {
   return {
-    type: 'ADD_TASK'
+    type: 'ADD_TASK',
+    task: task
+  };
+};
+var taskUpdated = exports.taskUpdated = function taskUpdated(task) {
+  return {
+    type: 'TASK_UPDATED',
+    task: task
   };
 };
 
@@ -3855,12 +3862,6 @@ var _index = __webpack_require__(111);
 
 var _index2 = _interopRequireDefault(_index);
 
-var _index3 = __webpack_require__(7);
-
-var _client = __webpack_require__(5);
-
-var _client2 = _interopRequireDefault(_client);
-
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var store = (0, _redux.createStore)(_index2.default, {
@@ -3879,24 +3880,6 @@ var store = (0, _redux.createStore)(_index2.default, {
   }
 });
 
-_client2.default.folder.index().then(function (folders) {
-  store.dispatch((0, _index3.loadFolders)(folders));
-  try {
-    var openFolders = JSON.parse(localStorage['openFolders']);
-    store.dispatch((0, _index3.loadOpenFolders)(openFolders));
-    openFolders.forEach(function (folder_id) {
-      _client2.default.file.index({ folder_id: folder_id }).then(function (files) {
-        store.dispatch((0, _index3.loadFiles)(files));
-      });
-    });
-  } catch (e) {
-    console.log('error opening folders');
-  }
-});
-_client2.default.task.index().then(function (tasks) {
-  store.dispatch((0, _index3.loadTasks)(tasks));
-});
-
 exports.default = store;
 
 /***/ }),
@@ -3918,12 +3901,36 @@ var _store = __webpack_require__(38);
 
 var _store2 = _interopRequireDefault(_store);
 
+var _client = __webpack_require__(5);
+
+var _client2 = _interopRequireDefault(_client);
+
 var _socket = __webpack_require__(116);
 
 var _socket2 = _interopRequireDefault(_socket);
 
+var _index = __webpack_require__(7);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
+_client2.default.folder.index().then(function (folders) {
+  _store2.default.dispatch((0, _index.loadFolders)(folders));
+  try {
+    var openFolders = JSON.parse(localStorage['openFolders']);
+    _store2.default.dispatch((0, _index.loadOpenFolders)(openFolders));
+    openFolders.forEach(function (folder_id) {
+      _client2.default.file.index({ folder_id: folder_id }).then(function (files) {
+        _store2.default.dispatch((0, _index.loadFiles)(files));
+      });
+    });
+  } catch (e) {
+    console.log('error opening folders');
+  }
+});
+_client2.default.task.index().then(function (tasks) {
+  _store2.default.dispatch((0, _index.loadTasks)(tasks));
+});
+
 var app = (0, _preact.h)(
   _reactRedux.Provider,
   { store: _store2.default },
@@ -5889,8 +5896,8 @@ var Header = function (_Component) {
         'div',
         { 'class': 'header' },
         (0, _preact.h)(
-          'b',
-          null,
+          'div',
+          { 'class': 'title' },
           'spawn cortex'
         ),
         (0, _preact.h)(_audioPlayer2.default, null)
@@ -5957,14 +5964,14 @@ function AudioPlayerView(props) {
     audio.play();
     return (0, _preact.h)(
       'div',
-      null,
+      { 'class': 'audioPlayer' },
       'Playing ',
       props.file.name
     );
   } else {
     return (0, _preact.h)(
       'div',
-      null,
+      { 'class': 'audioPlayer' },
       'Not Playing'
     );
   }
@@ -9344,18 +9351,15 @@ var currentTask = function currentTask() {
         content_file_id: state.content.id,
         style_file_id: state.style.id,
         alpha: state.alpha || '0.001',
-        command: 'nsatf.py',
+        tool: 'nsatf',
         completed: false
       };
       _client2.default.task.create(record).then(function (data) {
-        (0, _actions.addTask)(data);
+        data.content_file = state.content;
+        data.style_file = state.file;
+        // store.dispatch( addTask( data ) )
       });
-
       return state;
-    //     case 'ADD_TASK':
-    //       return {
-    //         ...state
-    //       }
     default:
       return state;
   }
@@ -9381,12 +9385,23 @@ var _client2 = _interopRequireDefault(_client);
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var tasks = function tasks() {
-  var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : {};
+  var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : [];
   var action = arguments[1];
 
   switch (action.type) {
     case 'LOAD_TASKS':
       return action.tasks;
+    case 'ADD_TASK':
+      console.log(action);
+      return state.concat([action.task]);
+    case 'TASK_UPDATED':
+      var updated_tasks = state.map(function (task) {
+        if (task.id == id) {
+          return task;
+        }
+        return id;
+      });
+      return updated_tasks;
     default:
       return state;
   }
@@ -9503,6 +9518,7 @@ var folders = function folders() {
       return _extends({}, state, {
         folders: folders
       });
+
     case 'UPDATE_FILE':
       file = action.file;
       folders = state.folders.map(function (folder) {
@@ -9519,6 +9535,7 @@ var folders = function folders() {
       return _extends({}, state, {
         folders: folders
       });
+
     default:
       return state;
   }
@@ -9557,6 +9574,10 @@ socket.on('processed', function (data) {
   console.log('processed', data);
   _store2.default.dispatch((0, _actions.updateFile)(data.file));
 });
+socket.on('completed', function (data) {
+  console.log('completed', data);
+  _store2.default.dispatch(updateTask(data.task));
+});
 
 exports.default = socket;