Merge pull request #191 from persistenceOne/websitev4

updated apr for pools
persistenceOne · Jul 25, 2022 · 1fc7f41 · 1fc7f41
2 parents 4ffedfa + c2ac834
commit 1fc7f41
Show file tree

Hide file tree

Showing 8 changed files with 62 additions and 7 deletions.
diff --git a/src/Containers/Xprt/Opportunities.js b/src/Containers/Xprt/Opportunities.js
@@ -1,8 +1,35 @@
-import React from "react";
+import React, { useEffect, useState } from 'react';
+import { percent } from "../../utils/FormatNumber";
 import osmo from "../../assets/images1/osmo.svg";
 import juno_swap from "../../assets/images1/juno_swap.svg";
+import axios from "axios";
+let poolURl = process.env.REACT_APP_POOL_DATA_URL
 
 const Opportunities = () => {
+    const [xprtOsmo, setXprtOsmo] = useState("");
+    const [xprtUsdc, setXprtUsdc] = useState("");
+    const [xprtAtom, setXprtAtom] = useState("");
+
+    useEffect(() => {
+        axios.get(`${poolURl}`)
+            .then(res => {
+                const poolsData = res.data;
+                poolsData.map(function(value){
+                    if(value && value.pool && value.pool.length && value.pool.length>=2 && value.pool[0]==='XPRT' && value.pool[1]==='OSMO'){
+                        setXprtOsmo(value.total_apr) ;
+                    }
+                    if(value && value.pool && value.pool.length && value.pool.length>=2 && value.pool[0]==='XPRT' && value.pool[1]==='USDC'){
+                        setXprtUsdc(value.total_apr);
+                    }
+                    if(value && value.pool && value.pool.length && value.pool.length>=2 && value.pool[0]==='ATOM' && value.pool[1]==='XPRT'){
+                        setXprtAtom(value.total_apr);
+                    }
+                    return false;
+                });
+            })
+
+
+    }, []);
     return (
         <section className="opportunities-section">
             <div className="container">
@@ -57,7 +84,7 @@ const Opportunities = () => {
                                         <img src={osmo} alt="osmo" />
                                     </p>
                                     <p className="sub-title">XPRT/USDC Pool</p>
-                                    <p className="apr">~230% <span className="apr-text">APR</span></p>
+                                    <p className="apr">{percent(xprtUsdc)} <span className="apr-text">APR</span></p>
                                     <div className="buttons">
                                         <a href="https://app.osmosis.zone/pool/719" target="_blank" rel="noopener noreferrer" className="primary">
                                             Provide Liquidity
@@ -72,7 +99,7 @@ const Opportunities = () => {
                                     </p>
                                     <p className="sub-title">XPRT/ATOM Pool</p>
 
-                                    <p className="apr">~50% <span className="apr-text">APR</span></p>
+                                    <p className="apr">{percent(xprtAtom)}<span className="apr-text">APR</span></p>
                                     <div className="buttons">
                                         <a href="https://app.osmosis.zone/pool/13" target="_blank" rel="noopener noreferrer" className="primary">
                                             Provide Liquidity
@@ -88,7 +115,7 @@ const Opportunities = () => {
                                         <img src={osmo} alt="osmo" />
                                     </p>
                                     <p className="sub-title">XPRT/OSMO Pool</p>
-                                    <p className="apr">~45% <span className="apr-text">APR</span></p>
+                                    <p className="apr">{percent(xprtOsmo)} <span className="apr-text">APR</span></p>
                                     <div className="buttons">
                                         <a href="https://app.osmosis.zone/pool/15" target="_blank" rel="noopener noreferrer" className="primary">
                                             Provide Liquidity
@@ -111,6 +138,11 @@ const Opportunities = () => {
                                     </div>
                                 </div>
                             </div>
+                            <div className={"col-md-12 text-right datasource"}>
+                                <p className={"text-right"}>Data Source: <a href={'http://imperator.co/'}>Imperator.co
+                                </a></p>
+
+                            </div>
                         </div>
                     </div>
                 </div>

diff --git a/src/assets/scss/mediaqueries/_hompage.scss b/src/assets/scss/mediaqueries/_hompage.scss
@@ -118,6 +118,7 @@
     padding: 70px 0;
   }
   .home-ecosystem-section .boxes{
+
     .box{
       justify-content: center !important;
       .box-body{

diff --git a/src/assets/scss/style.css b/src/assets/scss/style.css
diff --git a/src/assets/scss/style.css.map b/src/assets/scss/style.css.map
diff --git a/src/assets/scss/views/_homepage.scss b/src/assets/scss/views/_homepage.scss
@@ -1116,8 +1116,11 @@
     display: block;
     .card-group{
       .card{
+        background-color: #fff;
         .card-section{
           background: #fff;
+          width: auto;
+          margin: 0;
           .card-body{
             .button-section.cards-buttons{
               display: flex;

diff --git a/src/assets/scss/views/_xprt.scss b/src/assets/scss/views/_xprt.scss
@@ -213,7 +213,14 @@
       //  background-color: #ccc;
       //}
       .boxes{
-        //display: flex;
+        .datasource {
+          p{
+            color: #A6A6A6;
+            a{
+              color: #007bff;
+            }
+          }
+        }
 
 
         .box{

diff --git a/src/components/layout/Header.js b/src/components/layout/Header.js
@@ -309,7 +309,7 @@ const Header = () => {
                             </div>
                         </NavDropdown>
                         <Nav.Link className="nav-link dropdown-toggle" rel="noopener noreferrer"
-                                  target="_blank" href="https://medium.com/persistence-blog"
+                                  target="_blank" href="http://blog.persistence.one/"
                                  data-toggle="dropdown" aria-haspopup="true"
                                  aria-expanded="false">
                             {t("BLOG")}

diff --git a/src/utils/FormatNumber.js b/src/utils/FormatNumber.js
@@ -0,0 +1 @@
+export const percent = (n: number): string => (n * 100).toFixed(2) + "%";