From 209cfd09c16122e94acb1e28972a97a46c92a5c7 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Thu, 7 Jun 2018 15:27:30 +0200 Subject: folder list on new samplernn page --- app/client/modules/pix2pix/views/pix2pix.new.js | 40 +++++++++++++--- app/client/modules/pix2wav/index.js | 2 +- app/client/modules/samplernn/index.js | 12 ++--- .../modules/samplernn/views/samplernn.new.js | 56 +++++++++++++++++++--- 4 files changed, 91 insertions(+), 19 deletions(-) (limited to 'app/client/modules') diff --git a/app/client/modules/pix2pix/views/pix2pix.new.js b/app/client/modules/pix2pix/views/pix2pix.new.js index 203a606..f9f5db7 100644 --- a/app/client/modules/pix2pix/views/pix2pix.new.js +++ b/app/client/modules/pix2pix/views/pix2pix.new.js @@ -1,13 +1,41 @@ import { h, Component } from 'preact' +import { bindActionCreators } from 'redux' +import { connect } from 'react-redux' import NewDatasetForm from '../../../dataset/dataset.new' +import * as pix2pixActions from '../pix2pix.actions' import pix2pixModule from '../pix2pix.module' -export default function Pix2PixNew ({ history }) { - return ( -
- -
- ) +class Pix2PixNew extends Component { + constructor(props){ + super(props) + props.actions.load_directories() + } + render(){ + const { pix2pix, history } = this.props + console.log(pix2pix) + let folders + if (pix2pix.data) { + pix2pix.data.folders.forEach(folder => { + console.log(folder) + }) + } + return ( +
+ + {folders} +
+ ) + } } + +const mapStateToProps = state => ({ + pix2pix: state.module.pix2pix, +}) + +const mapDispatchToProps = (dispatch, ownProps) => ({ + actions: bindActionCreators(pix2pixActions, dispatch), +}) + +export default connect(mapStateToProps, mapDispatchToProps)(Pix2PixNew) diff --git a/app/client/modules/pix2wav/index.js b/app/client/modules/pix2wav/index.js index b73a5df..3a23395 100644 --- a/app/client/modules/pix2wav/index.js +++ b/app/client/modules/pix2wav/index.js @@ -4,7 +4,7 @@ import util from '../../util' import Pix2WavNew from './views/pix2wav.new' import Pix2WavShow from './views/pix2wav.show' -// import Pix2WavLive from './views/pix2wav.live' +import Pix2WavLive from './views/pix2wav.live' function router () { document.body.style.backgroundImage = 'linear-gradient(' + (util.randint(40)+40) + 'deg, #fde, #ffe)' diff --git a/app/client/modules/samplernn/index.js b/app/client/modules/samplernn/index.js index 485a9a4..98195df 100644 --- a/app/client/modules/samplernn/index.js +++ b/app/client/modules/samplernn/index.js @@ -12,12 +12,12 @@ function router () { document.body.style.backgroundImage = 'linear-gradient(' + (util.randint(40)+40) + 'deg, #eef, #fef)' return (
- - - - - - + + + + + +
) } diff --git a/app/client/modules/samplernn/views/samplernn.new.js b/app/client/modules/samplernn/views/samplernn.new.js index 5640afc..821c1d8 100644 --- a/app/client/modules/samplernn/views/samplernn.new.js +++ b/app/client/modules/samplernn/views/samplernn.new.js @@ -1,16 +1,60 @@ import { h, Component } from 'preact' import { bindActionCreators } from 'redux' import { connect } from 'react-redux' +import { Link } from 'react-router-dom' import util from '../../../util' +import { + Group, Param +} from '../../../common' + import NewDatasetForm from '../../../dataset/dataset.new' +import * as samplernnActions from '../samplernn.actions' import samplernnModule from '../samplernn.module' -export default function SampleRNNNew ({ history }) { - return ( -
- -
- ) +class SampleRNNNew extends Component { + constructor(props){ + super(props) + props.actions.load_directories() + } + render(){ + const { samplernn, history } = this.props + console.log(samplernn) + let folders + if (samplernn.data) { + folders = samplernn.data.folders.map(folder => { + console.log(folder) + const datasetCount = folder.datasets ? folder.datasets.length : 0 + const [ className, size ] = util.hush_null(datasetCount) + return ( + {folder.name}}> + {datasetCount} dataset{util.courtesy_s(datasetCount)} + + ) + }) + } + return ( +
+
+ + {folders &&
+ + {folders} + +
} +
+
+ ) + } } + +const mapStateToProps = state => ({ + samplernn: state.module.samplernn, +}) + +const mapDispatchToProps = (dispatch, ownProps) => ({ + actions: bindActionCreators(samplernnActions, dispatch), +}) + +export default connect(mapStateToProps, mapDispatchToProps)(SampleRNNNew) -- cgit v1.2.3-70-g09d2