From 16d9207aa0a605b03d4807311b0ec26671434af0 Mon Sep 17 00:00:00 2001 From: Lachlan Kermode Date: Fri, 21 Dec 2018 16:58:40 +0000 Subject: [PATCH] WIP: source error for all types --- src/components/Dashboard.jsx | 16 +++++------ src/components/SourceOverlay.jsx | 35 +++++++++-------------- src/components/presentational/NoSource.js | 14 ++++----- src/scss/mediaoverlay.scss | 18 +++++++++--- 4 files changed, 43 insertions(+), 40 deletions(-) diff --git a/src/components/Dashboard.jsx b/src/components/Dashboard.jsx index 092706b..c812d65 100644 --- a/src/components/Dashboard.jsx +++ b/src/components/Dashboard.jsx @@ -155,13 +155,13 @@ function mapDispatchToProps(dispatch) { } export default connect( - state => ({ - ...state, - app: { - ...state.app, - source: state.domain.sources["Anna News - Horbatenko Tanks Video"] - } - }), - // state => state, + // state => ({ + // ...state, + // app: { + // ...state.app, + // source: state.domain.sources["Anna News - Horbatenko Tanks Video"] + // } + // }), + state => state, mapDispatchToProps, )(Dashboard); diff --git a/src/components/SourceOverlay.jsx b/src/components/SourceOverlay.jsx index 92ebf66..5dcf13e 100644 --- a/src/components/SourceOverlay.jsx +++ b/src/components/SourceOverlay.jsx @@ -12,27 +12,20 @@ class SourceOverlay extends React.Component { renderVideo() { // return ( - // + // + //
+ //
+ // + //
+ //
+ // + // + //
+ //
+ //
// ) return ( - -
-
- -
-
- - -
-
-
+ ) } @@ -50,7 +43,7 @@ class SourceOverlay extends React.Component { renderError() { return ( -
ERROR: no support for this source
+ ) } @@ -96,7 +89,7 @@ class SourceOverlay extends React.Component { {type ?
Type: {type}
: null} {date ?
Date:{date}
: null}
- {url ?
Link to original webpage
: null} + {url ?
Link to original URL
: null} diff --git a/src/components/presentational/NoSource.js b/src/components/presentational/NoSource.js index 85cb542..e38975c 100644 --- a/src/components/presentational/NoSource.js +++ b/src/components/presentational/NoSource.js @@ -7,14 +7,14 @@ const NoSource = ({ failedUrls }) => { error -
No media found.
+
No media found, as the original media has not yet been uploaded to the platform.
-
- The following URLs were tried: -
-
    - {failedUrls.map((url, idx) =>
  • {url}
  • )} -
+ {/*
*/} + {/* The following URLs were tried: */} + {/*
*/} + {/*
    */} + {/* {failedUrls.map((url, idx) =>
  • {url}
  • )} */} + {/*
*/} ) } diff --git a/src/scss/mediaoverlay.scss b/src/scss/mediaoverlay.scss index 3ce66aa..17fbb18 100644 --- a/src/scss/mediaoverlay.scss +++ b/src/scss/mediaoverlay.scss @@ -1,7 +1,7 @@ $panel-width: 800px; $panel-height: 800px; $vimeo-width: $panel-width - 100; -// $vimeo-height: $panel-height - 100; +$vimeo-height: $panel-height / 2; $header-inset: 10px; @@ -104,12 +104,22 @@ $header-inset: 10px; background-color: black; } -.vimeo-iframe { - // min-height: $vimeo-height; - // max-height: $vimeo-height; +.media-player { min-width: $vimeo-width; max-width: $vimeo-width; + min-height: $vimeo-height; + max-height: $vimeo-height; border: none; + + iframe, video { + width: $vimeo-width; + height: $vimeo-height - 50; + border: none; + } +} + +.media-controls { + padding: 0 50px; }