From 778380446d278adf45a9491b699b7e324d9edb8c Mon Sep 17 00:00:00 2001 From: Jules Laplace Date: Tue, 28 Jul 2020 14:11:46 +0200 Subject: setting things as hidden --- .../player/components.fullscreen/fullscreen.image.js | 2 +- .../player/components.fullscreen/fullscreen.utility.js | 2 +- .../player/components.fullscreen/fullscreen.video.js | 18 ++++++++++++++++++ .../views/viewer/player/components.fullscreen/index.js | 18 +++++++++--------- 4 files changed, 29 insertions(+), 11 deletions(-) create mode 100644 animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js (limited to 'animism-align/frontend/app/views/viewer/player/components.fullscreen') diff --git a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js index c0e4b0e..6ca6d79 100644 --- a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js +++ b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.image.js @@ -1,6 +1,6 @@ import React from 'react' -export const Image = ({ element, media, transitionDuration }) => { +export const FullscreenImage = ({ element, media, transitionDuration }) => { const item = media.lookup[element.settings.media_id] const style = { transitionDuration, diff --git a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.utility.js b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.utility.js index c86236d..3a0e21d 100644 --- a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.utility.js +++ b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.utility.js @@ -1,6 +1,6 @@ import React from 'react' -export const Curtain = ({ element, transitionDuration }) => { +export const FullscreenCurtain = ({ element, transitionDuration }) => { // console.log(element, isEntering) const { color } = element const style = { diff --git a/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js new file mode 100644 index 0000000..9122426 --- /dev/null +++ b/animism-align/frontend/app/views/viewer/player/components.fullscreen/fullscreen.video.js @@ -0,0 +1,18 @@ +import React from 'react' +import VimeoPlayer from '@u-wave/react-vimeo' + +export const FullscreenVideo = ({ element, media, transitionDuration }) => { + const item = media.lookup[element.settings.media_id] + const style = { + transitionDuration, + backgroundImage: 'url(' + item.settings.display.url + ')', + } + return ( +
+ +
+ ) +} diff --git a/animism-align/frontend/app/views/viewer/player/components.fullscreen/index.js b/animism-align/frontend/app/views/viewer/player/components.fullscreen/index.js index 3befbde..f533123 100644 --- a/animism-align/frontend/app/views/viewer/player/components.fullscreen/index.js +++ b/animism-align/frontend/app/views/viewer/player/components.fullscreen/index.js @@ -1,19 +1,19 @@ import React from 'react' -// import { -// MediaVideo -// } from './fullscreen.video' - import { - Image + FullscreenImage } from './fullscreen.image' import { - Curtain + FullscreenVideo +} from './fullscreen.video' + +import { + FullscreenCurtain } from './fullscreen.utility' export const fullscreenComponents = { - curtain: React.memo(Curtain), - // video: React.memo(MediaVideo), - image: React.memo(Image), + curtain: React.memo(FullscreenCurtain), + video: React.memo(FullscreenVideo), + image: React.memo(FullscreenImage), } -- cgit v1.2.3-70-g09d2