From 609d04b1bc02a5ee57ec22cb49fc6f08b57f1deb Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Wed, 19 Aug 2020 15:50:55 +0200 Subject: intro background. setvolume --- animism-align/frontend/app/views/viewer/nav/nav.player.js | 5 ++--- .../frontend/app/views/viewer/nav/viewer.icons.js | 2 +- .../viewer/player/components.inline/inline.utility.js | 12 ++++++++++-- .../viewer/player/components.utility/media.gallery.js | 2 +- .../views/viewer/player/components.utility/media.grid.js | 2 +- .../frontend/app/views/viewer/player/player.transcript.css | 14 +++++++++++++- .../viewer/transcript/components/elementTypes.gallery.js | 3 +++ .../viewer/transcript/components/elementTypes.image.js | 3 +++ .../viewer/transcript/components/elementTypes.video.js | 3 +++ 9 files changed, 37 insertions(+), 9 deletions(-) (limited to 'animism-align/frontend') diff --git a/animism-align/frontend/app/views/viewer/nav/nav.player.js b/animism-align/frontend/app/views/viewer/nav/nav.player.js index d4d5d8c..7c2050e 100644 --- a/animism-align/frontend/app/views/viewer/nav/nav.player.js +++ b/animism-align/frontend/app/views/viewer/nav/nav.player.js @@ -20,9 +20,8 @@ class NavPlayer extends Component { const mapStateToProps = state => ({ playing: state.audio.playing, volume: state.audio.volume, - play_ts: state.audio.play_ts, - duration: state.align.timeline.duration, + play_ts: state.viewer.currentSection ? state.audio.play_ts - state.viewer.currentSection.start_ts : 0, + duration: state.viewer.currentSection ? state.viewer.currentSection.end_ts - state.viewer.currentSection.start_ts : 0, }) export default connect(mapStateToProps)(NavPlayer) - diff --git a/animism-align/frontend/app/views/viewer/nav/viewer.icons.js b/animism-align/frontend/app/views/viewer/nav/viewer.icons.js index 8403865..2ca8dff 100644 --- a/animism-align/frontend/app/views/viewer/nav/viewer.icons.js +++ b/animism-align/frontend/app/views/viewer/nav/viewer.icons.js @@ -39,7 +39,7 @@ export const Arrow = React.memo(({ type }) => ( // volume toggle export const VolumeControl = React.memo(({ volume }) => ( -
actions.audio.setVolume(setVolume ? 0.0 : 1.0)}> +
actions.audio.setVolume(volume ? 0.0 : 1.0)}> diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js index d185722..7ac5997 100644 --- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js +++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js @@ -8,14 +8,22 @@ export const Intro = ({ paragraph, media, currentParagraph, currentAnnotation, o const style = { backgroundImage: 'url(' + item.settings.file.url + ')', } + let lines = [] + if (annotation.settings.title) { + lines = lines.concat(annotation.settings.title.split(/]*>/)) + } + if (annotation.settings.subtitle) { + lines = lines.concat(annotation.settings.subtitle.split(/]*>/)) + } return (
- {annotation.settings.title && } - {annotation.settings.subtitle && } + {lines.map((line, i) => ( + + ))}
) diff --git a/animism-align/frontend/app/views/viewer/player/components.utility/media.gallery.js b/animism-align/frontend/app/views/viewer/player/components.utility/media.gallery.js index dd2e6db..da83c4f 100644 --- a/animism-align/frontend/app/views/viewer/player/components.utility/media.gallery.js +++ b/animism-align/frontend/app/views/viewer/player/components.utility/media.gallery.js @@ -31,7 +31,7 @@ export const Gallery = ({ media, annotation }) => { } const GalleryItem = ({ image, caption }) => { - console.log(image) + // console.log(image) return (
diff --git a/animism-align/frontend/app/views/viewer/player/components.utility/media.grid.js b/animism-align/frontend/app/views/viewer/player/components.utility/media.grid.js index 5bba2d5..93b8696 100644 --- a/animism-align/frontend/app/views/viewer/player/components.utility/media.grid.js +++ b/animism-align/frontend/app/views/viewer/player/components.utility/media.grid.js @@ -26,7 +26,7 @@ export const Grid = ({ media, annotation }) => { } const GridItem = ({ image, caption }) => { - console.log(image) + // console.log(image) return (
diff --git a/animism-align/frontend/app/views/viewer/player/player.transcript.css b/animism-align/frontend/app/views/viewer/player/player.transcript.css index dd63635..69abda2 100644 --- a/animism-align/frontend/app/views/viewer/player/player.transcript.css +++ b/animism-align/frontend/app/views/viewer/player/player.transcript.css @@ -168,9 +168,21 @@ color: white; font-family: "Freight Text", serif; font-size: 12vh; - line-height: 1; + line-height: 1.3; text-align: center; } +.site-intro .inner span { + box-shadow: -10px 0px 0 #000, + 10px 0px 0 #000, + -10px 0px 0 #000, + 10px 0px 0 #000; + box-decoration-break: clone; + background: black; + color: white; +} + +/* schedule */ + .schedule { width: 45rem; display: flex; diff --git a/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.gallery.js b/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.gallery.js index 0eb8b19..895c9dd 100644 --- a/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.gallery.js +++ b/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.gallery.js @@ -6,6 +6,9 @@ export const MediaGallery = ({ paragraph, media, currentParagraph, currentAnnota if (!media.lookup) return
const className = currentParagraph ? 'media current' : 'media' const annotation = paragraph.annotations[0] + if (annotation.settings.hide_in_transcript) { + return
+ } const item = media.lookup[annotation.settings.media_id] if (!item) return
Media not found: {annotation.settings.media_id}
return ( diff --git a/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.image.js b/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.image.js index 9269461..4f4f960 100644 --- a/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.image.js +++ b/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.image.js @@ -31,6 +31,9 @@ export const MediaImage = ({ paragraph, media, currentParagraph, currentAnnotati if (!media.lookup) return
const className = currentParagraph ? 'media image current' : 'media image' const annotation = paragraph.annotations[0] + if (annotation.settings.hide_in_transcript) { + return
+ } const item = media.lookup[annotation.settings.media_id] if (!item) return
Media not found: {annotation.settings.media_id}
return ( diff --git a/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.video.js b/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.video.js index 6c2a05b..7cb03bb 100644 --- a/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.video.js +++ b/animism-align/frontend/app/views/viewer/transcript/components/elementTypes.video.js @@ -6,6 +6,9 @@ export const MediaVideo = ({ paragraph, media, currentParagraph, currentAnnotati if (!media.lookup) return
const className = currentParagraph ? 'media current' : 'media' const annotation = paragraph.annotations[0] + if (annotation.settings.hide_in_transcript) { + return
+ } const item = media.lookup[annotation.settings.media_id] if (!item) return
Media not found: {annotation.settings.media_id}
return ( -- cgit v1.2.3-70-g09d2