From 57a15cda5850846f1cfa2e24bf239dd70c93fc7d Mon Sep 17 00:00:00 2001 From: aauspicious <18437980785@163.com> Date: Sun, 27 Sep 2020 12:27:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20=E6=96=B0=E5=A2=9E=20FarmItem=E7=BB=84?= =?UTF-8?q?=E4=BB=B6?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .gitignore | 1 + src/features/farm/components/FarmItem.js | 19 +++++++++++++++++++ .../farm/jss/sections/farmItemStyle.js | 10 ++++++++++ src/features/farm/redux/initialState.js | 4 ++-- src/features/farm/sections/FarmPools.js | 19 ++++++++++--------- 5 files changed, 42 insertions(+), 11 deletions(-) create mode 100644 src/features/farm/components/FarmItem.js create mode 100644 src/features/farm/jss/sections/farmItemStyle.js diff --git a/.gitignore b/.gitignore index 2e5d6481f..f0b36eabf 100644 --- a/.gitignore +++ b/.gitignore @@ -24,3 +24,4 @@ yarn-error.log* scripts/upload.js package.json package-lock.json +.idea \ No newline at end of file diff --git a/src/features/farm/components/FarmItem.js b/src/features/farm/components/FarmItem.js new file mode 100644 index 000000000..fca0345ce --- /dev/null +++ b/src/features/farm/components/FarmItem.js @@ -0,0 +1,19 @@ +import React, {useState, useEffect} from 'react'; +import classNames from "classnames"; +import {makeStyles} from "@material-ui/core/styles"; +import farmItemStyle from "../jss/sections/farmItemStyle"; +import Button from "../../../components/CustomButtons/Button"; + +const useStyles = makeStyles(farmItemStyle); + +export default (props) => { + const {style, index, farmInfo} = props; + const classes = useStyles(); + return ( +
+ +
+ ) +} \ No newline at end of file diff --git a/src/features/farm/jss/sections/farmItemStyle.js b/src/features/farm/jss/sections/farmItemStyle.js new file mode 100644 index 000000000..c8734d69a --- /dev/null +++ b/src/features/farm/jss/sections/farmItemStyle.js @@ -0,0 +1,10 @@ +const farmItemStyle = theme => ({ + flexColumnCenter: { + display: 'flex', + flexDirection: 'column', + justifyContent: 'center', + alignItems: 'center' + } +}); + +export default farmItemStyle; diff --git a/src/features/farm/redux/initialState.js b/src/features/farm/redux/initialState.js index 8721f4032..70830e3aa 100644 --- a/src/features/farm/redux/initialState.js +++ b/src/features/farm/redux/initialState.js @@ -20,11 +20,11 @@ const pools = [ description: '', token: 'MEFI/ETH', tokenDescription: '', - tokenDecimals: 18, + tokenDecimals: 8, tokenAddress: '0xa1d0E215a23d7030842FC67cE582a6aFa3CCaB83', earnedToken: 'MEFI', earnedTokenDescription: '', - earnedTokenDecimals: 6, + earnedTokenDecimals: 8, earnedTokenAddress: '0x72Cf258c852Dc485a853370171d46B9D29fD3184', earnContractAddress: '0x6CA21695CB12A251bB19aE73Bda6964f1BBc48De', earnContractAbi: pool4Abi diff --git a/src/features/farm/sections/FarmPools.js b/src/features/farm/sections/FarmPools.js index 997f45347..088b25c3a 100644 --- a/src/features/farm/sections/FarmPools.js +++ b/src/features/farm/sections/FarmPools.js @@ -1,21 +1,22 @@ -import React,{ useState, useEffect } from 'react'; +import React, {useState, useEffect} from 'react'; import classNames from "classnames"; -import { useTranslation } from 'react-i18next'; -import { makeStyles } from "@material-ui/core/styles"; -import { farmPoolsStyle } from "../jss/sections/farmPoolsStyle"; +import {useTranslation} from 'react-i18next'; +import {makeStyles} from "@material-ui/core/styles"; +import {farmPoolsStyle} from "../jss/sections/farmPoolsStyle"; import Grid from '@material-ui/core/Grid'; // core components import Button from "components/CustomButtons/Button.js"; -import { useFetchPoolsInfo } from '../redux/hooks'; +import {useFetchPoolsInfo} from '../redux/hooks'; +import FarmItem from "../components/FarmItem"; const useStyles = makeStyles(farmPoolsStyle); export default function FarmPools(props) { const classes = useStyles(); - const { t, i18n } = useTranslation(); - const { pools } = useFetchPoolsInfo(); + const {t, i18n} = useTranslation(); + const {pools} = useFetchPoolsInfo(); console.log(pools) - + return ( @@ -24,7 +25,7 @@ export default function FarmPools(props) { {pools.map((pool, index) => ( - + ))}