Merge pull request #19 from Permissionless-Software-Foundation/ct-unstable

Ct unstable

package.json

@@ -22,6 +22,7 @@
     "query-string": "7.1.1",
     "react": "19.0.0",
     "react-bootstrap": "2.10.7",
+    "react-bs-datatable": "3.15.0",
     "react-dom": "19.0.0",
     "react-markdown": "10.1.0",
     "react-router-dom": "7.1.3",

src/components/app-body/index.js

@@ -25,7 +25,9 @@ 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 GlobalFeed from './nostr/global-feed/index.js'
 import UserDataReview from './user-data-review'
+import Offers from './offers'
 function AppBody (props) {
   // Dependency injection through props
   const appData = props.appData
@@ -47,7 +49,9 @@ function AppBody (props) {
         <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='/global-feed' element={<GlobalFeed appData={appData} />} />
         <Route path='/user-data/:cid' element={<UserDataReview appData={appData} />} />
+        <Route path='/offers' element={<Offers appData={appData} />} />
       </Routes>
       {/** Show in all paths except the servers view */}
       {/* {appData.currentPath !== '/servers' && <SelectServerButton linkTo='/servers' appData={appData} />} */}

src/components/app-body/nfts-for-sale/index.js

@@ -3,11 +3,11 @@
 
    workflow:
    1. Load offers
-   2. display token cards with current offers data
+   2. Display token cards with current Offer data
    3. Load tokens data
-   4. add data to offers and update card with new data
+   4. Add data to offers and update card with new data
    5. Load tokens icons
-   6. add icons to offers and update card with new icons
+   6. Add icons to offers and update card with new icons
 */
 
 // Global npm libraries
@@ -20,6 +20,7 @@ import { faRedo } from '@fortawesome/free-solid-svg-icons'
 // Local libraries
 import config from '../../../config'
 import TokenCard from './token-card'
+
 // Global variables and constants
 const SERVER = config.dexServer
 
@@ -173,7 +174,7 @@ function NftsForSale (props) {
     }
   }, [fetchTokenMutableData, appData])
 
-  //  Check if exiist token data in the cache and add it to the tokens object
+  //  Check if token data exists in the cache and add it to the tokens object.
   const reviewNftCachedData = useCallback(async (offers) => {
     const cacheData = appData.nftForSaleCacheData
     console.log(`Token data from cache: ${JSON.stringify(cacheData, null, 2)}`)
@@ -189,7 +190,7 @@ function NftsForSale (props) {
     }
   }, [appData])
 
-  //  Check if exiist token data in the cache and add it to the tokens object
+  //  Check if token data exists in the cache and add it to the tokens object.
   const updateNFTCachedData = useCallback(async (offers) => {
     // Map all offers
     for (let i = 0; i < offers.length; i++) {
@@ -216,7 +217,7 @@ function NftsForSale (props) {
       await reviewNftCachedData(offers)
       // set state to start displaying tokens cards.
       setOffers(offers)
-      // Load tokens data for  any updates to the token data
+      // Load tokens data for any updates to the token data
       await lazyLoadTokenData(offers)
       // Load tokens icons from mutable data
       await lazyLoadMutableData(offers)

src/components/app-body/nostr/global-feed/feed.js

@@ -0,0 +1,98 @@
+/**
+ * Component for reading global nostr posts
+ */
+// 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 { RelayPool } from 'nostr'
+
+function Feed (props) {
+  const { bchWalletState } = props.appData
+  const [posts, setPosts] = useState([])
+  const [loaded, setLoaded] = useState(false)
+
+  useEffect(() => {
+    const start = () => {
+      const psf = 'wss://nostr-relay.psfoundation.info'
+
+      const pool = RelayPool([psf])
+      pool.on('open', relay => {
+        relay.subscribe('REQ', { limit: 10, kinds: [1], '#t': ['slpdex-socialmedia'] })
+      })
+
+      pool.on('eose', relay => {
+        console.log('Closing Relay')
+        setLoaded(true)
+        relay.close()
+      })
+
+      pool.on('event', (relay, subId, ev) => {
+        console.log('Received event:', ev)
+        // const profile = JSON.parse(ev.content)
+        setPosts(currentPosts => [...currentPosts, ev])
+      })
+    }
+
+    if (!loaded) {
+      start()
+    }
+  }, [bchWalletState, loaded])
+
+  return (
+    <Container className='mt-4 mb-5' style={{ marginBottom: '50px' }}>
+      <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'>
+                    {post.pubkey.slice(0, 8) + '...'}
+                  </div>
+                  <small className='text-muted'>
+                    {`${post.pubkey.slice(0, 8)}...${post.pubkey.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' }}>
+                  {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 Feed

src/components/app-body/nostr/global-feed/index.js

@@ -0,0 +1,31 @@
+/*
+Component for reading the nostr global feed.
+*/
+
+// Global npm libraries
+import React from 'react'
+import { Container } from 'react-bootstrap'
+import Feed from './feed'
+
+function GlobalFeed (props) {
+  const { appData } = props
+
+  return (
+    <>
+      <Container>
+        <h2 style={{
+          textAlign: 'center',
+          margin: '20px 0 50px 0',
+          padding: '10px',
+          borderBottom: '2px solid #ccc'
+        }}
+        >
+          Global Feed
+        </h2>
+        <Feed appData={appData} />
+      </Container>
+    </>
+  )
+}
+
+export default GlobalFeed

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

@@ -3,7 +3,7 @@
  */
 // Global npm libraries
 import React, { useEffect, useState } from 'react'
-import { Container, Card } from 'react-bootstrap'
+import { Container, Card, Spinner } from 'react-bootstrap'
 import { FontAwesomeIcon } from '@fortawesome/react-fontawesome'
 import { faUser } from '@fortawesome/free-solid-svg-icons'
 
@@ -28,6 +28,7 @@ function PublicRead (props) {
 
       pool.on('eose', relay => {
         console.log('Closing Relay')
+        setLoaded(true)
         relay.close()
       })
 
@@ -35,8 +36,6 @@ function PublicRead (props) {
         console.log('Received event:', ev)
         setPosts(currentPosts => [...currentPosts, ev])
       })
-
-      setLoaded(true)
     }
 
     if (!loaded) {
@@ -85,6 +84,11 @@ function PublicRead (props) {
             <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>
   )

src/components/app-body/offers/index.js

@@ -0,0 +1,231 @@
+/*
+  This React components downloads the active Offers from the REST API and
+  displays them in a data table.
+*/
+
+// Global npm libraries
+import React, { useState, useEffect, useCallback } from 'react'
+import { Container, Row, Col, Table, Button, Spinner } from 'react-bootstrap'
+import axios from 'axios'
+import { DatatableWrapper, TableBody, TableHeader } from 'react-bs-datatable'
+
+// Local libraries
+import config from '../../../config'
+import WaitingModal from '../../waiting-modal'
+
+// Global variables and constants
+const SERVER = `${config.dexServer}/`
+
+const TABLE_HEADERS = [
+  {
+    prop: 'ticker',
+    title: 'Ticker',
+    isFilterable: true
+  },
+  {
+    prop: 'tokenId',
+    title: 'Token ID'
+  },
+  {
+    prop: 'buyOrSell',
+    title: 'Type'
+  },
+  {
+    prop: 'smallNostrEventId',
+    title: 'Event ID'
+  },
+  {
+    prop: 'numTokens',
+    title: 'Quantity'
+  },
+  {
+    prop: 'usdPrice',
+    title: 'Price (USD)'
+  },
+  {
+    prop: 'button',
+    title: 'Action'
+  }
+]
+
+function Offers (props) {
+  const [appData] = useState(props.appData)
+  const [offers, setOffers] = useState([])
+
+  // Modal state
+  const [showModal, setShowModal] = useState(false)
+  const [modalBody, setModalBody] = useState([])
+  const [hideSpinner, setHideSpinner] = useState(false)
+  const [denyClose, setDenyClose] = useState(false)
+  const [isLoading, setIsLoading] = useState(false)
+
+  // Given a large string, it will return a string with the first and last
+  // four characters.
+  const cutString = (str) => {
+    try {
+      const subTxid = str.slice(0, 4)
+      const subTxid2 = str.slice(-4)
+      return `${subTxid}...${subTxid2}`
+    } catch (err) {
+      console.warn('Error in cutString() ', err)
+    }
+  }
+
+  // REST request to get data from avax-dex
+  const getOffers = async () => {
+    try {
+      const options = {
+        method: 'GET',
+        url: `${SERVER}offer/list/fungible/0`,
+        data: {}
+      }
+      const result = await axios.request(options)
+      return result.data
+    } catch (err) {
+      console.warn('Error in getOffers() ', err)
+    }
+  }
+
+  // Get Offer data and manipulate it for the sake of presentation.
+  const handleOffers = useCallback(async () => {
+    setIsLoading(true)
+    // Get raw offer data.
+    const offerRawData = await getOffers()
+    console.log('offerRawData: ', offerRawData)
+    if (!offerRawData || offerRawData.length === 0) {
+      setIsLoading(false)
+      setOffers([])
+      return
+    }
+    // Formatted Data
+    const formattedOffers = []
+
+    for (let i = 0; i < offerRawData.length; i++) {
+      const thisOffer = offerRawData[i]
+
+      // Get and format the token ID
+      const tokenId = thisOffer.tokenId
+      const smallTokenId = cutString(tokenId)
+      thisOffer.tokenId = (<a href={`https://token.fullstack.cash/?tokenid=${tokenId}`} target='_blank' rel='noreferrer'>{smallTokenId}</a>)
+
+      // Get and format the P2WDB ID
+      const nostrEventId = thisOffer.nostrEventId
+      const smallNostrEventId = cutString(nostrEventId)
+      thisOffer.smallNostrEventId = smallNostrEventId
+      thisOffer.button = (<Button text='Buy' variant='success' size='lg' id={nostrEventId} onClick={handleBuy}>Buy</Button>)
+
+      // thisOffer.p2wdbHash = (<a href={`https://p2wdb.fullstack.cash/entry/hash/${p2wdbHash}`} target='_blank' rel='noreferrer'>{smallP2wdbHash}</a>)
+
+      // Convert sats to BCH, and then calculate cost in USD.
+      const bchjs = appData.wallet.bchjs
+      const rateInSats = parseInt(thisOffer.rateInBaseUnit)
+      const bchCost = bchjs.BitcoinCash.toBitcoinCash(rateInSats)
+      const usdPrice = bchCost * appData.bchWalletState.bchUsdPrice
+      const priceStr = `$${usdPrice.toFixed(3)}`
+      thisOffer.usdPrice = priceStr
+
+      formattedOffers.push(thisOffer)
+    }
+
+    setOffers(formattedOffers)
+    setIsLoading(false)
+  }, [appData])
+
+  const handleBuy = async (event) => {
+    try {
+      console.log('Buy button clicked. Event: ', event)
+
+      const targetOfferEventId = event.target.id
+      console.log('targetOfferEventId: ', targetOfferEventId)
+
+      // Initialize modal
+      setShowModal(true)
+      setModalBody(['Generating Counter Offer...', '(This can take a couple minutes)'])
+      setHideSpinner(false)
+      setDenyClose(true)
+
+      const options = {
+        method: 'post',
+        url: `${SERVER}offer/take`,
+        data: {
+          nostrEventId: targetOfferEventId
+        }
+      }
+
+      const result = await axios.request(options)
+      const { eventId, noteId } = result.data
+      console.log(`Event Id : ${eventId}`)
+      console.log(`Note Id ${noteId}`)
+
+      // Add link to output
+      const newModalBody = []
+      newModalBody.push('Success!')
+      // newModalBody.push(<a href={`https://p2wdb.fullstack.cash/entry/hash/${p2wdbHash}`} target='_blank' rel='noreferrer'>P2WDB Entry</a>)
+
+      newModalBody.push('What happens next:')
+      newModalBody.push('The money has not yet left your wallet! It is still under your control.')
+      newModalBody.push('If the sellers node is online, they will accept the Counter Offer you just generated in a few minutes.')
+      newModalBody.push('If the tokens never show up, you can sweep the funds back into your wallet.')
+
+      setModalBody(newModalBody)
+      setHideSpinner(true)
+      setDenyClose(false)
+    } catch (error) {
+      console.warn('Error in handleBuy() ', error)
+      setModalBody(['Buy failed: ', error.message])
+      setHideSpinner(true)
+      setDenyClose(false)
+    }
+  }
+
+  useEffect(() => {
+    // Retrieve initial offer data
+    handleOffers()
+
+    // Get data and update the table periodically.
+    const interval = setInterval(() => {
+      handleOffers()
+    }, 30000)
+
+    // Cleanup interval on component unmount
+    return () => clearInterval(interval)
+  }, [handleOffers]) // Empty dependency array means this effect runs once on mount
+
+  const heading = 'Generating Counter Offer...'
+
+  return (
+    <>
+      {showModal && (
+        <WaitingModal
+          heading={heading}
+          body={modalBody}
+          hideSpinner={hideSpinner}
+          denyClose={denyClose}
+        />
+      )}
+      <Container>
+        <Row>
+          <Col className='text-break' style={{ textAlign: 'center' }}>
+            {!isLoading && (
+              <DatatableWrapper body={offers} headers={TABLE_HEADERS}>
+                <Table>
+                  <TableHeader />
+                  <TableBody />
+                </Table>
+              </DatatableWrapper>
+            )}
+          </Col>
+        </Row>
+        {isLoading && (
+          <Row>
+            <Col className='text-break' style={{ textAlign: 'center' }}>
+              <Spinner animation='border' />
+            </Col>
+          </Row>
+        )}
+      </Container>
+    </>
+  )
+}
+
+export default Offers

src/components/nav-menu/index.js

@@ -43,9 +43,43 @@ function NavMenu (props) {
               to='/nfts-for-sale'
               onClick={handleClickEvent}
             >
-              NFTs for Sale
+              NFTs
             </NavLink>
 
+            <NavLink
+              className={currentPath === '/offers' ? 'nav-link-active' : 'nav-link-inactive'}
+              to='/offers'
+              onClick={handleClickEvent}
+            >
+              Fungible Tokens
+            </NavLink>
+
+            <hr />
+
+            <NavLink
+              className={currentPath === '/global-feed' ? 'nav-link-active' : 'nav-link-inactive'}
+              to='/global-feed'
+              onClick={handleClickEvent}
+            >
+              Global Feed
+            </NavLink>
+            <NavLink
+              className={currentPath === '/nostr-post' ? 'nav-link-active' : 'nav-link-inactive'}
+              to='/nostr-post'
+              onClick={handleClickEvent}
+            >
+              Nostr Post
+            </NavLink>
+            <NavLink
+              className={currentPath === '/nostr-read' ? 'nav-link-active' : 'nav-link-inactive'}
+              to='/nostr-read'
+              onClick={handleClickEvent}
+            >
+              Nostr Profile
+            </NavLink>
+
+            <hr />
+
             <NavLink
               className={(currentPath === '/bch') ? 'nav-link-active' : 'nav-link-inactive'}
               to='/bch'
@@ -100,20 +134,7 @@ function NavMenu (props) {
             >
               Configuration
             </NavLink>
-            <NavLink
-              className={currentPath === '/nostr-post' ? 'nav-link-active' : 'nav-link-inactive'}
-              to='/nostr-post'
-              onClick={handleClickEvent}
-            >
-              Nostr Post
-            </NavLink>
-            <NavLink
-              className={currentPath === '/nostr-read' ? 'nav-link-active' : 'nav-link-inactive'}
-              to='/nostr-read'
-              onClick={handleClickEvent}
-            >
-              Nostr Profile
-            </NavLink>
+
           </Nav>
         </Navbar.Collapse>
       </Navbar>