diff --git a/src/components/molecules/Bookmarks.tsx b/src/components/molecules/Bookmarks.tsx
index a752a0dac..20be927be 100644
--- a/src/components/molecules/Bookmarks.tsx
+++ b/src/components/molecules/Bookmarks.tsx
@@ -54,13 +54,7 @@ const columns = [
name: 'Data Set',
selector: function getAssetRow(row: DDO) {
const { attributes } = row.findServiceByType('metadata')
- return (
-
- )
+ return
},
maxWidth: '45rem',
grow: 1
diff --git a/src/components/organisms/AssetContent/Byline.module.css b/src/components/organisms/AssetContent/Byline.module.css
deleted file mode 100644
index a49dcc043..000000000
--- a/src/components/organisms/AssetContent/Byline.module.css
+++ /dev/null
@@ -1,31 +0,0 @@
-.byline {
- display: inline-block;
-}
-
-@media (min-width: 40rem) {
- .bylineLinks {
- display: inline;
- }
-}
-
-.bylineLinks a {
- margin-left: calc(var(--spacer) / 3);
- color: inherit;
- font-size: var(--font-size-mini);
-}
-
-.bylineLinks a:first-child {
- margin-left: 0;
-}
-
-.bylineLinks a:hover,
-.bylineLinks a:focus {
- color: var(--brand-pink);
-}
-
-.bylineExternal {
- width: 0.6em;
- height: 0.6em;
- display: inline-block;
- fill: var(--brand-grey-light);
-}
diff --git a/src/components/organisms/AssetContent/Byline.tsx b/src/components/organisms/AssetContent/Byline.tsx
deleted file mode 100644
index 5ab932e4c..000000000
--- a/src/components/organisms/AssetContent/Byline.tsx
+++ /dev/null
@@ -1,48 +0,0 @@
-import React, { ReactElement } from 'react'
-import styles from './Byline.module.css'
-import { accountTruncate } from '../../../utils/wallet'
-import Partner from '../../atoms/Partner'
-import { ReactComponent as External } from '../../../images/external.svg'
-import { Link } from 'gatsby'
-import EtherscanLink from '../../atoms/EtherscanLink'
-import { useOcean } from '@oceanprotocol/react'
-import { useDataPartner } from '../../../hooks/useDataPartner'
-
-export default function Byline({
- owner,
- prefix
-}: {
- owner: string
- prefix?: string
-}): ReactElement {
- const { networkId } = useOcean()
- const { partner } = useDataPartner(owner)
-
- return (
-
- {prefix}
-
- {partner ? (
-
- ) : (
- owner && accountTruncate(owner)
- )}
-
-
- {' — '}
- {partner &&
- Object.entries(partner.links).map(([key, value]) => (
-
- {key}
-
- ))}
-
- Etherscan
-
-
-
- )
-}
diff --git a/src/components/organisms/AssetContent/MetaFull.tsx b/src/components/organisms/AssetContent/MetaFull.tsx
index fbd33ee54..4e161bf16 100644
--- a/src/components/organisms/AssetContent/MetaFull.tsx
+++ b/src/components/organisms/AssetContent/MetaFull.tsx
@@ -4,7 +4,7 @@ import MetaItem from './MetaItem'
import styles from './MetaFull.module.css'
import { MetadataMarket } from '../../../@types/MetaData'
import { DDO } from '@oceanprotocol/lib'
-import Byline from './Byline'
+import Publisher from '../../atoms/Publisher'
export default function MetaFull({
ddo,
@@ -18,8 +18,11 @@ export default function MetaFull({
return (
-
-
} />
+
+
}
+ />
{metadata?.additionalInformation?.categories && (
{showPricing && }
-
- {metadata?.main.author}
-
{metadata?.additionalInformation?.categories?.length && (
-
+ Published By
li article {
- margin-left: calc(var(--spacer) / 2);
- margin-right: calc(var(--spacer) / 2);
-}
-
-.assetCarousel [class='alice-carousel__dots'] {
- margin-top: calc(var(--spacer) / 2);
-}
-
-.assetCarousel [class*='alice-carousel__stage-item'] *,
-.assetCarousel [class*='alice-carousel__stage-item'] {
- line-height: var(--line-height);
-}
-
-.empty {
- color: var(--color-secondary);
- font-size: var(--font-size-small);
- font-style: italic;
-}
diff --git a/src/components/organisms/AssetQueryCarousel.tsx b/src/components/organisms/AssetQueryCarousel.tsx
deleted file mode 100644
index 37bc05218..000000000
--- a/src/components/organisms/AssetQueryCarousel.tsx
+++ /dev/null
@@ -1,59 +0,0 @@
-import AssetTeaser from '../molecules/AssetTeaser'
-import React from 'react'
-import { QueryResult } from '@oceanprotocol/lib/dist/node/metadatacache/MetadataCache'
-import styles from './AssetQueryCarousel.module.css'
-import { DDO } from '@oceanprotocol/lib'
-import classNames from 'classnames/bind'
-import AliceCarousel from 'react-alice-carousel'
-import 'react-alice-carousel/lib/alice-carousel.css'
-
-const cx = classNames.bind(styles)
-
-declare type AssetQueryCarouselProps = {
- queryResult: QueryResult
- className?: string
-}
-
-const responsive = {
- 0: { items: 1 },
- 600: { items: 2 },
- 1280: { items: 3 },
- 1600: { items: 4 },
- 2400: { items: 6 }
-}
-
-const AssetQueryCarousel: React.FC = ({
- queryResult,
- className
-}) => {
- const styleClasses = cx({
- assetCarousel: true,
- [className]: className
- })
-
- const items =
- queryResult?.results.length > 0
- ? queryResult.results.map((ddo: DDO) => (
-
- ))
- : [
-
- No results found.
-
- ]
-
- return (
-
- )
-}
-
-export default AssetQueryCarousel
diff --git a/src/components/pages/History/PoolShares.tsx b/src/components/pages/History/PoolShares.tsx
index 05e1e0141..b892c4658 100644
--- a/src/components/pages/History/PoolShares.tsx
+++ b/src/components/pages/History/PoolShares.tsx
@@ -28,8 +28,7 @@ const columns = [
{
name: 'Data Set',
selector: function getAssetRow(row: Asset) {
- const { owner } = row.ddo.publicKey[0]
- return
+ return
},
grow: 2
},
diff --git a/src/components/pages/Home.module.css b/src/components/pages/Home.module.css
index 8c5922f98..7491c49aa 100644
--- a/src/components/pages/Home.module.css
+++ b/src/components/pages/Home.module.css
@@ -17,19 +17,6 @@
margin-top: var(--spacer);
}
-.listPartners {
- composes: section;
-}
-
-.listPartners > div {
- background: var(--background-highlight);
- padding-top: var(--spacer);
- padding-bottom: var(--spacer);
- min-height: 360px;
- margin-left: calc(-50vw + 50%);
- margin-right: calc(-50vw + 50%);
-}
-
.loaderWrap {
display: flex;
justify-content: center;
diff --git a/src/components/pages/Home.tsx b/src/components/pages/Home.tsx
index ed1004759..66c1b6cff 100644
--- a/src/components/pages/Home.tsx
+++ b/src/components/pages/Home.tsx
@@ -8,33 +8,9 @@ import Loader from '../atoms/Loader'
import { useOcean } from '@oceanprotocol/react'
import Button from '../atoms/Button'
import Bookmarks from '../molecules/Bookmarks'
-import listPartners from '@oceanprotocol/list-datapartners'
-import Tooltip from '../atoms/Tooltip'
-import AssetQueryCarousel from '../organisms/AssetQueryCarousel'
import axios from 'axios'
import { queryMetadata } from '../../utils/aquarius'
-const partnerAccounts = listPartners
- .map((partner) => partner.accounts.join(','))
- .filter((account) => account !== '')
-
-const searchAccounts = JSON.stringify(partnerAccounts)
- .replace(/"/g, '')
- .replace(/,/g, ' OR ')
- .replace(/(\[|\])/g, '')
-
-const queryPartners = {
- page: 1,
- offset: 100,
- query: {
- nativeSearch: 1,
- query_string: {
- query: `(publicKey.owner:${searchAccounts}) -isInPurgatory:true`
- }
- },
- sort: { created: -1 }
-}
-
const queryHighest = {
page: 1,
offset: 9,
@@ -116,68 +92,12 @@ function SectionQueryResult({
}
export default function HomePage(): ReactElement {
- const { config } = useOcean()
-
- const [queryResultPartners, setQueryResultPartners] = useState()
- const [loading, setLoading] = useState(true)
-
- useEffect(() => {
- if (!config?.metadataCacheUri) return
-
- const source = axios.CancelToken.source()
-
- async function init() {
- // TODO: remove any once ocean.js has nativeSearch typings
- const queryResultPartners = await queryMetadata(
- queryPartners as any,
- config.metadataCacheUri,
- source.token
- )
- setQueryResultPartners(queryResultPartners)
- setLoading(false)
- }
- init()
-
- return () => {
- source.cancel()
- }
- }, [config?.metadataCacheUri])
-
return (
<>
-
-
- Data Partners{' '}
-
- Ocean Protocol{' '}
-
- Data Partners
-
-
- }
- />
-
- {loading ? (
-
- ) : (
- queryResultPartners && (
-
- )
- )}
- {/* */}
-
-
Bookmarks
diff --git a/src/components/templates/PageMarkdown.module.css b/src/components/templates/PageMarkdown.module.css
index 19fc7a81a..072b9dc4a 100644
--- a/src/components/templates/PageMarkdown.module.css
+++ b/src/components/templates/PageMarkdown.module.css
@@ -76,7 +76,7 @@
margin: calc(var(--spacer) * 2) auto;
max-width: 20%;
border: 0;
- border-top: 2px solid var(--brand-black);
+ border-top: 2px solid var(--border-color);
}
.content figure {
diff --git a/src/hooks/useDataPartner.ts b/src/hooks/useDataPartner.ts
deleted file mode 100644
index 7f209cb71..000000000
--- a/src/hooks/useDataPartner.ts
+++ /dev/null
@@ -1,28 +0,0 @@
-import { useEffect, useState } from 'react'
-import listPartners from '@oceanprotocol/list-datapartners'
-import { PartnerData } from '@oceanprotocol/list-datapartners/types'
-
-export function useDataPartner(
- owner?: string
-): {
- partner: PartnerData
- partnerAccounts: string[]
-} {
- const [partnerAccounts, setPartnerAccounts] = useState()
- const [partner, setPartner] = useState()
-
- useEffect(() => {
- const accounts = [] as string[]
- listPartners.map((partner) => accounts.push(...partner.accounts))
- setPartnerAccounts(accounts)
-
- if (!owner) return
-
- const partner = listPartners.filter((partner) =>
- partner.accounts.includes(owner)
- )[0]
- setPartner(partner)
- }, [owner])
-
- return { partner, partnerAccounts }
-}
diff --git a/src/images/partner.svg b/src/images/partner.svg
deleted file mode 100644
index 94b485545..000000000
--- a/src/images/partner.svg
+++ /dev/null
@@ -1,5 +0,0 @@
-
diff --git a/src/models/Profile.ts b/src/models/Profile.ts
new file mode 100644
index 000000000..e1850b445
--- /dev/null
+++ b/src/models/Profile.ts
@@ -0,0 +1,35 @@
+export interface ProfileLink {
+ name: string
+ value: string
+}
+
+export interface Profile {
+ did: string
+ name?: string
+ description?: string
+ emoji?: string
+ image?: string
+ links?: ProfileLink[]
+}
+
+export interface ResponseData3Box {
+ name: string
+ description: string
+ website: string
+ status?: 'error'
+ /* eslint-disable camelcase */
+ proof_did: string
+ proof_twitter: string
+ proof_github: string
+ /* eslint-enable camelcase */
+ emoji: string
+ job: string
+ employer: string
+ location: string
+ memberSince: string
+ image: {
+ contentUrl: {
+ [key: string]: string
+ }
+ }[]
+}
diff --git a/src/utils/profile.ts b/src/utils/profile.ts
new file mode 100644
index 000000000..5b52a69fc
--- /dev/null
+++ b/src/utils/profile.ts
@@ -0,0 +1,97 @@
+import { Profile, ProfileLink, ResponseData3Box } from '../models/Profile'
+import axios, { AxiosResponse, CancelToken } from 'axios'
+import jwtDecode from 'jwt-decode'
+import { Logger } from '@oceanprotocol/lib'
+
+// https://docs.3box.io/api/rest-api
+const apiUri = 'https://market-stats.oceanprotocol.com/api'
+const ipfsUrl = 'https://ipfs.oceanprotocol.com'
+
+function decodeProof(proofJWT: string) {
+ if (!proofJWT) return
+ const proof = jwtDecode(proofJWT) as any
+ return proof
+}
+
+function getLinks(
+ website: string,
+ twitterProof: string,
+ githubProof: string
+): ProfileLink[] {
+ // Conditionally add links if they exist
+ const links = [
+ ...(website ? [{ name: 'Website', value: website }] : []),
+ ...(twitterProof
+ ? [
+ {
+ name: 'Twitter',
+ value: decodeProof(twitterProof).claim.twitter_handle
+ }
+ ]
+ : []),
+ ...(githubProof
+ ? [{ name: 'GitHub', value: githubProof.split('/')[3] }]
+ : [])
+ ]
+
+ return links
+}
+
+function transformResponse({
+ name,
+ description,
+ website,
+ emoji,
+ image,
+ /* eslint-disable camelcase */
+ proof_twitter,
+ proof_github,
+ proof_did
+}: ResponseData3Box) {
+ /* eslint-enable camelcase */
+ const links = getLinks(website, proof_twitter, proof_github)
+
+ const profile: Profile = {
+ did: decodeProof(proof_did).iss,
+ // Conditionally add profile items if they exist
+ ...(name && { name }),
+ ...(description && { description }),
+ ...(emoji && { emoji }),
+ ...(image && {
+ image: `${ipfsUrl}/ipfs/${
+ image.map(
+ (img: { contentUrl: { [key: string]: string } }) =>
+ img.contentUrl['/']
+ )[0]
+ }`
+ }),
+ ...(links.length && { links })
+ }
+
+ return profile
+}
+
+export default async function get3BoxProfile(
+ accountId: string,
+ cancelToken: CancelToken
+): Promise {
+ try {
+ const response: AxiosResponse = await axios(
+ `${apiUri}/profile?address=${accountId}`,
+ { cancelToken }
+ )
+
+ if (
+ !response ||
+ !response.data ||
+ response.status !== 200 ||
+ response.data.status === 'error'
+ )
+ return
+
+ Logger.log(`3Box profile found for ${accountId}`, response.data)
+ const profile = transformResponse(response.data)
+ return profile
+ // eslint-disable-next-line no-empty
+ } catch (error) {}
+}
diff --git a/src/utils/wallet.ts b/src/utils/wallet.ts
index 09a0ae791..ae0144cf3 100644
--- a/src/utils/wallet.ts
+++ b/src/utils/wallet.ts
@@ -56,6 +56,7 @@ export function isDefaultNetwork(networkId: number): boolean {
}
export function accountTruncate(account: string): string {
+ if (!account) return
const middle = account.substring(6, 38)
const truncated = account.replace(middle, '…')
return truncated
+