Merge pull request #33 from Permissionless-Software-Foundation/dh-profile-changes

feat(nostr): Refactored profile page

src/components/app-body/index.js

@@ -24,7 +24,7 @@ import SweepWif from './sweep/index.js'
 import SignMessage from './sign/index.js'
 import ServerSelectView from './configuration/select-server-view'
 import NostrPost from './nostr/nostr-post/index.js'
-import NostrRead from './nostr/nostr-read/index.js'
+import Profile from './nostr/profile/index.js'
 import GlobalFeed from './nostr/global-feed/index.js'
 import ContentCreators from './nostr/content-creators/index.js'
 import UserDataReview from './user-data-review'
@@ -49,7 +49,7 @@ function AppBody (props) {
         <Route path='/sign' element={<SignMessage appData={appData} />} />
         <Route path='/configuration' element={<ServerSelectView appData={appData} />} />
         <Route path='/nostr-post' element={<NostrPost appData={appData} />} />
-        <Route path='/nostr-read' element={<NostrRead appData={appData} />} />
+        <Route path='/profile/:npub' element={<Profile appData={appData} />} />
         <Route path='/global-feed' element={<GlobalFeed appData={appData} />} />
         <Route path='/content-creators' element={<ContentCreators appData={appData} />} />
         <Route path='/user-data/:tokenId' element={<UserDataReview appData={appData} />} />

src/components/app-body/nostr/content-creators/content-card.js

@@ -45,26 +45,31 @@ function ContentCard (props) {
     }
   }, [loaded, creator])
 
+  const goToProfile = () => {
+    const profileUrl = `${window.location.origin}/profile/${creator.npub}`
+    window.open(profileUrl, '_blank')
+  }
+
   return (
 
     <>
       <Card className='mb-4 bg-light rounded-4 shadow-sm border-0'>
         <Card.Body className='p-4'>
           {/* Desktop Layout - Horizontal */}
-          <div className='d-flex justify-content-end mb-2'>
+          <div className='d-flex justify-content-end mb-2' onClick={goToProfile}>
             <small className='text-muted'>
               {new Date(creator.createdAt).toLocaleString()}
             </small>
           </div>
-          <div className='d-none d-md-flex align-items-center gap-4'>
+          <div className='d-none d-md-flex align-items-center gap-4 cursor-pointer'>
             {/* Profile Picture */}
-            <div className='flex-shrink-0'>
+            <div className='flex-shrink-0' onClick={goToProfile}>
               <Jdenticon size='140' value={creator.npub} />
             </div>
 
             {/* Creator Info */}
             <div className='flex-grow-1'>
-              <h5 className='mb-2 fw-bold'>{profile.name}</h5>
+              <h5 className='mb-2 fw-bold cursor-pointer' onClick={goToProfile}>{profile.name}</h5>
               <p className='text-muted medium mb-3'>{profile.about}</p>
 
               {/* Nostr Public Key */}
@@ -112,6 +117,7 @@ function ContentCard (props) {
                 refreshFollowList={refreshFollowList}
 
               />
+
               <button
                 className='btn btn-primary btn-sm rounded-pill px-3'
                 style={{ fontSize: '0.875rem', minWidth: '100px' }}
@@ -119,6 +125,8 @@ function ContentCard (props) {
                 <i className='bi bi-chat-dots me-1' />
                 Message
               </button>
+
+              <small>Followers: {creator.followerCnt}</small>
             </div>
           </div>
 
@@ -126,12 +134,12 @@ function ContentCard (props) {
           <div className='d-flex d-md-none flex-column align-items-center text-center'>
             {/* Profile Picture */}
             <div className='mb-3'>
-              <Jdenticon size='100' value={creator.npub} />
+              <Jdenticon size='100' value={creator.npub} onClick={goToProfile} />
             </div>
 
             {/* Creator Info */}
             <div className='w-100 mb-3'>
-              <h5 className='mb-2 fw-bold'>{profile.name}</h5>
+              <h5 className='mb-2 fw-bold' onClick={goToProfile}>{profile.name}</h5>
               <p className='text-muted small mb-3'>{profile.about}</p>
 
               {/* Nostr Public Key */}

src/components/app-body/nostr/content-creators/content-creators-list.js

@@ -1,5 +1,5 @@
 import React, { useState, useEffect, useCallback } from 'react'
-import { Container, Spinner } from 'react-bootstrap'
+import { Container, Spinner, Form } from 'react-bootstrap'
 
 import axios from 'axios'
 // Local libraries
@@ -70,10 +70,19 @@ function ContentCreators (props) {
       <div className='mb-4'>
         <h2 className='text-center mb-3'>Content Creators</h2>
         <p className='text-center text-muted'>
-          Discover amazing content creators in the Bitcoin Cash ecosystem
+          Discover amazing creators tokenizing their content.
         </p>
       </div>
 
+      <div className='mb-4'>
+        <h3>Filters</h3>
+        <Form.Select>
+          <option>Most Followers</option>
+          <option>Most Tokens</option>
+          <option>Most Likes</option>
+        </Form.Select>
+      </div>
+
       {!loaded && (
         <div className='text-center text-muted py-5 bg-light rounded-4 shadow-sm'>
           <Spinner animation='border' />

src/components/app-body/nostr/nostr-read/index.js

@@ -1,23 +0,0 @@
-/*
-Component for read nostr information.
-*/
-
-// Global npm libraries
-import React, { useState } from 'react'
-import { Container } from 'react-bootstrap'
-import ProfileRead from './profile-read.js'
-import PublicRead from './public-read.js'
-
-function NostrRead (props) {
-  const [profile, setProfile] = useState(false)
-  return (
-    <>
-      <Container>
-        <ProfileRead {...props} setProfile={setProfile} />
-        <PublicRead {...props} profile={profile} />
-      </Container>
-    </>
-  )
-}
-
-export default NostrRead

src/components/app-body/nostr/nostr-read/public-read.js

@@ -1,97 +0,0 @@
-/**
- *  Component for read nostr information kind 1
- */
-// Global npm libraries
-import React, { useEffect, useState } from 'react'
-import { Container, Card, Spinner } from 'react-bootstrap'
-import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
-import { faUser } from '@fortawesome/free-solid-svg-icons'
-import NostrFormat from '../nostr-format'
-import { RelayPool } from 'nostr'
-
-function PublicRead (props) {
-  const { bchWalletState } = props.appData
-  const [posts, setPosts] = useState([])
-  const [loaded, setLoaded] = useState(false)
-
-  useEffect(() => {
-    // Get Last post from a author
-    const start = () => {
-      const { nostrKeyPair } = bchWalletState
-
-      const psf = 'wss://nostr-relay.psfoundation.info'
-
-      const pool = RelayPool([psf])
-      pool.on('open', relay => {
-        relay.subscribe('subid', { limit: 5, kinds: [1], authors: [nostrKeyPair.pubHex] })
-      })
-
-      pool.on('eose', relay => {
-        console.log('Closing Relay')
-        setLoaded(true)
-        relay.close()
-      })
-
-      pool.on('event', (relay, subId, ev) => {
-        console.log('Received event:', ev)
-        setPosts(currentPosts => [...currentPosts, ev])
-      })
-    }
-
-    if (!loaded) {
-      start()
-    }
-  }, [bchWalletState, loaded])
-
-  return (
-    <Container className='mt-4'>
-      <div>
-        {posts.map((post, index) => (
-          <Card key={index} className='mb-4 bg-light rounded-4 shadow-sm border-0'>
-            <Card.Body className='p-3'>
-              <div className='d-flex align-items-center gap-3 mb-3'>
-                <div
-                  className='rounded-circle bg-gradient shadow d-flex align-items-center justify-content-center'
-                  style={{
-                    width: '48px',
-                    height: '48px',
-                    background: 'linear-gradient(45deg, #6c757d, #495057)'
-                  }}
-                >
-                  <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' />
-                </div>
-                <div className='flex-grow-1'>
-                  <div className='fw-bold mb-1'>{props.profile?.name}</div>
-                  <small className='text-muted'>
-                    {`${bchWalletState.nostrKeyPair.npub.slice(0, 8)}...${bchWalletState.nostrKeyPair.npub.slice(-5)}`}
-                  </small>
-                </div>
-                <small className='text-muted'>
-                  {new Date(post.created_at * 1000).toLocaleString()}
-                </small>
-              </div>
-              <div className='mb-4'>
-                <div className='fs-5 ms-5 text-dark' style={{ lineHeight: '1.3' }}>
-                  <NostrFormat content={post.content} />
-                </div>
-              </div>
-            </Card.Body>
-          </Card>
-        ))}
-        {!posts.length && loaded && (
-          <div className='text-center text-muted py-5 bg-light rounded-4 shadow-sm'>
-            <i className='bi bi-inbox-fill fs-1 mb-3 d-block opacity-50' />
-            <div>No posts found</div>
-          </div>
-        )}
-        {!loaded && (
-          <div className='text-center text-muted py-5 bg-light rounded-4 shadow-sm'>
-            <Spinner animation='border' />
-          </div>
-        )}
-      </div>
-    </Container>
-  )
-}
-
-export default PublicRead

src/components/app-body/nostr/profile/index.js

@@ -0,0 +1,28 @@
+/*
+Component for read nostr information.
+*/
+
+// Global npm libraries
+import React, { useState } from 'react'
+import { Container } from 'react-bootstrap'
+import ProfileRead from './profile-read.js'
+import PublicRead from './public-read.js'
+import { useParams } from 'react-router-dom'
+import SlpTokensDisplay from './slp-tokens-display'
+
+function Profile (props) {
+  const [profile, setProfile] = useState(false)
+  const { npub } = useParams()
+  console.log('npub', npub)
+  return (
+    <>
+      <Container>
+        <ProfileRead {...props} setProfile={setProfile} npub={npub} />
+        <PublicRead {...props} profile={profile} npub={npub} />
+        <SlpTokensDisplay {...props} npub={npub} />
+      </Container>
+    </>
+  )
+}
+
+export default Profile

src/components/app-body/nostr/profile/profile-read.js

@@ -9,21 +9,27 @@ import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser } from '@fortawesome/free-solid-svg-icons'
 import NostrFormat from '../nostr-format'
 import { RelayPool } from 'nostr'
+import * as nip19 from 'nostr-tools/nip19'
 
 function ProfileRead (props) {
+  const { npub } = props
   const { bchWalletState } = props.appData
+  console.log('npub prop', npub)
   const { setProfile } = props
   const [post, setPost] = useState({})
   const [loaded, setLoaded] = useState(false)
 
   useEffect(() => {
     const start = () => {
-      const { nostrKeyPair } = bchWalletState
+      const pubHexData = nip19.decode(npub)
+      const pubHex = pubHexData.data
+      console.log('pubhex', pubHex)
       const psf = 'wss://nostr-relay.psfoundation.info'
 
       const pool = RelayPool([psf])
       pool.on('open', relay => {
-        relay.subscribe('subid', { limit: 5, kinds: [0], authors: [nostrKeyPair.pubHex] })
+        relay.subscribe('subid', { limit: 5, kinds: [0], authors: [pubHex] })
+        setLoaded(true)
       })
 
       pool.on('eose', relay => {
@@ -42,10 +48,10 @@ function ProfileRead (props) {
       setLoaded(true)
     }
 
-    if (!loaded) {
+    if (!loaded && npub) {
       start()
     }
-  }, [bchWalletState, loaded, setProfile])
+  }, [bchWalletState, loaded, setProfile, npub])
 
   return (
     <Container>

src/components/app-body/nostr/profile/public-read.js

@@ -0,0 +1,114 @@
+/**
+ *  Component for read nostr information kind 1
+ */
+// Global npm libraries
+import React, { useEffect, useState } from 'react'
+import { Container, Card, Spinner } from 'react-bootstrap'
+import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
+import { faUser } from '@fortawesome/free-solid-svg-icons'
+import NostrFormat from '../nostr-format'
+import { RelayPool } from 'nostr'
+import * as nip19 from 'nostr-tools/nip19'
+
+function PublicRead (props) {
+  const { npub } = props
+  const { bchWalletState } = props.appData
+  const [posts, setPosts] = useState([])
+  const [loaded, setLoaded] = useState(false)
+
+  useEffect(() => {
+    // Get Last post from a author
+    const start = () => {
+      const pubHexData = nip19.decode(npub)
+      const pubHex = pubHexData.data
+      console.log('pubhex', pubHex)
+      const psf = 'wss://nostr-relay.psfoundation.info'
+
+      const pool = RelayPool([psf])
+      pool.on('open', relay => {
+        relay.subscribe('subid', { limit: 5, kinds: [1], authors: [pubHex] })
+        setLoaded(true)
+      })
+
+      pool.on('eose', relay => {
+        console.log('Closing Relay')
+        setLoaded(true)
+        relay.close()
+      })
+
+      pool.on('event', (relay, subId, ev) => {
+        console.log('Received event:', ev)
+        setPosts(currentPosts => [...currentPosts, ev])
+      })
+    }
+
+    if (!loaded && npub) {
+      start()
+    }
+  }, [bchWalletState, loaded, npub])
+
+  return (
+    <Container className='mt-4 mb-5'>
+      {/* Nostr Feed Section */}
+      <div className='bg-white rounded-1 shadow-sm border mb-4'>
+        <div className='p-3 border-bottom bg-light rounded-top-4'>
+          <h5 className='mb-0 fw-bold text-dark'>Nostr Feed</h5>
+        </div>
+        <div
+          className='p-3'
+          style={{
+            height: '800px',
+            overflowY: 'auto',
+            maxHeight: '800px'
+          }}
+        >
+          {posts.map((post, index) => (
+            <Card key={index} className='mb-4 bg-light rounded-4 shadow-sm border-0'>
+              <Card.Body className='p-3'>
+                <div className='d-flex align-items-center gap-3 mb-3'>
+                  <div
+                    className='rounded-circle bg-gradient shadow d-flex align-items-center justify-content-center'
+                    style={{
+                      width: '48px',
+                      height: '48px',
+                      background: 'linear-gradient(45deg, #6c757d, #495057)'
+                    }}
+                  >
+                    <FontAwesomeIcon icon={faUser} size='1x' color='#7c7c7d' />
+                  </div>
+                  <div className='flex-grow-1'>
+                    <div className='fw-bold mb-1'>{props.profile?.name}</div>
+                    <small className='text-muted'>
+                      {`${bchWalletState.nostrKeyPair.npub.slice(0, 8)}...${bchWalletState.nostrKeyPair.npub.slice(-5)}`}
+                    </small>
+                  </div>
+                  <small className='text-muted'>
+                    {new Date(post.created_at * 1000).toLocaleString()}
+                  </small>
+                </div>
+                <div className='mb-4'>
+                  <div className='fs-5 ms-5 text-dark' style={{ lineHeight: '1.3' }}>
+                    <NostrFormat content={post.content} />
+                  </div>
+                </div>
+              </Card.Body>
+            </Card>
+          ))}
+          {!posts.length && loaded && (
+            <div className='text-center text-muted py-5 bg-light rounded-4 shadow-sm'>
+              <i className='bi bi-inbox-fill fs-1 mb-3 d-block opacity-50' />
+              <div>No posts found</div>
+            </div>
+          )}
+          {!loaded && (
+            <div className='text-center text-muted py-5 bg-light rounded-4 shadow-sm'>
+              <Spinner animation='border' />
+            </div>
+          )}
+        </div>
+      </div>
+    </Container>
+  )
+}
+
+export default PublicRead

src/components/app-body/nostr/profile/slp-tokens-display.js

@@ -0,0 +1,169 @@
+/**
+ * Component for displaying SLP tokens in a grid layout
+ */
+import React, { useState, useEffect, useCallback } from 'react'
+import { Container, Row, Col, Spinner } from 'react-bootstrap'
+import config from '../../../../config'
+import axios from 'axios'
+import TokenCard from '../../slp-tokens/token-card'
+
+function SlpTokensDisplay (props) {
+  const { appData } = props
+  const { bchWalletState, wallet } = props.appData
+  const { npub } = props
+  const [loaded, setLoaded] = useState(false)
+  const [tokens, setTokens] = useState([])
+  const [iconsAreLoaded, setIconsAreLoaded] = useState(false)
+
+  // Get Cid from url
+  const parseCid = (url) => {
+    // get the cid from the url format 'ipfs://bafybeicem27xbzs65uvbcgykcmscsgln3lmhbfrcoec3gdttkdgtxv5acq
+    if (url && url.includes('ipfs://')) {
+      const cid = url.split('ipfs://')[1]
+      return cid
+    }
+    return url
+  }
+
+  // Fetch mutable data if it exist and get the token icon url
+  const fetchTokenIcon = useCallback(async (token) => {
+    try {
+      // Get the token data
+      const tokenData = await appData.wallet.getTokenData(token.tokenId)
+      if (!tokenData.mutableData) return false // Return false if no mutable data
+      // Get the token icon from the mutable data
+      const cid = parseCid(tokenData.mutableData)
+      console.log('mutable data cid', cid)
+
+      const { json } = await appData.wallet.cid2json({ cid })
+
+      if (!json) return false
+
+      const iconUrl = json.tokenIcon
+      // Return icon url
+      return iconUrl
+    } catch (error) {
+      return false
+    }
+  }, [appData])
+
+  //  This function loads the token icons from the ipfs gateways.
+  const lazyLoadTokenIcons = useCallback(async (tokenList) => {
+    try {
+      setIconsAreLoaded(false)
+
+      // map each token and fetch the icon url
+      for (let i = 0; i < tokenList.length; i++) {
+        try {
+          const thisToken = tokenList[i]
+
+          // Incon does not  need to be downloaded, so continue with the next one
+          if (thisToken.iconAlreadyDownloaded) continue
+
+          // Try to get token icon url from mutable data.
+          const iconUrl = await fetchTokenIcon(thisToken)
+          console.log('iconUrl', iconUrl)
+          if (iconUrl) {
+            // Set the icon url to the token , this can be used to display the icon in the token card component.
+            thisToken.icon = iconUrl
+          }
+
+          // Mark token to prevent fetch token icon again.
+          thisToken.iconAlreadyDownloaded = true
+          // replace the token in the tokens array
+          const updatedTokens = [...tokenList]
+          updatedTokens[i] = thisToken
+          setTokens(updatedTokens)
+        } catch (error) {
+          continue
+        }
+      }
+
+      setIconsAreLoaded(true)
+    } catch (error) {
+      console.warn(error)
+      setIconsAreLoaded(true)
+    }
+  }, [fetchTokenIcon, setTokens])
+
+  useEffect(() => {
+    // setTokens(bchWalletState.slpTokens || [])
+    const getTokens = async () => {
+      try {
+        const { nostrKeyPair } = bchWalletState
+        if (nostrKeyPair.npub === npub) {
+          setTokens(bchWalletState.slpTokens)
+          setLoaded(true)
+          return
+        }
+        setLoaded(false)
+        const url = `${config.dexServer}/sm/npub/${npub}`
+        const response = await axios.get(url)
+        console.log('response', response.data)
+        const addr = response.data.bchAddr
+
+        const tokenList = await wallet.listTokens(addr)
+        setTokens(tokenList)
+        // setTokens(response.data)
+        setLoaded(true)
+
+        lazyLoadTokenIcons(tokenList)
+      } catch (error) {
+        console.error('Error fetching tokens:', error)
+        setLoaded(true)
+      }
+    }
+    if (!loaded) {
+      getTokens()
+    }
+  }, [bchWalletState, npub, loaded, lazyLoadTokenIcons, wallet])
+
+  return (
+    <Container>
+      {!loaded && (
+        <div className='d-flex justify-content-center align-items-center h-100 mb-4'>
+          <Spinner />
+        </div>
+      )}
+      {loaded && tokens.length !== 0 &&
+        <div className='bg-white rounded-1 shadow-sm border mb-4'>
+          <div className='p-3 border-bottom bg-light rounded-top-4'>
+            <h5 className='mb-0 fw-bold text-dark'>SLP Tokens</h5>
+          </div>
+          <div
+            className='p-3'
+            style={{
+              height: '800px',
+              overflowY: 'auto',
+              maxHeight: '800px'
+            }}
+          >
+            <Row>
+              {!iconsAreLoaded &&
+                <Col xs={12} style={{ display: 'flex', justifyContent: 'center', alignItems: 'center' }}>
+                  <div style={{ borderRadius: '10px', backgroundColor: '#f0f0f0', padding: '10px', display: 'flex', justifyContent: 'center', alignItems: 'center', width: 'fit-content' }}>
+                    <span style={{ marginRight: '10px' }}>Loading Token Icons </span>
+                    <Spinner animation='border' />
+                  </div>
+
+                </Col>}
+
+              {tokens.map(thisToken => (
+                <TokenCard
+                  appData={appData}
+                  token={thisToken}
+                  key={`${thisToken.tokenId}`}
+                  refreshTokens={() => { }}
+                  hideSendBtn
+                />
+              ))}
+
+            </Row>
+
+          </div>
+        </div>}
+    </Container>
+  )
+}
+
+export default SlpTokensDisplay

src/components/app-body/slp-tokens/token-card.js

@@ -12,7 +12,7 @@ import InfoButton from './info-button'
 import SendTokenButton from './send-token-button'
 
 function TokenCard (props) {
-  const { token } = props
+  const { token, hideSendBtn } = props
   const [icon, setIcon] = useState(token.icon)
 
   // Update icon state every token.icon changes
@@ -64,13 +64,15 @@ function TokenCard (props) {
                 <Col>
                   <InfoButton token={props.token} />
                 </Col>
-                <Col>
-                  <SendTokenButton
-                    token={props.token}
-                    appData={props.appData}
-                    refreshTokens={props.refreshTokens}
-                  />
-                </Col>
+                {!hideSendBtn && (
+                  <Col>
+                    <SendTokenButton
+                      token={props.token}
+                      appData={props.appData}
+                      refreshTokens={props.refreshTokens}
+                    />
+                  </Col>
+                )}
               </Row>
             </Container>
           </Card.Body>

src/components/nav-menu/index.js

@@ -15,7 +15,7 @@ import Logo from './psf-logo.png'
 
 function NavMenu (props) {
   // Get the current path
-  const { currentPath } = props.appData
+  const { currentPath, bchWalletState } = props.appData
 
   // Navbar state
   const [expanded, setExpanded] = useState(false)
@@ -71,8 +71,8 @@ function NavMenu (props) {
               Nostr Post
             </NavLink>
             <NavLink
-              className={currentPath === '/nostr-read' ? 'nav-link-active' : 'nav-link-inactive'}
-              to='/nostr-read'
+              className={currentPath === '/profile' ? 'nav-link-active' : 'nav-link-inactive'}
+              to={`/profile/${bchWalletState?.nostrKeyPair?.npub}`}
               onClick={handleClickEvent}
             >
               Nostr Profile

src/config/index.js

@@ -15,6 +15,7 @@ const config = {
   radicleUrl: 'https://app.radicle.network/seeds/maple.radicle.garden/rad:git:hnrkd5cjwwb5tzx37hq9uqm5ubon7ee468xcy/remotes/hyyycncbn9qzqmobnhjq9rry6t4mbjiadzjoyhaknzxjcz3cxkpfpc',
 
   dexServer: 'https://dex-api.fullstack.cash',
+  //dexServer: 'http://localhost:5700',
 
   nostrTopic: 'bch-dex-test-topic-02',
   nostrRelay: 'wss://nostr-relay.psfoundation.info'