From 7082a0d15c3118acc219cf23de46f49fd3bfaea6 Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 22 Jul 2020 21:46:37 +0200 Subject: avoid hitting the dang tab key --- .../frontend/app/views/viewer/viewer.container.js | 24 ++++++++++++++++------ 1 file changed, 18 insertions(+), 6 deletions(-) (limited to 'animism-align/frontend/app/views/viewer/viewer.container.js') diff --git a/animism-align/frontend/app/views/viewer/viewer.container.js b/animism-align/frontend/app/views/viewer/viewer.container.js index ea2f08c..779ec93 100644 --- a/animism-align/frontend/app/views/viewer/viewer.container.js +++ b/animism-align/frontend/app/views/viewer/viewer.container.js @@ -5,12 +5,16 @@ import { connect } from 'react-redux' import './viewer.fonts.css' import './viewer.css' +import './viewer.nav.css' +import './transcript/transcript.css' import actions from 'app/actions' import { Loader } from 'app/common' import Transcript from './transcript/transcript.container' +import ViewerNav from './nav/viewer.nav' import ViewerRouter from './nav/viewer.router' +import Player from './player/player.container' class ViewerContainer extends Component { constructor(props) { @@ -46,13 +50,20 @@ class ViewerContainer extends Component { } } render() { - if (!this.props.loaded) { - return
+ const { loaded, viewer } = this.props + if (!loaded) { + return
} return ( -
- - +
+
+
+ + +
+ + +
) } @@ -63,7 +74,8 @@ const mapStateToProps = state => ({ !!state.annotation.index.lookup && !!state.paragraph.index.lookup && !!state.media.index.lookup - ) + ), + viewer: state.viewer, }) const mapDispatchToProps = dispatch => ({ -- cgit v1.2.3-70-g09d2