1 files changed, 30 insertions, 38 deletions

diff --git a/public/bundle.js b/public/bundle.js
index ff4bf5f..58dd026 100644
--- a/public/bundle.js
+++ b/public/bundle.js
@@ -2990,14 +2990,6 @@ var _actions = __webpack_require__(/*! ../actions */ "./app/client/actions.js");
 
 var _actions2 = _interopRequireDefault(_actions);
 
-var _dataset = __webpack_require__(/*! ./dataset.form */ "./app/client/dataset/dataset.form.js");
-
-var _dataset2 = _interopRequireDefault(_dataset);
-
-var _dataset3 = __webpack_require__(/*! ./dataset.new */ "./app/client/dataset/dataset.new.js");
-
-var _dataset4 = _interopRequireDefault(_dataset3);
-
 var _fileList = __webpack_require__(/*! ../common/fileList.component */ "./app/client/common/fileList.component.js");
 
 var _loading = __webpack_require__(/*! ../common/loading.component */ "./app/client/common/loading.component.js");
@@ -3576,8 +3568,7 @@ function NewDatasetForm(props) {
 }
 
 var mapStateToProps = function mapStateToProps(state) {
-  console.log(state);
-  return state.dataset;
+  return state;
 };
 
 var mapDispatchToProps = function mapDispatchToProps(dispatch, ownProps) {
@@ -5036,6 +5027,11 @@ function links() {
     (0, _preact.h)(
       'span',
       null,
+      'Process'
+    ),
+    (0, _preact.h)(
+      'span',
+      null,
       (0, _preact.h)(
         _reactRouterDom.Link,
         { to: '/pix2pix/live/' },
@@ -6009,7 +6005,20 @@ function links() {
     (0, _preact.h)(
       'span',
       null,
-      'datasets'
+      (0, _preact.h)(
+        _reactRouterDom.Link,
+        { to: '/pix2wav/datasets/' },
+        'datasets'
+      )
+    ),
+    (0, _preact.h)(
+      'span',
+      null,
+      (0, _preact.h)(
+        _reactRouterDom.Link,
+        { to: '/pix2wav/live/' },
+        'live'
+      )
     )
   );
 }
@@ -6151,44 +6160,33 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 
-var _extends = Object.assign || function (target) { for (var i = 1; i < arguments.length; i++) { var source = arguments[i]; for (var key in source) { if (Object.prototype.hasOwnProperty.call(source, key)) { target[key] = source[key]; } } } return target; };
-
 var _types = __webpack_require__(/*! ../../types */ "./app/client/types.js");
 
 var _types2 = _interopRequireDefault(_types);
 
+var _dataset = __webpack_require__(/*! ../../dataset/dataset.reducer */ "./app/client/dataset/dataset.reducer.js");
+
+var _dataset2 = _interopRequireDefault(_dataset);
+
 function _interopRequireDefault(obj) { return obj && obj.__esModule ? obj : { default: obj }; }
 
 var pix2wavInitialState = {
   loading: true,
+  progress: { i: 0, n: 0 },
   error: null,
-  folders: [],
   folder_id: 0,
-  data: null,
-  lossReport: null
+  data: null
 };
 
 var pix2wavReducer = function pix2wavReducer() {
   var state = arguments.length > 0 && arguments[0] !== undefined ? arguments[0] : pix2wavInitialState;
   var action = arguments[1];
 
-  // console.log(action.type)
-  switch (action.type) {
-    case _types2.default.pix2wav.init:
-      return _extends({}, state, {
-        loading: false,
-        data: action.data
-      });
-
-    case _types2.default.socket.connect:
-      return _extends({}, state);
-
-    case _types2.default.task.task_begin:
-      return _extends({}, state);
-
-    case _types2.default.task.task_finish:
-      return _extends({}, state);
+  if (action.data && action.data.module === 'pix2wav') {
+    state = (0, _dataset2.default)(state, action);
+  }
 
+  switch (action.type) {
     default:
       return state;
   }
@@ -6397,12 +6395,6 @@ var Pix2wavShow = function (_Component) {
             (0, _preact.h)(_upload2.default, null)
           )
         ),
-        folder && folder.name && folder.name !== 'unsorted' && (0, _preact.h)(_dataset2.default, {
-          title: 'Add Files',
-          module: _pix2wav4.default,
-          folder: folder,
-          canUpload: true, canAddURL: true
-        }),
         (0, _preact.h)(_dataset6.default, {
           loading: pix2wav.loading,
           progress: pix2wav.progress,