diff options
Diffstat (limited to 'animism-align/frontend/app/views/editor')
| -rw-r--r-- | animism-align/frontend/app/views/editor/align/align.container.js | 6 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/align/containers/timeline.container.js | 12 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/annotation.form.css (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotation.form.css) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/annotation.index.css (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotation.index.css) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/annotations.container.js (renamed from animism-align/frontend/app/views/editor/align/containers/annotations.container.js) | 7 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotation.form.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotation.form.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotation.index.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotation.index.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.gallery.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.gallery.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.image.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.image.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.text.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.text.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.utility.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.utility.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.video.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.video.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationForms/index.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/index.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.gallery.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.gallery.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.image.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.image.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.text.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.text.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.utility.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.utility.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.video.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.video.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/annotation/components/annotationTypes/index.js (renamed from animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/index.js) | 0 | ||||
| -rw-r--r-- | animism-align/frontend/app/views/editor/overview/overview.container.js | 10 |
20 files changed, 19 insertions, 16 deletions
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 281fd35..168551d 100644 --- a/animism-align/frontend/app/views/editor/align/align.container.js +++ b/animism-align/frontend/app/views/editor/align/align.container.js @@ -1,11 +1,9 @@ import React, { Component } from 'react' import './align.css' -import './components/annotations/annotation.form.css' -import './components/annotations/annotation.index.css' -import Timeline from 'app/views/editor/align/containers/timeline.container.js' -import Sidebar from 'app/views/editor/align/containers/sidebar.container.js' +import Timeline from './containers/timeline.container.js' +import Sidebar from './containers/sidebar.container.js' class Container extends Component { componentDidMount() { 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' diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.form.css b/animism-align/frontend/app/views/editor/annotation/annotation.form.css index fa663c7..fa663c7 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.form.css +++ b/animism-align/frontend/app/views/editor/annotation/annotation.form.css diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.index.css b/animism-align/frontend/app/views/editor/annotation/annotation.index.css index afedbde..afedbde 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.index.css +++ b/animism-align/frontend/app/views/editor/annotation/annotation.index.css diff --git a/animism-align/frontend/app/views/editor/align/containers/annotations.container.js b/animism-align/frontend/app/views/editor/annotation/annotations.container.js index cfcf7be..3a247d0 100644 --- a/animism-align/frontend/app/views/editor/align/containers/annotations.container.js +++ b/animism-align/frontend/app/views/editor/annotation/annotations.container.js @@ -1,8 +1,11 @@ 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' +import AnnotationForm from './components/annotation.form' +import AnnotationIndex from './components/annotation.index' + +import './annotation.form.css' +import './annotation.index.css' class Annotations extends Component { constructor(props){ diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.form.js b/animism-align/frontend/app/views/editor/annotation/components/annotation.form.js index 6804cdd..6804cdd 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.form.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotation.form.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.index.js b/animism-align/frontend/app/views/editor/annotation/components/annotation.index.js index e2c7a51..e2c7a51 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotation.index.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotation.index.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.gallery.js b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.gallery.js index 0a8b3fb..0a8b3fb 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.gallery.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.gallery.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.image.js b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.image.js index 3de2ac5..3de2ac5 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.image.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.image.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.text.js b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.text.js index 8bc7675..8bc7675 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.text.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.text.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.utility.js b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.utility.js index 7e823cc..7e823cc 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.utility.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.utility.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.video.js b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.video.js index dd5f640..dd5f640 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/annotationForm.video.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/annotationForm.video.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/index.js b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/index.js index 8a1be48..8a1be48 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationForms/index.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationForms/index.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.gallery.js b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.gallery.js index c7df7f8..c7df7f8 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.gallery.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.gallery.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.image.js b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.image.js index d0a573e..d0a573e 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.image.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.image.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.text.js b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.text.js index ea65610..ea65610 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.text.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.text.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.utility.js b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.utility.js index 1238163..1238163 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.utility.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.utility.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.video.js b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.video.js index 4ea9595..4ea9595 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/annotationTypes.video.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/annotationTypes.video.js diff --git a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/index.js b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/index.js index 1a89dbd..1a89dbd 100644 --- a/animism-align/frontend/app/views/editor/align/components/annotations/annotationTypes/index.js +++ b/animism-align/frontend/app/views/editor/annotation/components/annotationTypes/index.js diff --git a/animism-align/frontend/app/views/editor/overview/overview.container.js b/animism-align/frontend/app/views/editor/overview/overview.container.js index 71ca6c2..e55f733 100644 --- a/animism-align/frontend/app/views/editor/overview/overview.container.js +++ b/animism-align/frontend/app/views/editor/overview/overview.container.js @@ -75,10 +75,12 @@ class OverviewContainer extends Component { duration: align.duration ? timestampHMS(align.duration) : "No audio file attached", }} /> - <TableObject - tag="Annotations" - object={stats.types} - /> + {!!Object.keys(stats.types).length && ( + <TableObject + tag="Annotations" + object={stats.types} + /> + )} </div> </div> ) |
