LBRYCommunity/spee.ch
1
0
Fork 0
Code Issues95 Pull requests2 Projects Releases4 Packages Wiki Activity

changed embedded urls to use /asset route

Browse source
This commit is contained in:
bill bittner 2018-07-10 13:07:50 -07:00
parent 6fe04b13ce
commit 9370dc303d
5 changed files with 9 additions and 7 deletions
client
build
components/AssetPreview
index.js
containers/AssetDisplay
view.js
src
components/AssetPreview
index.jsx
containers/AssetDisplay
view.jsx
server/views
embed.handlebars

2
client/build/components/AssetPreview/index.js
View file

@ -19,7 +19,7 @@ var AssetPreview = function AssetPreview(_ref) {
fileExt = _ref$claimData.fileExt, fileExt = _ref$claimData.fileExt,
contentType = _ref$claimData.contentType, contentType = _ref$claimData.contentType,
thumbnail = _ref$claimData.thumbnail; thumbnail = _ref$claimData.thumbnail;
var directSourceLink = "".concat(claimId, "/").concat(name, ".").concat(fileExt); var directSourceLink = "asset/".concat(name, "/").concat(claimId);
var showUrlLink = "/".concat(claimId, "/").concat(name); var showUrlLink = "/".concat(claimId, "/").concat(name);
return _react.default.createElement(_reactRouterDom.Link, { return _react.default.createElement(_reactRouterDom.Link, {
to: showUrlLink to: showUrlLink

4
client/build/containers/AssetDisplay/view.js
View file

@ -82,7 +82,7 @@ function (_React$Component) {
case 'image/gif': case 'image/gif':
return _react.default.createElement("img", { return _react.default.createElement("img", {
className: "asset-image", className: "asset-image",
src: "/".concat(claimId, "/").concat(name, ".").concat(fileExt), src: "/asset/".concat(name, "/").concat(claimId),
alt: name alt: name
}); });
@ -92,7 +92,7 @@ function (_React$Component) {
controls: true, controls: true,
poster: thumbnail poster: thumbnail
}, _react.default.createElement("source", { }, _react.default.createElement("source", {
src: "/".concat(claimId, "/").concat(name, ".").concat(fileExt) src: "/asset/".concat(name, "/").concat(claimId)
}), _react.default.createElement("p", null, "Your browser does not support the ", _react.default.createElement("code", null, "video"), " element.")); }), _react.default.createElement("p", null, "Your browser does not support the ", _react.default.createElement("code", null, "video"), " element."));
default: default:

2
client/src/components/AssetPreview/index.jsx
View file

@ -2,7 +2,7 @@ import React from 'react';
import { Link } from 'react-router-dom'; import { Link } from 'react-router-dom';
const AssetPreview = ({ defaultThumbnail, claimData: { name, claimId, fileExt, contentType, thumbnail } }) => { const AssetPreview = ({ defaultThumbnail, claimData: { name, claimId, fileExt, contentType, thumbnail } }) => {
const directSourceLink = `${claimId}/${name}.${fileExt}`; const directSourceLink = `asset/${name}/${claimId}`;
const showUrlLink = `/${claimId}/${name}`; const showUrlLink = `/${claimId}/${name}`;
return ( return (
<Link to={showUrlLink} > <Link to={showUrlLink} >

6
client/src/containers/AssetDisplay/view.jsx
View file

@ -39,7 +39,7 @@ class AssetDisplay extends React.Component {
return ( return (
<img <img
className='asset-image' className='asset-image'
src={`/${claimId}/${name}.${fileExt}`} src={`/asset/${name}/${claimId}`}
alt={name} alt={name}
/> />
); );
@ -49,7 +49,9 @@ class AssetDisplay extends React.Component {
className='asset-video' className='asset-video'
controls poster={thumbnail} controls poster={thumbnail}
> >
<source src={`/${claimId}/${name}.${fileExt}`} /> <source
src={`/asset/${name}/${claimId}`}
/>
<p>Your browser does not support the <code>video</code> element.</p> <p>Your browser does not support the <code>video</code> element.</p>
</video> </video>
); );

2
server/views/embed.handlebars
View file

@ -1 +1 @@
<video width="100%" controls src="{{host}}/{{claimId}}/{{name}}.mp4" type="video/mp4"></video> <video width="100%" controls src="{{host}}/asset/{{name}}/{{claimId}}" type="video/mp4"></video>