more frequent data and APY

nnzo · Jan 24, 2021 · 49df9ce · 49df9ce
1 parent 3f45ad2
commit 49df9ce
Show file tree

Hide file tree

Showing 10 changed files with 23 additions and 21 deletions.
diff --git a/cloudformation.template.json b/cloudformation.template.json
@@ -1,6 +1,6 @@
 {
   "AWSTemplateFormatVersion": "2010-09-09",
-  "Description": "uniswap.info site",
+  "Description": "CheeseSwap Info",
   "Outputs": {
     "DeploymentAccessKeyId": {
       "Description": "Access key ID for deploying to the S3 bucket",
@@ -87,7 +87,7 @@
         "Tags": [
           {
             "Key": "Name",
-            "Value": "uniswap.info"
+            "Value": "info.cheeseswap.app"
           },
           {
             "Key": "Stack",
@@ -241,10 +241,10 @@
               "ResponsePagePath": "/"
             }
           ],
-          "Comment": "uniswap.info",
+          "Comment": "info.cheeseswap.app",
           "Enabled": true,
           "Aliases": [
-            "uniswap.info"
+            "info.cheeseswap.app"
           ],
           "DefaultRootObject": "index.html",
           "HttpVersion": "http2",

diff --git a/public/index.html b/public/index.html
@@ -5,8 +5,8 @@
     <link rel="shortcut icon" href="%PUBLIC_URL%/logo.png" />
     <meta name="viewport" content="width=device-width, initial-scale=1" />
     <meta name="theme-color" content="#000000" />
-    <meta name="title" content="CheeseSwap Info | BSC Exchange Data Analytics">
-    <meta name="description" content="🧀 CheeseSwap exchange swap data analytics information, Binance smart chain BSC BEP20 tokens BNB, WBNB, BUSD, CHS, BUTT, KP3RB, BTCB, ETH, DAI" />
+    <meta name="title" content="CheeseSwap Info | CheeseSwap AMM Data Analytics">
+    <meta name="description" content="🧀 CheeseSwap AMM Data Analytics app and almost realtime GraphQL powered BSC BEP20 tokens market data service with robust REST/WS API" />
     <meta name="keywords" content="cheeseswap, cheese swap info, data analytics, chs token, defi, cheese exchange, dex, binance smart chain, bep20, bsc, bnb, butt, crypto exchange" />
     <meta name="author" content="CheeseSwap">
     <link rel="manifest" href="%PUBLIC_URL%/manifest.json" />
@@ -17,7 +17,7 @@
     <meta name="twitter:image" content="%PUBLIC_URL%/twitter-card-jpg" />
     <meta name="twitter:description" content="🧀 CheeseSwap exchange swap data analytics information, Binance smart chain BSC BEP20 tokens BNB, WBNB, BUSD, CHS, BUTT, KP3RB, BTCB, ETH, DAI" />
     <meta name="twitter:card" content="summary" />
-    <meta name="twitter:title" content="CheeseSwap Info | BSC Exchange Data Analytics" />
+    <meta name="twitter:title" content="CheeseSwap Info | CheeseSwap AMM Data Analytics" />
   </head>
   <body>
     <noscript>You need to enable JavaScript to run this app.</noscript>

diff --git a/src/apollo/client.js b/src/apollo/client.js
@@ -20,7 +20,7 @@ export const healthClient = new ApolloClient({
 
 export const v1Client = new ApolloClient({
   link: new HttpLink({
-    uri: 'https://api.thegraph.com/subgraphs/name/ianlapham/uniswap'
+    uri: 'https://graph.chipsfryer.world/subgraphs/name/blockartist/cheesegraph3'
   }),
   cache: new InMemoryCache(),
   shouldBatch: true

diff --git a/src/apollo/queries.js b/src/apollo/queries.js
@@ -3,7 +3,7 @@ import { FACTORY_ADDRESS, BUNDLE_ID } from '../constants'
 
 export const SUBGRAPH_HEALTH = gql`
   query health {
-    indexingStatusForCurrentVersion(subgraphName: "blockartist/cheesegraph3") {
+    indexingStatusForCurrentVersion(subgraphName: "cheesegraph3") {
       synced
       health
       chains {

diff --git a/src/components/DoubleLogo/index.js b/src/components/DoubleLogo/index.js
@@ -2,7 +2,7 @@ import React from 'react'
 import styled from 'styled-components'
 import TokenLogo from '../TokenLogo'
 
-export default function DoubleTokenLogo({ a0, a1, size = 24, margin = false }) {
+export default function DoubleTokenLogo({ a0, a1, size = 26, margin = false }) {
   const TokenWrapper = styled.div`
     position: relative;
     display: flex;
@@ -12,14 +12,14 @@ export default function DoubleTokenLogo({ a0, a1, size = 24, margin = false }) {
 
   const HigherLogo = styled(TokenLogo)`
     z-index: 2;
-    background-color: white;
+    background-color: none;
     border-radius: 50%;
   `
 
   const CoveredLogo = styled(TokenLogo)`
     position: absolute;
     left: ${({ sizeraw }) => (sizeraw / 2).toString() + 'px'};
-    background-color: white;
+    background-color: none;
     border-radius: 50%;
   `
 

diff --git a/src/components/Footer/index.js b/src/components/Footer/index.js
@@ -6,7 +6,7 @@ import Link from '../Link'
 const links = [
   { url: 'https://cheeseswap.app', text: 'About' },
   { url: 'https://docs.cheeseswap.app/', text: 'Docs' },
-  { url: 'https://github.com/cheesemakerfarm/cheeseswap-info', text: 'Code' }
+  { url: 'https://github.com/cheeseswapbsc/cheeseswap-info', text: 'Github' }
 ]
 
 const FooterLink = ({ children, ...rest }) => (

diff --git a/src/components/FormattedName/index.js b/src/components/FormattedName/index.js
@@ -12,7 +12,7 @@ const TextWrapper = styled.div`
     cursor: pointer;
   }
 
-  @media screen and (max-width: 600px) {
+  @media screen and (max-width: 800px) {
     font-size: ${({ adjustSize }) => adjustSize && '16px'};
   }
 `

diff --git a/src/components/GlobalChart/index.js b/src/components/GlobalChart/index.js
@@ -91,12 +91,12 @@ const GlobalChart = ({ display }) => {
             title="Liquidity"
             field="totalLiquidityUSD"
             width={width}
-            type={CHART_TYPES.AREA}
+            type={CHART_TYPES.BAR}
           />
         </ResponsiveContainer>
       )}
       {chartDataFiltered && chartView === CHART_VIEW.VOLUME && (
-        <ResponsiveContainer aspect={60 / 28}>
+        <ResponsiveContainer aspect={60 / 28} ref={ref}>
           <TradingViewChart
             data={chartDataFiltered}
             base={volumeWindow === VOLUME_WINDOW.WEEKLY ? oneWeekVolume : oneDayVolumeUSD}

diff --git a/src/components/GlobalStats/index.js b/src/components/GlobalStats/index.js
@@ -5,7 +5,7 @@ import { useMedia } from 'react-use'
 import { useGlobalData, useEthPrice } from '../../contexts/GlobalData'
 import { formattedNum, localNumber } from '../../utils'
 
-//import UniPrice from '../UniPrice'
+import UniPrice from '../UniPrice'
 import { TYPE } from '../../Theme'
 
 const Header = styled.div`
@@ -48,7 +48,7 @@ export default function GlobalStats() {
               style={{ position: 'relative' }}
             >
               BNB Price: <Medium>{formattedEthPrice}</Medium>
-              {/* {showPriceCard && <UniPrice />} */}
+              {showPriceCard && <UniPrice />}
             </TYPE.main>
           )}
 

diff --git a/src/components/PairList/index.js b/src/components/PairList/index.js
@@ -112,10 +112,11 @@ const FIELD_TO_VALUE = {
   [SORT_FIELD.LIQ]: 'trackedReserveUSD', // sort with tracked volume only
   [SORT_FIELD.VOL]: 'oneDayVolumeUSD',
   [SORT_FIELD.VOL_7DAYS]: 'oneWeekVolumeUSD',
-  [SORT_FIELD.FEES]: 'oneDayVolumeUSD'
+  [SORT_FIELD.FEES]: 'oneDayVolumeUSD',
+  [SORT_FIELD.APY]: 'apy'
 }
 
-function PairList({ pairs, color, disbaleLinks, maxItems = 10 }) {
+function PairList({ pairs, color, disbaleLinks, maxItems = 15 }) {
   const below600 = useMedia('(max-width: 600px)')
   const below740 = useMedia('(max-width: 740px)')
   const below1080 = useMedia('(max-width: 1080px)')
@@ -173,9 +174,10 @@ function PairList({ pairs, color, disbaleLinks, maxItems = 10 }) {
           </DataText>
           <DataText area="liq">{liquidity}</DataText>
           <DataText area="vol">{volume}</DataText>
+          <DataText area="apy">{apy}</DataText>
           {!below1080 && <DataText area="volWeek">{formattedNum(pairData.oneWeekVolumeUSD, true)}</DataText>}
           {!below1080 && <DataText area="fees">{formattedNum(pairData.oneDayVolumeUSD * 0.003, true)}</DataText>}
-          {!below1080 && <DataText area="apy">{apy}</DataText>}
+          {!below1080 && <DataText area="apy">{formattedPercent((pairData.oneDayVolumeUSD * 0.003 * 365 * 100,) / pairData.reserveUSD, true)}</DataText>}
         </DashGrid>
       )
     } else {