diff --git a/client/scss/_asset-preview.scss b/client/scss/_asset-preview.scss index f420531d..a05c2a2c 100644 --- a/client/scss/_asset-preview.scss +++ b/client/scss/_asset-preview.scss @@ -1,3 +1,7 @@ +.asset-preview { + position: relative; +} + .asset-preview__image { width : 100%; padding: 0; diff --git a/client/scss/_claim-pending.scss b/client/scss/_claim-pending.scss new file mode 100644 index 00000000..906743ee --- /dev/null +++ b/client/scss/_claim-pending.scss @@ -0,0 +1,12 @@ +.claim-pending { + display: inline-block; + position: absolute; + top: 10px; + left: 10px; + padding: 5px; + border-radius: 5px; + border: 2px solid red; + color: red; + font-weight: bold; + background-color: white; +} diff --git a/client/scss/all.scss b/client/scss/all.scss index 07601eb5..8414492e 100644 --- a/client/scss/all.scss +++ b/client/scss/all.scss @@ -18,6 +18,7 @@ @import '~scss/_button'; @import '~scss/_button-primary'; @import '~scss/_button-secondary'; +@import '~scss/_claim-pending'; @import '~scss/_click-to-copy'; @import '~scss/_form-feedback'; @import '~scss/_horizontal-split'; diff --git a/client/src/components/AssetPreview/index.jsx b/client/src/components/AssetPreview/index.jsx index 13b17ef9..8c139f45 100644 --- a/client/src/components/AssetPreview/index.jsx +++ b/client/src/components/AssetPreview/index.jsx @@ -2,8 +2,14 @@ import React from 'react'; import { Link } from 'react-router-dom'; import createCanonicalLink from '../../../../utils/createCanonicalLink'; +const ClaimPending = () => { + return ( +
PENDING
+ ); +}; + const AssetPreview = ({ defaultThumbnail, claimData }) => { - const {name, fileExt, contentType, thumbnail, title} = claimData; + const {name, fileExt, contentType, thumbnail, title, pending} = claimData; const showUrl = createCanonicalLink({asset: {...claimData}}); const embedUrl = `${showUrl}.${fileExt}`; switch (contentType) { @@ -27,6 +33,7 @@ const AssetPreview = ({ defaultThumbnail, claimData }) => { return (
+<<<<<<< HEAD
{

{title}

+======= + {pending && } + {name} +

{title}

+>>>>>>> add pending marker
);