diff options
| author | Jules Laplace <julescarbon@gmail.com> | 2021-03-10 14:46:15 +0100 |
|---|---|---|
| committer | Jules Laplace <julescarbon@gmail.com> | 2021-03-10 14:46:15 +0100 |
| commit | c84a675c07fd1997588794a26bf41c04f23c121e (patch) | |
| tree | d38758ab67c1d851069d6b9fd4b7da9934e3fb87 | |
| parent | e86e0a2f710d28c26a7457ab3fd35c88d2f937b1 (diff) | |
getting rid of basically all instances of bindActionCreators and mapDispatchToActions. hopefully never have to use these functions again
29 files changed, 85 insertions, 154 deletions
diff --git a/animism-align/cli/app/peaks/extract.py b/animism-align/cli/app/peaks/extract.py new file mode 100644 index 0000000..dda09d2 --- /dev/null +++ b/animism-align/cli/app/peaks/extract.py @@ -0,0 +1,31 @@ + +def extract_peaks(fp_in): + import os + import math + import librosa + import numpy + import json + + from app.settings import app_cfg + + if not os.path.exists(fp_in): + print(f"fp_in does not exist: {fp_in}") + return + + print(f"Loading {fp_in}") + y, sr = librosa.load(fp_in, sr=None) + + sr_10 = sr / 10 + steps = math.ceil(y.shape[0] / sr_10) + + peaks = numpy.ndarray(steps) + + for i in range(steps): + offset_start = math.floor(i * sr_10) + offset_end = math.ceil((i + 1) * sr_10) + slice = y[offset_start:offset_end] + peak = max(abs(slice.min()), slice.max()) + peaks[i] = float('%.3f' % peak) + # peaks[i * 2 + 1] = float('%.3f' % slice.max()) + + return peaks.tolist() diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.form.js b/animism-align/frontend/app/views/editor/align/components/annotations/annotation.form.js index 7b1918a..6804cdd 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.form.js +++ b/animism-align/frontend/app/views/editor/align/components/annotations/annotation.form.js @@ -1,6 +1,5 @@ import React, { Component } from 'react' // import { Link } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' @@ -184,7 +183,4 @@ const mapStateToProps = state => ({ media: state.media.index, }) -const mapDispatchToProps = dispatch => ({ -}) - -export default connect(mapStateToProps, mapDispatchToProps)(AnnotationForm) +export default connect(mapStateToProps)(AnnotationForm) diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.index.js b/animism-align/frontend/app/views/editor/align/components/annotations/annotation.index.js index 8e1fa43..7c76fca 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.index.js +++ b/animism-align/frontend/app/views/editor/align/components/annotations/annotation.index.js @@ -1,5 +1,4 @@ import React, { PureComponent } from 'react' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' 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 6c20dfa..833e83f 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 @@ -1,6 +1,5 @@ import React, { Component } from 'react' // import { Link } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' diff --git a/animism-align/frontend/app/views/editor/align/components/sidebar/tableOfContents.component.js b/animism-align/frontend/app/views/editor/align/components/sidebar/tableOfContents.component.js index 34aedb5..9d8dd64 100644 --- a/animism-align/frontend/app/views/editor/align/components/sidebar/tableOfContents.component.js +++ b/animism-align/frontend/app/views/editor/align/components/sidebar/tableOfContents.component.js @@ -1,6 +1,5 @@ import React, { Component } from 'react' // import { Link } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import { ROMAN_NUMERALS } from 'app/constants' diff --git a/animism-align/frontend/app/views/editor/align/components/timeline/playCursor.component.js b/animism-align/frontend/app/views/editor/align/components/timeline/playCursor.component.js index 854c43b..80da31f 100644 --- a/animism-align/frontend/app/views/editor/align/components/timeline/playCursor.component.js +++ b/animism-align/frontend/app/views/editor/align/components/timeline/playCursor.component.js @@ -1,6 +1,5 @@ import React, { Component } from 'react' // import { Link } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import { ZOOM_STEPS } from 'app/constants' @@ -29,8 +28,4 @@ const mapStateToProps = state => ({ audio: state.audio, }) -const mapDispatchToProps = dispatch => ({ - // alignActions: bindActionCreators({ ...alignActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(PlayCursor) +export default connect(mapStateToProps)(PlayCursor) 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 59a2c13..e628a27 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 @@ -1,6 +1,5 @@ import React, { Component } from 'react' // import { Link } from 'react-router-dom' -// import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' @@ -98,8 +97,4 @@ const mapStateToProps = state => ({ peaks: state.site.peaks, }) -const mapDispatchToProps = dispatch => ({ - // uploadActions: bindActionCreators({ ...uploadActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(Waveform) +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 11f5314..8c1724e 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 { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' diff --git a/animism-align/frontend/app/views/editor/media/components/media.formImageSelection.js b/animism-align/frontend/app/views/editor/media/components/media.formImageSelection.js index 966eb58..b601304 100644 --- a/animism-align/frontend/app/views/editor/media/components/media.formImageSelection.js +++ b/animism-align/frontend/app/views/editor/media/components/media.formImageSelection.js @@ -1,6 +1,5 @@ import React, { Component } from 'react' import { Link } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import toBlob from 'data-uri-to-blob' diff --git a/animism-align/frontend/app/views/editor/media/components/media.indexOptions.js b/animism-align/frontend/app/views/editor/media/components/media.indexOptions.js index d8187c9..beb9517 100644 --- a/animism-align/frontend/app/views/editor/media/components/media.indexOptions.js +++ b/animism-align/frontend/app/views/editor/media/components/media.indexOptions.js @@ -1,6 +1,4 @@ import React, { Component } from 'react' -import { Link } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' @@ -18,8 +16,8 @@ const thumbnailOptions = [ const sortOptions = [ { name: 'id-asc', label: 'Most recent' }, { name: 'id-desc', label: 'Oldest first' }, - { name: 'username-asc', label: 'Username (A-Z)' }, - { name: 'username-desc', label: 'Username (Z-A)' }, + // { name: 'username-asc', label: 'Username (A-Z)' }, + // { name: 'username-desc', label: 'Username (Z-A)' }, { name: 'author-asc', label: 'Author (A-Z)' }, { name: 'author-desc', label: 'Author (Z-A)' }, { name: 'title-asc', label: 'Title (A-Z)' }, @@ -53,7 +51,4 @@ const mapStateToProps = state => ({ options: state.upload.options, }) -const mapDispatchToProps = dispatch => ({ -}) - -export default connect(mapStateToProps, mapDispatchToProps)(IndexOptions) +export default connect(mapStateToProps)(IndexOptions) diff --git a/animism-align/frontend/app/views/editor/media/components/media.menu.js b/animism-align/frontend/app/views/editor/media/components/media.menu.js index b782cdc..9a15354 100644 --- a/animism-align/frontend/app/views/editor/media/components/media.menu.js +++ b/animism-align/frontend/app/views/editor/media/components/media.menu.js @@ -1,35 +1,36 @@ import React, { Component } from 'react' -import { Route, Link } from 'react-router-dom' +import { Route } from 'react-router-dom' import { connect } from 'react-redux' import { history } from 'app/store' import actions from 'app/actions' -import { MenuButton, FileInput } from 'app/common' +import { MenuButton } from 'app/common' const mapStateToProps = state => ({ media: state.media, + episode_id: state.site.episode.id, }) export default class MediaMenu extends Component { render() { return ( <div className='menuButtons'> - <Route exact path='/media/:id/show/' component={MediaShowMenu} /> - <Route exact path='/media/:id/edit/' component={MediaEditMenu} /> - <Route exact path='/media/new/' component={MediaNewMenu} /> - <Route exact path='/media/' component={MediaIndexMenu} /> + <Route exact path='/editor/:episode_id/media/:id/show/' component={MediaShowMenu} /> + <Route exact path='/editor/:episode_id/media/:id/edit/' component={MediaEditMenu} /> + <Route exact path='/editor/:episode_id/media/new/' component={MediaNewMenu} /> + <Route exact path='/editor/:episode_id/media/' component={MediaIndexMenu} /> </div> ) } } -const MediaIndexMenu = () => ([ - <MenuButton key='new' name="new" href="/media/new/" />, -]) +const MediaIndexMenu = connect(mapStateToProps)((props) => ([ + <MenuButton key='new' name="new" href={`/editor/${props.episode_id}/media/new/`} />, +])) const MediaShowMenu = connect(mapStateToProps)((props) => ([ - <MenuButton key='back' name="back" href="/media/" />, - <MenuButton key='edit' name="edit" href={"/media/" + props.match.params.id + "/edit/"} />, + <MenuButton key='back' name="back" href={`/editor/${props.episode_id}/media/`} />, + <MenuButton key='edit' name="edit" href={`/editor/${props.episode_id}/media/${props.match.params.id}/edit/`} />, <MenuButton key='delete' name="delete" onClick={() => { const { res: media } = props.media.show if (confirm("Really delete this media?")) { @@ -40,13 +41,13 @@ const MediaShowMenu = connect(mapStateToProps)((props) => ([ }} />, ])) -const MediaNewMenu = (props) => ([ - <MenuButton key='back' name="back" href="/media/" />, -]) +const MediaNewMenu = connect(mapStateToProps)((props) => ([ + <MenuButton key='back' name="back" href={`/editor/${props.episode_id}/media/`} />, +])) const MediaEditMenu = connect(mapStateToProps)((props) => ([ - <MenuButton key='back' name="back" href="/media/" />, - <MenuButton key='copy' name="copy" href={"/media/" + props.match.params.id + '/copy/'} label="Make a copy" />, + <MenuButton key='back' name="back" href={`/editor/${props.episode_id}/media/`} />, + <MenuButton key='copy' name="copy" href={`/editor/${props.episode_id}/media/${props.match.params.id}/copy/`} label="Make a copy" />, <MenuButton key='delete' name="delete" onClick={() => { const { res: media } = props.media.show if (confirm("Really delete this media?")) { @@ -56,3 +57,4 @@ const MediaEditMenu = connect(mapStateToProps)((props) => ([ } }} />, ])) + diff --git a/animism-align/frontend/app/views/editor/media/containers/media.edit.js b/animism-align/frontend/app/views/editor/media/containers/media.edit.js index cf5f671..37a91ef 100644 --- a/animism-align/frontend/app/views/editor/media/containers/media.edit.js +++ b/animism-align/frontend/app/views/editor/media/containers/media.edit.js @@ -1,5 +1,4 @@ import React, { Component } from 'react' -import { Link } from 'react-router-dom' import { connect } from 'react-redux' import { history } from 'app/store' @@ -21,7 +20,7 @@ class MediaEdit extends Component { .then(response => { // response console.log(response) - history.push('/media/') + history.push(`/editor/${this.state.episode_id}/media/`) }) } @@ -48,10 +47,7 @@ class MediaEdit extends Component { const mapStateToProps = state => ({ media: state.media, + episode_id: state.site.episode.id, }) -const mapDispatchToProps = dispatch => ({ - // mediaActions: bindActionCreators({ ...mediaActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(MediaEdit) +export default connect(mapStateToProps)(MediaEdit) diff --git a/animism-align/frontend/app/views/editor/media/containers/media.index.js b/animism-align/frontend/app/views/editor/media/containers/media.index.js index da94d3c..da467fb 100644 --- a/animism-align/frontend/app/views/editor/media/containers/media.index.js +++ b/animism-align/frontend/app/views/editor/media/containers/media.index.js @@ -1,6 +1,5 @@ import React, { Component } from 'react' import { Link } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import { formatDateTime } from 'app/utils' @@ -35,7 +34,6 @@ class MediaIndex extends Component { } render() { - const { mediaActions } = this.props const { options } = this.props.media const { loading, lookup, order } = this.props.media.index if (loading) { @@ -95,7 +93,7 @@ const MediaItem = ({ data }) => { return ( <div className='cell'> <div className='img'> - <Link to={"/media/" + data.id + "/edit/"}> + <Link to={`/editor/${data.episode_id}/media/${data.id}/edit/`}> <img src={thumbnailURL(data)} alt={data.title} /> </Link> </div> @@ -116,7 +114,7 @@ const GalleryItem = ({ data }) => { <div className='cell'> <div className='meta center'> <div className='img'> - <Link to={"/media/" + data.id + "/edit/"}> + <Link to={`/editor/${data.episode_id}/media/${data.id}/edit/`}> <img src={thumbnailURL(data)} alt={data.title} /> </Link> </div> @@ -137,7 +135,7 @@ const FileItem = ({ data }) => { return ( <div className='cell'> <div className='meta center'> - <Link to={"/media/" + data.id + "/edit/"}> + <Link to={`/editor/${data.episode_id}/media/${data.id}/edit/`}> <div> <i>{data.title}</i><br /> {data.settings.file.url}<br /> @@ -153,8 +151,4 @@ const mapStateToProps = state => ({ media: state.media, }) -const mapDispatchToProps = dispatch => ({ - // uploadActions: bindActionCreators({ ...uploadActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(MediaIndex) +export default connect(mapStateToProps)(MediaIndex) diff --git a/animism-align/frontend/app/views/editor/media/containers/media.new.js b/animism-align/frontend/app/views/editor/media/containers/media.new.js index c193c2f..1a41503 100644 --- a/animism-align/frontend/app/views/editor/media/containers/media.new.js +++ b/animism-align/frontend/app/views/editor/media/containers/media.new.js @@ -33,7 +33,7 @@ class MediaNew extends Component { }) }) } else { - this.setState({ loading: false }) + this.setState({ loading: false, initialData: { episode_id: this.state.episode_id } }) } } @@ -72,10 +72,7 @@ class MediaNew extends Component { const mapStateToProps = state => ({ media: state.media, + episode_id: state.site.episode.id, }) -const mapDispatchToProps = dispatch => ({ - // uploadActions: bindActionCreators({ ...uploadActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(MediaNew) +export default connect(mapStateToProps)(MediaNew) diff --git a/animism-align/frontend/app/views/editor/media/media.container.js b/animism-align/frontend/app/views/editor/media/media.container.js index b597a6c..007c616 100644 --- a/animism-align/frontend/app/views/editor/media/media.container.js +++ b/animism-align/frontend/app/views/editor/media/media.container.js @@ -1,12 +1,9 @@ import React, { Component } from 'react' -import { Route, Link } from 'react-router-dom' -import { bindActionCreators } from 'redux' +import { Route } from 'react-router-dom' import { connect } from 'react-redux' import './media.css' -import actions from 'app/actions' - import MediaIndex from './containers/media.index' // import MediaShow from './containers/media.show' import MediaNew from './containers/media.new' @@ -16,10 +13,10 @@ class Container extends Component { render() { return ( <div className='media'> - <Route exact path='/media/:id/copy/' component={MediaNew} /> - <Route exact path='/media/:id/edit/' component={MediaEdit} /> - <Route exact path='/media/new/' component={MediaNew} /> - <Route exact path='/media/' component={MediaIndex} /> + <Route exact path='/editor/:episode_id/media/:id/copy/' component={MediaNew} /> + <Route exact path='/editor/:episode_id/media/:id/edit/' component={MediaEdit} /> + <Route exact path='/editor/:episode_id/media/new/' component={MediaNew} /> + <Route exact path='/editor/:episode_id/media/' component={MediaIndex} /> </div> ) } @@ -31,8 +28,4 @@ const mapStateToProps = state => ({ media: state.media, }) -const mapDispatchToProps = dispatch => ({ - // uploadActions: bindActionCreators({ ...uploadActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(Container) +export default connect(mapStateToProps)(Container) diff --git a/animism-align/frontend/app/views/editor/paragraph/components/paragraph.form.js b/animism-align/frontend/app/views/editor/paragraph/components/paragraph.form.js index 55cb74e..b098ab2 100644 --- a/animism-align/frontend/app/views/editor/paragraph/components/paragraph.form.js +++ b/animism-align/frontend/app/views/editor/paragraph/components/paragraph.form.js @@ -1,6 +1,5 @@ import React, { Component } from 'react' // import { Link } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' @@ -101,7 +100,4 @@ class ParagraphForm extends Component { const mapStateToProps = state => ({ }) -const mapDispatchToProps = dispatch => ({ -}) - -export default connect(mapStateToProps, mapDispatchToProps)(ParagraphForm) +export default connect(mapStateToProps)(ParagraphForm) diff --git a/animism-align/frontend/app/views/editor/paragraph/components/paragraph.list.js b/animism-align/frontend/app/views/editor/paragraph/components/paragraph.list.js index f7c9c58..e5bae08 100644 --- a/animism-align/frontend/app/views/editor/paragraph/components/paragraph.list.js +++ b/animism-align/frontend/app/views/editor/paragraph/components/paragraph.list.js @@ -1,6 +1,5 @@ import React, { Component } from 'react' import { Route } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import { floatLT, floatInRange, capitalize } from 'app/utils' @@ -97,7 +96,4 @@ const mapStateToProps = state => ({ currentSection: state.viewer.currentSection, }) -const mapDispatchToProps = dispatch => ({ -}) - -export default connect(mapStateToProps, mapDispatchToProps)(ParagraphList) +export default connect(mapStateToProps)(ParagraphList) diff --git a/animism-align/frontend/app/views/editor/paragraph/containers/paragraphEditor.container.js b/animism-align/frontend/app/views/editor/paragraph/containers/paragraphEditor.container.js index 09ba70c..82d7059 100644 --- a/animism-align/frontend/app/views/editor/paragraph/containers/paragraphEditor.container.js +++ b/animism-align/frontend/app/views/editor/paragraph/containers/paragraphEditor.container.js @@ -1,6 +1,4 @@ import React, { Component } from 'react' -import { Route } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' @@ -87,7 +85,4 @@ const mapStateToProps = state => ({ paragraphs: state.paragraph.paragraphs, }) -const mapDispatchToProps = dispatch => ({ -}) - -export default connect(mapStateToProps, mapDispatchToProps)(ParagraphEditor) +export default connect(mapStateToProps)(ParagraphEditor) diff --git a/animism-align/frontend/app/views/editor/paragraph/paragraph.container.js b/animism-align/frontend/app/views/editor/paragraph/paragraph.container.js index d0e9b86..447c22c 100644 --- a/animism-align/frontend/app/views/editor/paragraph/paragraph.container.js +++ b/animism-align/frontend/app/views/editor/paragraph/paragraph.container.js @@ -1,6 +1,4 @@ import React, { Component } from 'react' -import { Route } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import './paragraph.css' @@ -59,8 +57,4 @@ const mapStateToProps = state => ({ loaded: !!state.annotation.index.lookup && !!state.paragraph.index.lookup && !!state.media.index.lookup }) -const mapDispatchToProps = dispatch => ({ - // alignActions: bindActionCreators({ ...alignActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(ParagraphContainer) +export default connect(mapStateToProps)(ParagraphContainer) diff --git a/animism-align/frontend/app/views/episode/containers/episode.new.js b/animism-align/frontend/app/views/episode/containers/episode.new.js index 2ff279b..13c3d49 100644 --- a/animism-align/frontend/app/views/episode/containers/episode.new.js +++ b/animism-align/frontend/app/views/episode/containers/episode.new.js @@ -73,8 +73,4 @@ const mapStateToProps = state => ({ project: state.project.index, }) -const mapDispatchToProps = dispatch => ({ - // uploadActions: bindActionCreators({ ...uploadActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(EpisodeNew) +export default connect(mapStateToProps)(EpisodeNew) diff --git a/animism-align/frontend/app/views/nav/header.component.js b/animism-align/frontend/app/views/nav/header.component.js index 4e43657..1ad4d82 100644 --- a/animism-align/frontend/app/views/nav/header.component.js +++ b/animism-align/frontend/app/views/nav/header.component.js @@ -1,5 +1,4 @@ import React from 'react' -// import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import { Link } from 'react-router-dom' diff --git a/animism-align/frontend/app/views/project/containers/project.new.js b/animism-align/frontend/app/views/project/containers/project.new.js index 149ee67..82d1312 100644 --- a/animism-align/frontend/app/views/project/containers/project.new.js +++ b/animism-align/frontend/app/views/project/containers/project.new.js @@ -55,8 +55,4 @@ const mapStateToProps = state => ({ project: state.project, }) -const mapDispatchToProps = dispatch => ({ - // uploadActions: bindActionCreators({ ...uploadActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(ProjectNew) +export default connect(mapStateToProps)(ProjectNew) diff --git a/animism-align/frontend/app/views/site/component.template.js b/animism-align/frontend/app/views/site/component.template.js index 5b22206..85273f3 100644 --- a/animism-align/frontend/app/views/site/component.template.js +++ b/animism-align/frontend/app/views/site/component.template.js @@ -1,10 +1,7 @@ import React, { Component } from 'react' -// import { Link } from 'react-router-dom' -// import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' -// import * as uploadActions from './upload.actions' class ComponentTemplate extends Component { componentDidMount() { @@ -21,8 +18,4 @@ class ComponentTemplate extends Component { const mapStateToProps = state => ({ }) -const mapDispatchToProps = dispatch => ({ - // uploadActions: bindActionCreators({ ...uploadActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(ComponentTemplate) +export default connect(mapStateToProps)(ComponentTemplate) diff --git a/animism-align/frontend/app/views/upload/components/upload.indexOptions.js b/animism-align/frontend/app/views/upload/components/upload.indexOptions.js index 75fdffc..ecb2eeb 100644 --- a/animism-align/frontend/app/views/upload/components/upload.indexOptions.js +++ b/animism-align/frontend/app/views/upload/components/upload.indexOptions.js @@ -1,11 +1,9 @@ import React, { Component } from 'react' -import { Link } from 'react-router-dom' -import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' -import { Select, Checkbox } from 'app/common' +import { Select } from 'app/common' const thumbnailOptions = [ { name: 'th', label: 'Thumbnails', }, @@ -18,8 +16,8 @@ const thumbnailOptions = [ const sortOptions = [ { name: 'id-asc', label: 'Most recent' }, { name: 'id-desc', label: 'Oldest first' }, - { name: 'username-asc', label: 'Username (A-Z)' }, - { name: 'username-desc', label: 'Username (Z-A)' }, + // { name: 'username-asc', label: 'Username (A-Z)' }, + // { name: 'username-desc', label: 'Username (Z-A)' }, // { name: '-asc', label: '' }, // { name: '-desc', label: '' }, // { name: '-asc', label: '' }, @@ -55,7 +53,4 @@ const mapStateToProps = state => ({ options: state.upload.options, }) -const mapDispatchToProps = dispatch => ({ -}) - -export default connect(mapStateToProps, mapDispatchToProps)(IndexOptions) +export default connect(mapStateToProps)(IndexOptions) diff --git a/animism-align/frontend/app/views/upload/components/upload.show.js b/animism-align/frontend/app/views/upload/components/upload.show.js index 0498cac..20a6a0c 100644 --- a/animism-align/frontend/app/views/upload/components/upload.show.js +++ b/animism-align/frontend/app/views/upload/components/upload.show.js @@ -1,5 +1,4 @@ import React, { Component } from 'react' -import { Link } from 'react-router-dom' import { connect } from 'react-redux' import actions from 'app/actions' @@ -62,8 +61,4 @@ const mapStateToProps = state => ({ upload: state.upload, }) -const mapDispatchToProps = dispatch => ({ - // searchActions: bindActionCreators({ ...searchActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(UploadShow) +export default connect(mapStateToProps)(UploadShow) diff --git a/animism-align/frontend/app/views/venue/containers/venue.new.js b/animism-align/frontend/app/views/venue/containers/venue.new.js index 9f7fe05..f39dc19 100644 --- a/animism-align/frontend/app/views/venue/containers/venue.new.js +++ b/animism-align/frontend/app/views/venue/containers/venue.new.js @@ -55,8 +55,4 @@ const mapStateToProps = state => ({ venue: state.venue, }) -const mapDispatchToProps = dispatch => ({ - // uploadActions: bindActionCreators({ ...uploadActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(VenueNew) +export default connect(mapStateToProps)(VenueNew) diff --git a/animism-align/frontend/app/views/viewer/forms/subscription.form.js b/animism-align/frontend/app/views/viewer/forms/subscription.form.js index ce92951..8c53d0d 100644 --- a/animism-align/frontend/app/views/viewer/forms/subscription.form.js +++ b/animism-align/frontend/app/views/viewer/forms/subscription.form.js @@ -1,6 +1,5 @@ import React, { Component } from 'react' import { connect } from 'react-redux' -import { bindActionCreators } from 'redux' import { Arrow } from '../nav/viewer.icons' import { Loader } from 'app/common/loader.component' diff --git a/animism-align/frontend/app/views/viewer/player/player.transcript.js b/animism-align/frontend/app/views/viewer/player/player.transcript.js index cfb252d..b7d2ef0 100644 --- a/animism-align/frontend/app/views/viewer/player/player.transcript.js +++ b/animism-align/frontend/app/views/viewer/player/player.transcript.js @@ -1,6 +1,4 @@ import React, { Component } from 'react' -// import { Link } from 'react-router-dom' -// import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' diff --git a/animism-align/frontend/app/views/viewer/transcript/transcript.container.js b/animism-align/frontend/app/views/viewer/transcript/transcript.container.js index fad0ac8..f5c6c03 100644 --- a/animism-align/frontend/app/views/viewer/transcript/transcript.container.js +++ b/animism-align/frontend/app/views/viewer/transcript/transcript.container.js @@ -1,6 +1,4 @@ import React, { Component } from 'react' -// import { Link } from 'react-router-dom' -// import { bindActionCreators } from 'redux' import { connect } from 'react-redux' import actions from 'app/actions' @@ -196,8 +194,4 @@ const mapStateToProps = state => ({ paragraphs: state.paragraph.paragraphs, }) -const mapDispatchToProps = dispatch => ({ - // uploadActions: bindActionCreators({ ...uploadActions }, dispatch), -}) - -export default connect(mapStateToProps, mapDispatchToProps)(Transcript) +export default connect(mapStateToProps)(Transcript) |
