consolidate

3 files changed, 8 insertions, 34 deletions

diff --git a/app/client/modules/pix2wav/index.js b/app/client/modules/pix2wav/index.js
index 9071d04..a77448c 100644
--- a/app/client/modules/pix2wav/index.js
+++ b/app/client/modules/pix2wav/index.js
@@ -20,7 +20,8 @@ function router () {
 function links(){
   return (
     <span>
-      <span>datasets</span>
+      <span><Link to="/pix2wav/datasets/">datasets</Link></span>
+      <span><Link to="/pix2wav/live/">live</Link></span>
     </span>
   )
 }
diff --git a/app/client/modules/pix2wav/pix2wav.reducer.js b/app/client/modules/pix2wav/pix2wav.reducer.js
index 6d6548a..0b55b07 100644
--- a/app/client/modules/pix2wav/pix2wav.reducer.js
+++ b/app/client/modules/pix2wav/pix2wav.reducer.js
@@ -1,39 +1,20 @@
 import types from '../../types'
+import datasetReducer from '../../dataset/dataset.reducer'
 
 const pix2wavInitialState = {
   loading: true,
+  progress: { i: 0, n: 0 },
   error: null,
-  folders: [],
   folder_id: 0,
   data: null,
-  lossReport: null,
 }
 
 const pix2wavReducer = (state = pix2wavInitialState, action) => {
-  // console.log(action.type)
-  switch(action.type) {
-    case types.pix2wav.init:
-      return {
-        ...state,
-        loading: false,
-        data: action.data,
-      }
-
-    case types.socket.connect:
-      return {
-        ...state,
-      }
-
-    case types.task.task_begin:
-      return {
-        ...state,
-      }
-
-    case types.task.task_finish:
-      return {
-        ...state,
-      }
+  if (action.data && action.data.module === 'pix2wav') {
+    state = datasetReducer(state, action)
+  }
 
+  switch (action.type) {
     default:
       return state
   }
diff --git a/app/client/modules/pix2wav/views/pix2wav.show.js b/app/client/modules/pix2wav/views/pix2wav.show.js
index 46a2436..acb99b1 100644
--- a/app/client/modules/pix2wav/views/pix2wav.show.js
+++ b/app/client/modules/pix2wav/views/pix2wav.show.js
@@ -46,14 +46,6 @@ class Pix2wavShow extends Component {
             <UploadStatus />
           </div>
         </div>
-        {folder && folder.name && folder.name !== 'unsorted' &&
-          <DatasetForm
-            title='Add Files'
-            module={pix2wavModule}
-            folder={folder}
-            canUpload canAddURL
-          />
-        }
         <DatasetComponent
           loading={pix2wav.loading}
           progress={pix2wav.progress}