summaryrefslogtreecommitdiff
path: root/animism-align/frontend/app/views/viewer/player/components.inline
diff options
context:
space:
mode:
authorJules Laplace <julescarbon@gmail.com>2020-08-13 20:15:08 +0200
committerJules Laplace <julescarbon@gmail.com>2020-08-13 20:15:08 +0200
commit45cf182c73a6eb019bf7e61cafa3ca117b014ddb (patch)
tree52dec0319e4fdbd0c2028dd3a6765ad3508d834c /animism-align/frontend/app/views/viewer/player/components.inline
parenta0cfa87f52a9ba82a3f35878bbe7ab8221804e60 (diff)
gallery vs carousel
Diffstat (limited to 'animism-align/frontend/app/views/viewer/player/components.inline')
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.inline/inline.gallery.js25
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.inline/inline.utility.js2
-rw-r--r--animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js2
3 files changed, 25 insertions, 4 deletions
diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.gallery.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.gallery.js
index eb43e23..277a237 100644
--- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.gallery.js
+++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.gallery.js
@@ -1,7 +1,7 @@
import React from 'react'
import { CURTAIN_COLOR_LOOKUP } from 'app/constants'
-import { MediaCitation, Vitrine, Gallery } from '../components.utility'
+import { MediaCitation, Vitrine, Gallery, Carousel } from '../components.utility'
export const InlineVitrine = ({ paragraph, media, currentParagraph, currentAnnotation, onAnnotationClick, onDoubleClick }) => {
const annotation = paragraph.annotations[0]
@@ -18,9 +18,9 @@ export const InlineVitrine = ({ paragraph, media, currentParagraph, currentAnnot
>
{annotation.settings.title && <div className='heading'>{annotation.settings.title}</div>}
<Vitrine media={item} />
- <MediaCitation media={item} />
</div>
)
+ // <MediaCitation media={item} />
}
export const InlineGallery = ({ paragraph, media, currentParagraph, currentAnnotation, onAnnotationClick, onDoubleClick }) => {
@@ -43,3 +43,24 @@ export const InlineGallery = ({ paragraph, media, currentParagraph, currentAnnot
</div>
)
}
+
+export const InlineCarousel = ({ paragraph, media, currentParagraph, currentAnnotation, onAnnotationClick, onDoubleClick }) => {
+ const annotation = paragraph.annotations[0]
+ const item = media.lookup[annotation.settings.media_id]
+ const color = CURTAIN_COLOR_LOOKUP[annotation.settings.color] || CURTAIN_COLOR_LOOKUP.white
+ const style = {
+ backgroundColor: color.backgroundColor,
+ color: color.textColor,
+ }
+
+ return (
+ <div
+ className='inline-element media carousel'
+ >
+ <div style={style} className='carousel-container'>
+ <Carousel media={item} />
+ </div>
+ <MediaCitation media={item} />
+ </div>
+ )
+}
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 943b02a..084fbf4 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
@@ -4,7 +4,7 @@ export const Intro = ({ paragraph, media, currentParagraph, currentAnnotation, o
let className = 'site-intro'
const annotation = paragraph.annotations[0]
const item = media.lookup[annotation.settings.media_id]
- console.log(item)
+ // console.log(item)
const style = {
backgroundImage: 'url(' + item.settings.file.url + ')',
}
diff --git a/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js b/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js
index fc24f9e..e34bfa6 100644
--- a/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js
+++ b/animism-align/frontend/app/views/viewer/player/components.inline/inline.video.js
@@ -16,7 +16,7 @@ export const MediaVideo = ({ paragraph, media, currentParagraph, currentAnnotati
color: color.textColor,
}
if (!item) return <div>Media not found: {annotation.settings.media_id}</div>
- console.log(annotation.settings)
+ // console.log(annotation.settings)
return (
<div
className={className}