refactor annotation forms out of the directory nest

2 files changed, 6 insertions, 34 deletions

diff --git a/animism-align/frontend/app/views/editor/align/containers/annotations.container.js b/animism-align/frontend/app/views/editor/align/containers/annotations.container.js
deleted file mode 100644
index cfcf7be..0000000
--- a/animism-align/frontend/app/views/editor/align/containers/annotations.container.js
+++ /dev/null
@@ -1,28 +0,0 @@
-import React, { Component } from 'react'
-import { connect } from 'react-redux'
-
-import AnnotationForm from 'app/views/editor/align/components/annotations/annotation.form'
-import AnnotationIndex from 'app/views/editor/align/components/annotations/annotation.index'
-
-class Annotations extends Component {
-  constructor(props){
-    super(props)
-  }
-  render() {
-    return (
-      <div className='annotations'>
-        <AnnotationIndex />
-        {this.props.annotation.id &&
-          <AnnotationForm />
-        }
-      </div>
-    )
-  }
-}
-
-const mapStateToProps = state => ({
-  timeline: state.align.timeline,
-  annotation: state.align.annotation,
-})
-
-export default connect(mapStateToProps)(Annotations)
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 feb4f6a..14e68d8 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
@@ -4,12 +4,12 @@ import { connect } from 'react-redux'
 
 import actions from 'app/actions'
 
-import Annotations from 'app/views/editor/align/containers/annotations.container'
-import Waveform from 'app/views/editor/align/components/timeline/waveform.component'
-import Ticks from 'app/views/editor/align/components/timeline/ticks.component'
-import Cursor from 'app/views/editor/align/components/timeline/cursor.component'
-import PlayCursor from 'app/views/editor/align/components/timeline/playCursor.component'
-import CursorRegion from 'app/views/editor/align/components/timeline/cursorRegion.component'
+import Annotations from 'app/views/editor/annotation/annotations.container'
+import Waveform from '../components/timeline/waveform.component'
+import Ticks from '../components/timeline/ticks.component'
+import Cursor from '../components/timeline/cursor.component'
+import PlayCursor from '../components/timeline/playCursor.component'
+import CursorRegion from '../components/timeline/cursorRegion.component'
 
 import { WAVEFORM_SIZE, ZOOM_STEPS, INNER_HEIGHT } from 'app/constants'
 import { clamp } from 'app/utils'