diff --git a/package.json b/package.json index 5f5b977..b4a1c53 100644 --- a/package.json +++ b/package.json @@ -21,7 +21,6 @@ "react": "^16.6.3", "react-dom": "^16.6.3", "react-image": "^1.5.1", - "react-media-player": "^0.7.5", "react-portal": "^4.2.0", "react-redux": "^5.0.4", "react-tabs": "^1.0.0", @@ -29,6 +28,7 @@ "redux-thunk": "^2.2.0", "reselect": "^3.0.1", "uuid": "^3.1.0", + "video-react": "^0.13.1", "video.js": "^5.19.2", "whatwg-fetch": "^2.0.3" }, diff --git a/src/components/SourceOverlay.jsx b/src/components/SourceOverlay.jsx index f3b8487..3a2c3aa 100644 --- a/src/components/SourceOverlay.jsx +++ b/src/components/SourceOverlay.jsx @@ -1,6 +1,6 @@ import React from 'react' import Img from 'react-image' -import { Media, Player, controls } from 'react-media-player' +import { Player } from 'video-react' import Spinner from './presentational/Spinner' import NoSource from './presentational/NoSource' @@ -19,17 +19,12 @@ class SourceOverlay extends React.Component { renderVideo() { return ( - -
-
- -
-
- - -
-
-
+
+ +
) } diff --git a/src/scss/main.scss b/src/scss/main.scss index e7ad5e1..4d9ded2 100644 --- a/src/scss/main.scss +++ b/src/scss/main.scss @@ -15,3 +15,4 @@ @import 'infopopup'; @import 'notification'; @import 'scene'; +@import 'mediaplayer'; diff --git a/src/scss/mediaoverlay.scss b/src/scss/mediaoverlay.scss index ba07555..68dd676 100644 --- a/src/scss/mediaoverlay.scss +++ b/src/scss/mediaoverlay.scss @@ -1,5 +1,5 @@ $panel-width: 800px; -$panel-height: 800px; +$panel-height: 700px; $vimeo-width: $panel-width - 100; $vimeo-height: $panel-height / 2; @@ -61,11 +61,12 @@ $header-inset: 10px; flex: 1; display: flex; justify-content: center; + align-items: center; } } .mo-media-container { - padding-top: 3*$header-inset; + // padding-top: 3*$header-inset; font-family: "Lato", Helvetica, sans-serif; // max-height: $vimeo-height; min-width: 100%; diff --git a/src/scss/mediaplayer.scss b/src/scss/mediaplayer.scss new file mode 100644 index 0000000..1d29d6c --- /dev/null +++ b/src/scss/mediaplayer.scss @@ -0,0 +1 @@ +@import '~video-react/styles/scss/video-react'; diff --git a/yarn.lock b/yarn.lock index 917087e..a455221 100644 --- a/yarn.lock +++ b/yarn.lock @@ -1532,7 +1532,7 @@ class-utils@^0.3.5: isobject "^3.0.0" static-extend "^0.1.1" -classnames@^2.2.0: +classnames@^2.2.0, classnames@^2.2.3: version "2.2.6" resolved "https://registry.yarnpkg.com/classnames/-/classnames-2.2.6.tgz#43935bffdd291f326dad0a205309b38d00f650ce" @@ -3959,6 +3959,11 @@ lodash.tail@^4.1.1: version "4.1.1" resolved "https://registry.yarnpkg.com/lodash.tail/-/lodash.tail-4.1.1.tgz#d2333a36d9e7717c8ad2f7cacafec7c32b444664" +lodash.throttle@^4.1.1: + version "4.1.1" + resolved "https://registry.yarnpkg.com/lodash.throttle/-/lodash.throttle-4.1.1.tgz#c23e91b710242ac70c37f1e1cda9274cc39bf2f4" + integrity sha1-wj6RtxAkKscMN/HhzaknTMOb8vQ= + lodash@^4.0.0, lodash@^4.17.10, lodash@^4.17.3, lodash@^4.17.5, lodash@^4.2.0, lodash@^4.2.1, lodash@~4.17.10: version "4.17.11" resolved "https://registry.yarnpkg.com/lodash/-/lodash-4.17.11.tgz#b39ea6229ef607ecd89e2c8df12536891cac9b8d" @@ -3973,7 +3978,7 @@ loglevel@^1.4.1: version "1.6.1" resolved "https://registry.yarnpkg.com/loglevel/-/loglevel-1.6.1.tgz#e0fc95133b6ef276cdc8887cdaf24aa6f156f8fa" -loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1: +loose-envify@^1.0.0, loose-envify@^1.1.0, loose-envify@^1.3.1, loose-envify@^1.4.0: version "1.4.0" resolved "https://registry.yarnpkg.com/loose-envify/-/loose-envify-1.4.0.tgz#71ee51fa7be4caec1a63839f7e682d8132d30caf" dependencies: @@ -4967,7 +4972,7 @@ promise-inflight@^1.0.1: version "1.0.1" resolved "https://registry.yarnpkg.com/promise-inflight/-/promise-inflight-1.0.1.tgz#98472870bf228132fcbdd868129bad12c3c029e3" -prop-types@15.6.2, prop-types@^15.5.0, prop-types@^15.5.10, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2: +prop-types@15.6.2, prop-types@^15.5.0, prop-types@^15.5.7, prop-types@^15.5.8, prop-types@^15.6.0, prop-types@^15.6.2: version "15.6.2" resolved "https://registry.yarnpkg.com/prop-types/-/prop-types-15.6.2.tgz#05d5ca77b4453e985d60fc7ff8c859094a497102" dependencies: @@ -5102,12 +5107,6 @@ react-image@^1.5.1: "@babel/runtime" "^7.0.0" prop-types "15.6.2" -react-media-player@^0.7.5: - version "0.7.5" - resolved "https://registry.yarnpkg.com/react-media-player/-/react-media-player-0.7.5.tgz#4ada5cba5814d1121a8690ba89e520e5d5210975" - dependencies: - prop-types "^15.5.10" - react-portal@^4.2.0: version "4.2.0" resolved "https://registry.yarnpkg.com/react-portal/-/react-portal-4.2.0.tgz#5400831cdb0ae64dccb8128121cf076089ab1afd" @@ -5242,6 +5241,14 @@ redux@^3.6.0: loose-envify "^1.1.0" symbol-observable "^1.0.3" +redux@^4.0.0: + version "4.0.1" + resolved "https://registry.yarnpkg.com/redux/-/redux-4.0.1.tgz#436cae6cc40fbe4727689d7c8fae44808f1bfef5" + integrity sha512-R7bAtSkk7nY6O/OYMVR9RiBI+XghjF9rlbl5806HJbQph0LJVHZrU5oaO4q70eUKiqMRqm4y07KLTlMZ2BlVmg== + dependencies: + loose-envify "^1.4.0" + symbol-observable "^1.2.0" + regenerate-unicode-properties@^7.0.0: version "7.0.0" resolved "https://registry.yarnpkg.com/regenerate-unicode-properties/-/regenerate-unicode-properties-7.0.0.tgz#107405afcc4a190ec5ed450ecaa00ed0cafa7a4c" @@ -6013,7 +6020,7 @@ symbol-observable@^0.2.2: version "0.2.4" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-0.2.4.tgz#95a83db26186d6af7e7a18dbd9760a2f86d08f40" -symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.0.4, symbol-observable@^1.1.0: +symbol-observable@^1.0.2, symbol-observable@^1.0.3, symbol-observable@^1.0.4, symbol-observable@^1.1.0, symbol-observable@^1.2.0: version "1.2.0" resolved "https://registry.yarnpkg.com/symbol-observable/-/symbol-observable-1.2.0.tgz#c22688aed4eab3cdc2dfeacbb561660560a00804" @@ -6393,6 +6400,16 @@ verror@1.10.0: core-util-is "1.0.2" extsprintf "^1.2.0" +video-react@^0.13.1: + version "0.13.1" + resolved "https://registry.yarnpkg.com/video-react/-/video-react-0.13.1.tgz#5d0dc68748f9b12e118beea1998d6ae5f6cbd6ba" + integrity sha512-AeGSpddfHv0UxeJztWUALYEjCdzXM1QdtQ5GD1VUd3vxcgwgIfB7EzFKcewRevSHHK8TDmjNksbvbWRobF/QeA== + dependencies: + classnames "^2.2.3" + lodash.throttle "^4.1.1" + prop-types "^15.5.8" + redux "^4.0.0" + video.js@^5.19.2: version "5.20.5" resolved "http://registry.npmjs.org/video.js/-/video.js-5.20.5.tgz#445cdae204bce459782d86a31b25a32afd6d8eff"