diff options
Diffstat (limited to 'animism-align/frontend')
7 files changed, 33 insertions, 23 deletions
diff --git a/animism-align/frontend/app/views/editor/align/align.actions.js b/animism-align/frontend/app/views/editor/align/align.actions.js index 65e3d46..a2f4881 100644 --- a/animism-align/frontend/app/views/editor/align/align.actions.js +++ b/animism-align/frontend/app/views/editor/align/align.actions.js @@ -4,6 +4,8 @@ import actions from 'app/actions' // import { session } from 'app/session' import throttle from 'lodash.throttle' import debounce from 'lodash.debounce' +import { api } from 'app/utils' +import { URLS } from 'app/constants' import { ZOOM_STEPS } from 'app/constants' import { timestampToSeconds, post } from 'app/utils' @@ -143,4 +145,20 @@ export const spliceTime = start_ts => dispatch => { alert(res.count + ' records updated!') actions.annotation.index() }) -}
\ No newline at end of file +} + +/* peaks */ + +export const loadPeaks = (episode) => dispatch => ( + api(dispatch, types.peaks, 'peaks', URLS.peaks) +) + +/* longform text */ + +// export const loadText = (episode) => dispatch => ( + // api(dispatch, types.text, 'text', URLS.text) +// ) + +export const updateText = text => dispatch => ( + dispatch({ type: types.text.loaded, data: text }) +) 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 168551d..e145936 100644 --- a/animism-align/frontend/app/views/editor/align/align.container.js +++ b/animism-align/frontend/app/views/editor/align/align.container.js @@ -1,4 +1,5 @@ import React, { Component } from 'react' +import { connect } from 'react-redux' import './align.css' @@ -14,7 +15,9 @@ class Container extends Component { return ( <div className='body alignmentEditor'> <div className='row'> - <Timeline /> + {this.props.peaks.length + ? <Timeline /> + : <div className="overview">No audio file loaded</div>} </div> <Sidebar /> </div> @@ -22,4 +25,8 @@ class Container extends Component { } } -export default Container +const mapStateToProps = state => ({ + peaks: state.align.peaks, +}) + +export default connect(mapStateToProps)(Container) diff --git a/animism-align/frontend/app/views/editor/align/components/sidebar/script.component.js b/animism-align/frontend/app/views/editor/align/components/sidebar/script.component.js index 833e83f..d23b3da 100644 --- a/animism-align/frontend/app/views/editor/align/components/sidebar/script.component.js +++ b/animism-align/frontend/app/views/editor/align/components/sidebar/script.component.js @@ -16,7 +16,7 @@ const Script = ({ text }) => { } const mapStateToProps = state => ({ - text: state.site.text, + text: state.align.text, }) export default connect(mapStateToProps)(Script) diff --git a/animism-align/frontend/app/views/editor/align/components/timeline/waveform.component.js b/animism-align/frontend/app/views/editor/align/components/timeline/waveform.component.js index e628a27..0161129 100644 --- a/animism-align/frontend/app/views/editor/align/components/timeline/waveform.component.js +++ b/animism-align/frontend/app/views/editor/align/components/timeline/waveform.component.js @@ -94,7 +94,7 @@ class Waveform extends Component { const mapStateToProps = state => ({ timeline: state.align.timeline, - peaks: state.site.peaks, + peaks: state.align.peaks, }) export default connect(mapStateToProps)(Waveform) 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 8c1724e..a771f1a 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,6 +1,5 @@ import React, { Component } from 'react' // import { Link } from 'react-router-dom' -import { connect } from 'react-redux' import actions from 'app/actions' diff --git a/animism-align/frontend/app/views/editor/align/containers/timeline.container.js b/animism-align/frontend/app/views/editor/align/containers/timeline.container.js index 14e68d8..dbef60f 100644 --- a/animism-align/frontend/app/views/editor/align/containers/timeline.container.js +++ b/animism-align/frontend/app/views/editor/align/containers/timeline.container.js @@ -190,7 +190,7 @@ const mapStateToProps = state => ({ annotation: state.align.annotation, selectedAnnotation: state.align.selectedAnnotation, audio: state.audio, - text: state.site.text, + text: state.align.text, }) export default connect(mapStateToProps)(Timeline) diff --git a/animism-align/frontend/app/views/site/site.actions.js b/animism-align/frontend/app/views/site/site.actions.js index ac14096..5538df7 100644 --- a/animism-align/frontend/app/views/site/site.actions.js +++ b/animism-align/frontend/app/views/site/site.actions.js @@ -1,7 +1,5 @@ import * as types from 'app/types' -import { api } from 'app/utils' import actions from 'app/actions' -import { URLS } from 'app/constants' import FontFaceObserver from 'fontfaceobserver' export const loadSite = () => dispatch => { @@ -21,8 +19,8 @@ export const loadEpisode = (project, episode) => dispatch => { const { id: episode_id } = episode dispatch({ type: types.editor.loading }) return Promise.all([ - // actions.site.loadText(episode), - actions.site.loadPeaks(episode), + // actions.align.loadText(episode), + // actions.align.loadPeaks(episode), actions.audio.load(episode), actions.annotation.index({ episode_id }), actions.paragraph.index({ episode_id }), @@ -45,15 +43,3 @@ const loadFonts = () => { ] return Promise.all(fonts.map(font => font.load())) } - -export const loadPeaks = (asdf) => dispatch => ( - api(dispatch, types.peaks, 'peaks', URLS.peaks) -) - -// export const loadText = (asdf) => dispatch => ( - // api(dispatch, types.text, 'text', URLS.text) -// ) - -export const updateText = text => dispatch => ( - dispatch({ type: types.text.loaded, data: text }) -) |