From c867d086caba163978fd1d4a1cb72507ee19bc61 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 10 Mar 2021 18:38:08 +0100 Subject: prparing sidebar for wav upload componnt --- .../app/views/editor/align/align.container.js | 1 + .../frontend/app/views/editor/align/align.css | 37 ----------------- .../components/sidebar/waveUpload.component.js | 17 ++++++++ .../editor/align/containers/sidebar.container.js | 37 ++++++++++------- .../frontend/app/views/editor/align/sidebar.css | 46 ++++++++++++++++++++++ animism-align/frontend/app/views/nav/nav.css | 17 +++++--- 6 files changed, 98 insertions(+), 57 deletions(-) create mode 100644 animism-align/frontend/app/views/editor/align/components/sidebar/waveUpload.component.js create mode 100644 animism-align/frontend/app/views/editor/align/sidebar.css (limited to 'animism-align/frontend/app') diff --git a/animism-align/frontend/app/views/editor/align/align.container.js b/animism-align/frontend/app/views/editor/align/align.container.js index e145936..46954e8 100644 --- a/animism-align/frontend/app/views/editor/align/align.container.js +++ b/animism-align/frontend/app/views/editor/align/align.container.js @@ -2,6 +2,7 @@ import React, { Component } from 'react' import { connect } from 'react-redux' import './align.css' +import './sidebar.css' import Timeline from './containers/timeline.container.js' import Sidebar from './containers/sidebar.container.js' diff --git a/animism-align/frontend/app/views/editor/align/align.css b/animism-align/frontend/app/views/editor/align/align.css index d10b601..58adcf8 100644 --- a/animism-align/frontend/app/views/editor/align/align.css +++ b/animism-align/frontend/app/views/editor/align/align.css @@ -115,46 +115,9 @@ canvas { background-image: url('/static/img/icons_play_white.svg'); } -/* Script */ - -.sidebar { - position: absolute; - top: 0; - right: 0; - min-width: 4rem; - z-index: 8; -} -.sidebar textarea { - height: calc(100vh - 3.15rem); -} -.sidebar button { - position: absolute; - top: 0.25rem; - right: 0.25rem; - z-index: 9; - border: 0; - background: transparent; -} - /* Annotations */ .annotations { position: relative; width: 450px; } - -/* table of contents */ - -.toc { - background: #222; - width: 15rem; - padding: 0.5rem 0; -} -.toc div { - width: 15rem; - padding: 0.25rem 0.75rem; - cursor: pointer; -} -.toc div:hover { - background: #213; -} \ No newline at end of file diff --git a/animism-align/frontend/app/views/editor/align/components/sidebar/waveUpload.component.js b/animism-align/frontend/app/views/editor/align/components/sidebar/waveUpload.component.js new file mode 100644 index 0000000..5293ffd --- /dev/null +++ b/animism-align/frontend/app/views/editor/align/components/sidebar/waveUpload.component.js @@ -0,0 +1,17 @@ +import React, { Component } from 'react' +// import { Link } from 'react-router-dom' +import { connect } from 'react-redux' + +import actions from 'app/actions' + +const WaveUpload = ({ peaks }) => { + return ( +
+ ) +} + +const mapStateToProps = state => ({ + peaks: state.align.peaks, +}) + +export default connect(mapStateToProps)(WaveUpload) diff --git a/animism-align/frontend/app/views/editor/align/containers/sidebar.container.js b/animism-align/frontend/app/views/editor/align/containers/sidebar.container.js index a771f1a..10ebc03 100644 --- a/animism-align/frontend/app/views/editor/align/containers/sidebar.container.js +++ b/animism-align/frontend/app/views/editor/align/containers/sidebar.container.js @@ -1,4 +1,5 @@ import React, { Component } from 'react' +import { connect } from 'react-redux' // import { Link } from 'react-router-dom' import actions from 'app/actions' @@ -6,28 +7,34 @@ import actions from 'app/actions' import Script from '../components/sidebar/script.component.js' import TableOfContents from '../components/sidebar/tableOfContents.component.js' -export default class Sidebar extends Component { +class Sidebar extends Component { state = { mode: "toc", } - render() { - if (this.state.mode === "toc") { - return ( -
- - -
- ) + componentDidMount(){ + if (!this.props.peaks.length) { + this.setState({ mode: "wav" }) } + } + + render() { + const { mode } = this.state return (
-