diff --git a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js index e4797e16..d9e84f5f 100644 --- a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js +++ b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/AllMarketInfo.js @@ -41,9 +41,9 @@ const AllMarketInfo = () => { if (error || quoteCurrenciesError) return
else return <> {card ? - + : - + } } diff --git a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.js b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.js index ac5d2983..ee74e203 100644 --- a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.js +++ b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.js @@ -9,8 +9,9 @@ import {Panel} from "../../../../../../Routes/routes"; import {useNavigate} from "react-router-dom"; import {useDispatch, useSelector} from "react-redux"; import i18n from "i18next"; +import {useGetChartData} from "../../../../../../../../queries"; -const AllMarketInfoCard = ({data, activeCurrency}) => { +const AllMarketInfoCard = ({data, activeCurrency, interval}) => { const {t} = useTranslation(); @@ -22,6 +23,11 @@ const AllMarketInfoCard = ({data, activeCurrency}) => { const [showButton, setShowButton] = useState(null) + const pairsList = useSelector((state) => state.exchange.pairsList) + const symbols = Object.keys(pairsList); + + const { data: ChartData, isLoading: ChartDataIsLoading, error: ChartDataError } = useGetChartData(symbols, interval); + const backgroundBar = (percent) => { if (percent > 0) { return { @@ -46,11 +52,20 @@ const AllMarketInfoCard = ({data, activeCurrency}) => { navigate(Panel) } + const chartView = (chartInfo) => { + if (ChartDataIsLoading) { + return ----- + } + if (ChartDataError || !(chartInfo?.svgData)) { + return + } + return {chartInfo?.symbol} + } return (
- {data.map((tr, index) => { + const chartInfo = ChartData?.find(chart => chart.symbol.replace("_", "") === tr.symbol); return (
MouseEnterEventHandler(index)} onMouseLeave={MouseLeaveEventHandler}> @@ -108,13 +123,7 @@ const AllMarketInfoCard = ({data, activeCurrency}) => {
:
- {""} - {t("comingSoon")} + {chartView(chartInfo)}
}
diff --git a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.module.css b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.module.css index 0c436124..e8412cad 100644 --- a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.module.css +++ b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoCard/AllMarketInfoCard.module.css @@ -22,6 +22,14 @@ bottom: 0; } -.filter { - filter: blur(4px); +.chart { + width: 100%; +} + +.filterUp { + filter: invert(51%) sepia(94%) saturate(370%) hue-rotate(109deg) brightness(87%) contrast(92%); + +} +.filterDown { + filter: invert(50%) sepia(53%) saturate(2527%) hue-rotate(337deg) brightness(68%) contrast(175%); } \ No newline at end of file diff --git a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js index 10369eb9..8824dfa1 100644 --- a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js +++ b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.js @@ -9,8 +9,9 @@ import {setActivePairInitiate} from "../../../../../../../../store/actions"; import {Panel} from "../../../../../../Routes/routes"; import {useNavigate} from "react-router-dom"; import {useDispatch, useSelector} from "react-redux"; +import {useGetChartData} from "../../../../../../../../queries"; -const AllMarketInfTable = ({data, activeCurrency}) => { +const AllMarketInfTable = ({data, activeCurrency, interval}) => { const {t} = useTranslation(); const navigate = useNavigate(); @@ -20,6 +21,12 @@ const AllMarketInfTable = ({data, activeCurrency}) => { const language = i18n.language const currencies = useSelector((state) => state.exchange.currencies) + const pairsList = useSelector((state) => state.exchange.pairsList) + const symbols = Object.keys(pairsList); + + const { data: ChartData, isLoading: ChartDataIsLoading, error: ChartDataError } = useGetChartData(symbols, interval); + + const navigateToPanel = (symbol) => { const selectedPair = allExchangeSymbols.find( s => s.symbol === symbol) dispatch(setActivePairInitiate(selectedPair, 0)) @@ -42,9 +49,20 @@ const AllMarketInfTable = ({data, activeCurrency}) => { ); + const chartView = (chartInfo) => { + if (ChartDataIsLoading) { + return ----- + } + if (ChartDataError || !(chartInfo?.svgData)) { + return + } + return {chartInfo?.symbol} + } + let body = ( <> {data.map((tr, index) => { + const chartInfo = ChartData?.find(chart => chart.symbol.replace("_", "") === tr.symbol); return (
@@ -77,13 +95,7 @@ const AllMarketInfTable = ({data, activeCurrency}) => { {tr.highPrice}*/} - {""} - {t("comingSoon")} + {chartView(chartInfo)} diff --git a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css index e02aefbc..c0fae374 100644 --- a/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css +++ b/src/main/Browser/Pages/AllMarket/components/AllMarketInfo/components/AllMarketInfoTable/AllMarketInfoTable.module.css @@ -17,6 +17,13 @@ bottom: 0; } -.filter { - filter: blur(4px); +.chart { + width: 100%; +} +.filterUp { + filter: invert(51%) sepia(94%) saturate(370%) hue-rotate(109deg) brightness(87%) contrast(92%); + +} +.filterDown { + filter: invert(50%) sepia(53%) saturate(2527%) hue-rotate(337deg) brightness(68%) contrast(175%); } \ No newline at end of file diff --git a/src/main/Browser/Pages/Landing/components/MarketInfo/MarketInfo.js b/src/main/Browser/Pages/Landing/components/MarketInfo/MarketInfo.js index e89d2f38..328f487a 100644 --- a/src/main/Browser/Pages/Landing/components/MarketInfo/MarketInfo.js +++ b/src/main/Browser/Pages/Landing/components/MarketInfo/MarketInfo.js @@ -5,7 +5,7 @@ import MarketInfoTable from "./components/MarketInfoTable/MarketInfoTable"; import MarketInfoCard from "./components/MarketInfoCard/MarketInfoCard"; import * as Routes from "../../../../Routes/routes"; import {Link} from "react-router-dom"; -import {useGetQuoteCurrencies, useOverview} from "../../../../../../queries"; +import {useGetChartData, useGetQuoteCurrencies, useOverview} from "../../../../../../queries"; import Loading from "../../../../../../components/Loading/Loading"; import Error from "../../../../../../components/Error/Error"; import {useTranslation} from "react-i18next"; @@ -23,11 +23,10 @@ const MarketInfo = () => { const interval = "24h" - - const quote = activeCurrency === "" ? null : activeCurrency const currencies = useSelector((state) => state.exchange.currencies) + const language = i18n.language const {data: overview, isLoading, error} = useOverview(null, interval, quote) @@ -46,14 +45,15 @@ const MarketInfo = () => { if (error || quoteCurrenciesError) return
else return <> {card ? - + : - + } } + return (
diff --git a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js index 7f786523..bc5f5364 100644 --- a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js +++ b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.js @@ -8,8 +8,9 @@ import {Panel} from "../../../../../../Routes/routes"; import {useNavigate} from "react-router-dom"; import {useDispatch, useSelector} from "react-redux"; import i18n from "i18next"; +import {useGetChartData} from "../../../../../../../../queries"; -const MarketInfoCard = ({data, activeCurrency}) => { +const MarketInfoCard = ({data, activeCurrency, interval}) => { const {t} = useTranslation(); const navigate = useNavigate(); @@ -18,6 +19,12 @@ const MarketInfoCard = ({data, activeCurrency}) => { const currencies = useSelector((state) => state.exchange.currencies) const allExchangeSymbols = useSelector((state) => state.exchange.symbols) + const pairsList = useSelector((state) => state.exchange.pairsList) + const symbols = Object.keys(pairsList); + + const { data: ChartData, isLoading: ChartDataIsLoading, error: ChartDataError } = useGetChartData(symbols, interval); + + const backgroundBar = (percent) => { if (percent > 0) { return { @@ -35,9 +42,20 @@ const MarketInfoCard = ({data, activeCurrency}) => { navigate(Panel) } + const chartView = (chartInfo) => { + if (ChartDataIsLoading) { + return ----- + } + if (ChartDataError || !(chartInfo?.svgData)) { + return + } + return {chartInfo?.symbol} + } + return (
{data.map((tr, index) => { + const chartInfo = ChartData?.find(chart => chart.symbol.replace("_", "") === tr.symbol); return (
navigateToPanel(tr.symbol)}>
@@ -60,14 +78,7 @@ const MarketInfoCard = ({data, activeCurrency}) => { {new BN(tr.volume).decimalPlaces(currencies[tr?.base]?.precision ?? 0).toFormat()} {tr?.base}
- {""} - {t("comingSoon")} + {chartView(chartInfo)}
) diff --git a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.module.css b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.module.css index 7fc04ed0..2a7b1429 100644 --- a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.module.css +++ b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoCard/MarketInfoCard.module.css @@ -14,6 +14,14 @@ background-color: var(--container) !important; } -.filter { - filter: blur(4px); +.chart { + width: 100%; +} + +.filterUp { + filter: invert(51%) sepia(94%) saturate(370%) hue-rotate(109deg) brightness(87%) contrast(92%); + +} +.filterDown { + filter: invert(50%) sepia(53%) saturate(2527%) hue-rotate(337deg) brightness(68%) contrast(175%); } \ No newline at end of file diff --git a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js index eb93c071..42b2459f 100644 --- a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js +++ b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.js @@ -7,9 +7,10 @@ import {setActivePairInitiate} from "../../../../../../../../store/actions"; import {useDispatch, useSelector} from "react-redux"; import {Panel} from "../../../../../../Routes/routes"; import {useNavigate} from "react-router-dom"; +import {useGetChartData} from "../../../../../../../../queries"; -const MarketInfoTable = ({data, activeCurrency}) => { +const MarketInfoTable = ({data, activeCurrency, interval}) => { const {t} = useTranslation(); const navigate = useNavigate(); @@ -18,6 +19,12 @@ const MarketInfoTable = ({data, activeCurrency}) => { const currencies = useSelector((state) => state.exchange.currencies) const allExchangeSymbols = useSelector((state) => state.exchange.symbols) + const pairsList = useSelector((state) => state.exchange.pairsList) + const symbols = Object.keys(pairsList); + + const { data: ChartData, isLoading: ChartDataIsLoading, error: ChartDataError } = useGetChartData(symbols, interval); + + const navigateToPanel = (symbol) => { const selectedPair = allExchangeSymbols.find( s => s.symbol === symbol) dispatch(setActivePairInitiate(selectedPair, 0)) @@ -34,13 +41,20 @@ const MarketInfoTable = ({data, activeCurrency}) => {
); - const base64Data = "<svg xmlns='http://www.w3.org/2000/svg' xmlns:xlink='http://www.w3.org/1999/xlink' xmlns:jfreesvg='http://www.jfree.org/jfreesvg/svg' width='100' height='35' text-rendering='auto' shape-rendering='auto'><defs><clipPath id='_1123974305133clip-0'><path d='M12,8L12,27L88,27L88,8Z'/></clipPath></defs><line x1='15.45' y1='24.23' x2='17.1' y2='22.02' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='17.1' y1='22.02' x2='18.74' y2='23.27' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='18.74' y1='23.27' x2='20.39' y2='20.57' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='20.39' y1='20.57' x2='22.03' y2='26.16' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='22.03' y1='26.16' x2='23.68' y2='19.45' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='23.68' y1='19.45' x2='25.32' y2='22.8' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='25.32' y1='22.8' x2='26.97' y2='23.63' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='26.97' y1='23.63' x2='28.61' y2='24.68' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='28.61' y1='24.68' x2='30.26' y2='19.67' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='30.26' y1='19.67' x2='31.9' y2='23.34' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='31.9' y1='23.34' x2='33.55' y2='22.63' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='33.55' y1='22.63' x2='35.19' y2='18.29' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='35.19' y1='18.29' x2='36.84' y2='17.62' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='36.84' y1='17.62' x2='38.48' y2='16.16' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='38.48' y1='16.16' x2='40.13' y2='21.84' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='40.13' y1='21.84' x2='41.77' y2='19.47' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='41.77' y1='19.47' x2='43.42' y2='22.39' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='43.42' y1='22.39' x2='45.06' y2='15.92' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='45.06' y1='15.92' x2='46.71' y2='15.69' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='46.71' y1='15.69' x2='48.35' y2='20.04' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='48.35' y1='20.04' x2='50' y2='15.34' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='50' y1='15.34' x2='51.65' y2='21.17' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='51.65' y1='21.17' x2='53.29' y2='20.6' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='53.29' y1='20.6' x2='54.94' y2='15.74' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='54.94' y1='15.74' x2='56.58' y2='16.79' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='56.58' y1='16.79' x2='58.23' y2='19.8' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='58.23' y1='19.8' x2='59.87' y2='13.96' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='59.87' y1='13.96' x2='61.52' y2='18.1' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='61.52' y1='18.1' x2='63.16' y2='11' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='63.16' y1='11' x2='64.81' y2='11.12' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='64.81' y1='11.12' x2='66.45' y2='14.76' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='66.45' y1='14.76' x2='68.1' y2='11.87' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='68.1' y1='11.87' x2='69.74' y2='16.17' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='69.74' y1='16.17' x2='71.39' y2='14.38' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='71.39' y1='14.38' x2='73.03' y2='16.1' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='73.03' y1='16.1' x2='74.68' y2='10.66' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='74.68' y1='10.66' x2='76.32' y2='12.51' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='76.32' y1='12.51' x2='77.97' y2='15.16' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='77.97' y1='15.16' x2='79.61' y2='8' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='79.61' y1='8' x2='81.26' y2='9.9' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='81.26' y1='9.9' x2='82.9' y2='10.79' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/><line x1='82.9' y1='10.79' x2='84.55' y2='11.07' style='stroke-width:1.0;stroke:rgb(255,255,255);stroke-opacity:1.0;stroke-linecap:square;stroke-linejoin:bevel;stroke-miterlimit:10;shape-rendering:geometricPrecision' clip-path='url(#_1123974305133clip-0)'/></svg>" - const svgBase64 = `data:image/svg+xml;base64,${base64Data}`; - + const chartView = (chartInfo) => { + if (ChartDataIsLoading) { + return ----- + } + if (ChartDataError || !(chartInfo?.svgData)) { + return + } + return {chartInfo?.symbol} + } let body = ( <> {data.map((tr, index) => { + const chartInfo = ChartData?.find(chart => chart.symbol.replace("_", "") === tr.symbol); return (
navigateToPanel(tr.symbol)}> @@ -61,7 +75,7 @@ const MarketInfoTable = ({data, activeCurrency}) => { {new BN(tr.volume).decimalPlaces(currencies[tr?.base]?.precision ?? 0).toFormat()} {tr?.base} - {svgBase64 && SVG Example} + {chartView(chartInfo)}
) @@ -69,7 +83,6 @@ const MarketInfoTable = ({data, activeCurrency}) => { ); - return ( <> {head} diff --git a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css index 8e700398..90ca61bc 100644 --- a/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css +++ b/src/main/Browser/Pages/Landing/components/MarketInfo/components/MarketInfoTable/MarketInfoTable.module.css @@ -9,8 +9,13 @@ .row:hover { background-color: var(--container); } +.chart { + width: 55%; +} +.filterUp { + filter: invert(51%) sepia(94%) saturate(370%) hue-rotate(109deg) brightness(87%) contrast(92%); -.filter { - /*filter: invert(51%) sepia(94%) saturate(370%) hue-rotate(109deg) brightness(87%) contrast(92%);*/ - filter: invert(38%) sepia(77%) saturate(5872%) hue-rotate(347deg) brightness(93%) contrast(79%); +} +.filterDown { + filter: invert(50%) sepia(53%) saturate(2527%) hue-rotate(337deg) brightness(68%) contrast(175%); } \ No newline at end of file diff --git a/src/main/Browser/Pages/Landing/components/MarketView/MarketView.js b/src/main/Browser/Pages/Landing/components/MarketView/MarketView.js index 56f005c3..2e283eef 100644 --- a/src/main/Browser/Pages/Landing/components/MarketView/MarketView.js +++ b/src/main/Browser/Pages/Landing/components/MarketView/MarketView.js @@ -32,6 +32,8 @@ const MarketView = () => { const content = () => { + + if (isLoading) return if (error) return if ( mostVolume === null && mostTrades === null) return diff --git a/src/queries/hooks/useGetChartData.js b/src/queries/hooks/useGetChartData.js new file mode 100644 index 00000000..99879fb8 --- /dev/null +++ b/src/queries/hooks/useGetChartData.js @@ -0,0 +1,45 @@ +import { useQuery } from "@tanstack/react-query"; +import { fetchChartData } from "js-api-client"; +import axios from "axios"; + +const apiBaseUrl = window.env.REACT_APP_API_BASE_URL + + +/*export const useGetChartData = (symbols = [], period = "WEEKLY", config = {}) => { + return useQuery({ + queryKey: ["chartData", symbols, period], + queryFn: async () => { + const { data } = await fetchChartData({ symbols, period }); + return data; + }, + enabled: symbols.length > 0, + staleTime: 1000 * 60 * 5, + retry: 1, + ...config, + }); +};*/ + +export const useGetChartData = (symbols = [], period = "WEEKLY", config = {}) => { + return useQuery({ + queryKey: ["chartData", symbols, period], + + queryFn: async () => { + const params = new URLSearchParams(); + params.append("symbols", symbols.join(",")); + params.append("period", period); + + const { data } = await axios.get(`${apiBaseUrl}/market/v1/chart/spark-line?${params.toString()}`, { + headers: { + "Content-Type": "application/json", + }, + }); + + return data; + }, + enabled: symbols.length > 0, + staleTime: 1000 * 60 * 5, + retry: 1, + ...config, + }); +}; + diff --git a/src/queries/index.js b/src/queries/index.js index 1ae9b4db..14180b19 100644 --- a/src/queries/index.js +++ b/src/queries/index.js @@ -26,4 +26,5 @@ export {useGetBuyAndSellHistory} from "./hooks/useGetBuyAndSellHistory"; export {useGetWithdrawHistory} from "./hooks/useGetWithdrawHistory"; export {useGetDepositHistory} from "./hooks/useGetDepositHistory"; export {useGetTransactionsHistory} from "./hooks/useGetTransactionsHistory"; -export {useGetGatewaysByCurrency} from "./hooks/useGetGatewaysByCurrency"; \ No newline at end of file +export {useGetGatewaysByCurrency} from "./hooks/useGetGatewaysByCurrency"; +export {useGetChartData} from "./hooks/useGetChartData"; \ No newline at end of file diff --git a/yarn.lock b/yarn.lock index d4504862..1cd7345a 100644 --- a/yarn.lock +++ b/yarn.lock @@ -9486,8 +9486,8 @@ __metadata: "js-api-client@https://github.com/opexdev/js-api-client.git#develop": version: 1.0.0-beta2 - resolution: "js-api-client@https://github.com/opexdev/js-api-client.git#commit=e3bb06671718e426e03d618c6a742e079c6a1449" - checksum: 6dd6286f1df7fa812ed56d5fe20f16dadc057cfda979d349379e90a2b76e189cfcda6aba48bdc974f7722bdb7f24233c4a631c89038d7b8192d7e90e3e3fc351 + resolution: "js-api-client@https://github.com/opexdev/js-api-client.git#commit=80c1affbcf83d7da6962e541c5cbb5cdcf0933a1" + checksum: 5e5aca483a1c18eca58fb229d318de06f1200323ce122d18f42704b154a53592af1cf32f9a7e74dcb28375e8a29d644cc69ccc28d733dfeba302096f0bdcd297 languageName: node linkType: hard