diff --git a/src/pages/dex/trading/components/AllTrades/index.tsx b/src/components/dex/AllTrades/index.tsx similarity index 100% rename from src/pages/dex/trading/components/AllTrades/index.tsx rename to src/components/dex/AllTrades/index.tsx diff --git a/src/pages/dex/trading/components/AllTrades/styles.module.scss b/src/components/dex/AllTrades/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/AllTrades/styles.module.scss rename to src/components/dex/AllTrades/styles.module.scss diff --git a/src/pages/dex/trading/components/AllTrades/types.ts b/src/components/dex/AllTrades/types.ts similarity index 100% rename from src/pages/dex/trading/components/AllTrades/types.ts rename to src/components/dex/AllTrades/types.ts diff --git a/src/pages/dex/trading/components/BadgeStatus/index.tsx b/src/components/dex/BadgeStatus/index.tsx similarity index 100% rename from src/pages/dex/trading/components/BadgeStatus/index.tsx rename to src/components/dex/BadgeStatus/index.tsx diff --git a/src/pages/dex/trading/components/BadgeStatus/styles.module.scss b/src/components/dex/BadgeStatus/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/BadgeStatus/styles.module.scss rename to src/components/dex/BadgeStatus/styles.module.scss diff --git a/src/pages/dex/trading/components/BadgeStatus/types.ts b/src/components/dex/BadgeStatus/types.ts similarity index 100% rename from src/pages/dex/trading/components/BadgeStatus/types.ts rename to src/components/dex/BadgeStatus/types.ts diff --git a/src/pages/dex/trading/components/CandleChart/index.tsx b/src/components/dex/CandleChart/index.tsx similarity index 100% rename from src/pages/dex/trading/components/CandleChart/index.tsx rename to src/components/dex/CandleChart/index.tsx diff --git a/src/pages/dex/trading/components/CandleChart/styles.module.scss b/src/components/dex/CandleChart/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/CandleChart/styles.module.scss rename to src/components/dex/CandleChart/styles.module.scss diff --git a/src/pages/dex/trading/components/CandleChart/testCandles.json b/src/components/dex/CandleChart/testCandles.json similarity index 100% rename from src/pages/dex/trading/components/CandleChart/testCandles.json rename to src/components/dex/CandleChart/testCandles.json diff --git a/src/pages/dex/trading/components/InputPanelItem/components/LabeledInput/index.tsx b/src/components/dex/InputPanelItem/components/LabeledInput/index.tsx similarity index 100% rename from src/pages/dex/trading/components/InputPanelItem/components/LabeledInput/index.tsx rename to src/components/dex/InputPanelItem/components/LabeledInput/index.tsx diff --git a/src/pages/dex/trading/components/InputPanelItem/components/LabeledInput/styles.module.scss b/src/components/dex/InputPanelItem/components/LabeledInput/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/InputPanelItem/components/LabeledInput/styles.module.scss rename to src/components/dex/InputPanelItem/components/LabeledInput/styles.module.scss diff --git a/src/pages/dex/trading/components/InputPanelItem/index.tsx b/src/components/dex/InputPanelItem/index.tsx similarity index 100% rename from src/pages/dex/trading/components/InputPanelItem/index.tsx rename to src/components/dex/InputPanelItem/index.tsx diff --git a/src/pages/dex/trading/components/InputPanelItem/styles.module.scss b/src/components/dex/InputPanelItem/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/InputPanelItem/styles.module.scss rename to src/components/dex/InputPanelItem/styles.module.scss diff --git a/src/pages/dex/trading/components/MatrixConnectionBadge/index.tsx b/src/components/dex/MatrixConnectionBadge/index.tsx similarity index 100% rename from src/pages/dex/trading/components/MatrixConnectionBadge/index.tsx rename to src/components/dex/MatrixConnectionBadge/index.tsx diff --git a/src/pages/dex/trading/components/MatrixConnectionBadge/styles.module.scss b/src/components/dex/MatrixConnectionBadge/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/MatrixConnectionBadge/styles.module.scss rename to src/components/dex/MatrixConnectionBadge/styles.module.scss diff --git a/src/pages/dex/trading/components/MatrixConnectionBadge/types.ts b/src/components/dex/MatrixConnectionBadge/types.ts similarity index 100% rename from src/pages/dex/trading/components/MatrixConnectionBadge/types.ts rename to src/components/dex/MatrixConnectionBadge/types.ts diff --git a/src/pages/dex/trading/components/OrderRowTooltipCell/index.tsx b/src/components/dex/OrderRowTooltipCell/index.tsx similarity index 100% rename from src/pages/dex/trading/components/OrderRowTooltipCell/index.tsx rename to src/components/dex/OrderRowTooltipCell/index.tsx diff --git a/src/pages/dex/trading/components/OrderRowTooltipCell/styles.module.scss b/src/components/dex/OrderRowTooltipCell/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/OrderRowTooltipCell/styles.module.scss rename to src/components/dex/OrderRowTooltipCell/styles.module.scss diff --git a/src/pages/dex/trading/components/OrderRowTooltipCell/types.ts b/src/components/dex/OrderRowTooltipCell/types.ts similarity index 100% rename from src/pages/dex/trading/components/OrderRowTooltipCell/types.ts rename to src/components/dex/OrderRowTooltipCell/types.ts diff --git a/src/pages/dex/trading/components/OrdersPool/components/OrdersRow/index.tsx b/src/components/dex/OrdersPool/components/OrdersRow/index.tsx similarity index 100% rename from src/pages/dex/trading/components/OrdersPool/components/OrdersRow/index.tsx rename to src/components/dex/OrdersPool/components/OrdersRow/index.tsx diff --git a/src/pages/dex/trading/components/OrdersPool/components/OrdersRow/styles.module.scss b/src/components/dex/OrdersPool/components/OrdersRow/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/OrdersPool/components/OrdersRow/styles.module.scss rename to src/components/dex/OrdersPool/components/OrdersRow/styles.module.scss diff --git a/src/pages/dex/trading/components/OrdersPool/components/OrdersRow/types.ts b/src/components/dex/OrdersPool/components/OrdersRow/types.ts similarity index 100% rename from src/pages/dex/trading/components/OrdersPool/components/OrdersRow/types.ts rename to src/components/dex/OrdersPool/components/OrdersRow/types.ts diff --git a/src/pages/dex/trading/components/OrdersPool/index.tsx b/src/components/dex/OrdersPool/index.tsx similarity index 100% rename from src/pages/dex/trading/components/OrdersPool/index.tsx rename to src/components/dex/OrdersPool/index.tsx diff --git a/src/pages/dex/trading/components/OrdersPool/styles.module.scss b/src/components/dex/OrdersPool/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/OrdersPool/styles.module.scss rename to src/components/dex/OrdersPool/styles.module.scss diff --git a/src/pages/dex/trading/components/OrdersPool/types.ts b/src/components/dex/OrdersPool/types.ts similarity index 100% rename from src/pages/dex/trading/components/OrdersPool/types.ts rename to src/components/dex/OrdersPool/types.ts diff --git a/src/pages/dex/trading/components/StatItem/index.tsx b/src/components/dex/StatItem/index.tsx similarity index 100% rename from src/pages/dex/trading/components/StatItem/index.tsx rename to src/components/dex/StatItem/index.tsx diff --git a/src/pages/dex/trading/components/StatItem/styles.module.scss b/src/components/dex/StatItem/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/StatItem/styles.module.scss rename to src/components/dex/StatItem/styles.module.scss diff --git a/src/pages/dex/trading/components/TimeLeft/index.tsx b/src/components/dex/TimeLeft/index.tsx similarity index 100% rename from src/pages/dex/trading/components/TimeLeft/index.tsx rename to src/components/dex/TimeLeft/index.tsx diff --git a/src/pages/dex/trading/components/TradingHeader/components/AssetRow/index.tsx b/src/components/dex/TradingHeader/components/AssetRow/index.tsx similarity index 100% rename from src/pages/dex/trading/components/TradingHeader/components/AssetRow/index.tsx rename to src/components/dex/TradingHeader/components/AssetRow/index.tsx diff --git a/src/pages/dex/trading/components/TradingHeader/components/AssetRow/styles.module.scss b/src/components/dex/TradingHeader/components/AssetRow/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/TradingHeader/components/AssetRow/styles.module.scss rename to src/components/dex/TradingHeader/components/AssetRow/styles.module.scss diff --git a/src/pages/dex/trading/components/TradingHeader/components/AssetRow/types.ts b/src/components/dex/TradingHeader/components/AssetRow/types.ts similarity index 69% rename from src/pages/dex/trading/components/TradingHeader/components/AssetRow/types.ts rename to src/components/dex/TradingHeader/components/AssetRow/types.ts index 354ce55..bb27d6b 100644 --- a/src/pages/dex/trading/components/TradingHeader/components/AssetRow/types.ts +++ b/src/components/dex/TradingHeader/components/AssetRow/types.ts @@ -2,5 +2,5 @@ export interface AssetRowProps { name: string; link: string; id: string; - code: string | undefined; + code: string | undefined | null; } diff --git a/src/pages/dex/trading/components/TradingHeader/components/CurrencyIcon/index.tsx b/src/components/dex/TradingHeader/components/CurrencyIcon/index.tsx similarity index 57% rename from src/pages/dex/trading/components/TradingHeader/components/CurrencyIcon/index.tsx rename to src/components/dex/TradingHeader/components/CurrencyIcon/index.tsx index 95e2d80..927e6bb 100644 --- a/src/pages/dex/trading/components/TradingHeader/components/CurrencyIcon/index.tsx +++ b/src/components/dex/TradingHeader/components/CurrencyIcon/index.tsx @@ -1,8 +1,9 @@ import Image from 'next/image'; +import { getAssetIcon } from '@/utils/utils'; import { CurrencyIconProps } from './types'; const CurrencyIcon = ({ code, size = 50 }: CurrencyIconProps) => ( - currency + currency ); export default CurrencyIcon; diff --git a/src/pages/dex/trading/components/TradingHeader/components/CurrencyIcon/types.ts b/src/components/dex/TradingHeader/components/CurrencyIcon/types.ts similarity index 61% rename from src/pages/dex/trading/components/TradingHeader/components/CurrencyIcon/types.ts rename to src/components/dex/TradingHeader/components/CurrencyIcon/types.ts index 75dc2f0..f181779 100644 --- a/src/pages/dex/trading/components/TradingHeader/components/CurrencyIcon/types.ts +++ b/src/components/dex/TradingHeader/components/CurrencyIcon/types.ts @@ -1,4 +1,4 @@ export interface CurrencyIconProps { - code: string | undefined; + code: string | undefined | null; size?: number; } diff --git a/src/pages/dex/trading/components/TradingHeader/index.tsx b/src/components/dex/TradingHeader/index.tsx similarity index 88% rename from src/pages/dex/trading/components/TradingHeader/index.tsx rename to src/components/dex/TradingHeader/index.tsx index 32d1f47..9658c1b 100644 --- a/src/pages/dex/trading/components/TradingHeader/index.tsx +++ b/src/components/dex/TradingHeader/index.tsx @@ -3,16 +3,13 @@ import { ReactComponent as UpIcon } from '@/assets/images/UI/up_icon.svg'; import { ReactComponent as DownIcon } from '@/assets/images/UI/down_icon.svg'; import { ReactComponent as VolumeIcon } from '@/assets/images/UI/volume_icon.svg'; import BackButton from '@/components/default/BackButton/BackButton'; -import { tradingKnownCurrencies, roundTo, notationToString } from '@/utils/utils'; +import { roundTo, notationToString } from '@/utils/utils'; import styles from './styles.module.scss'; import StatItem from '../StatItem'; import { TradingHeaderProps } from './types'; import CurrencyIcon from './components/CurrencyIcon'; import AssetRow from './components/AssetRow'; -const getCurrencyCode = (code?: string) => - tradingKnownCurrencies.includes(code || '') ? code : 'tsds'; - const TradingHeader = ({ pairStats, pairRateUsd, @@ -28,8 +25,6 @@ const TradingHeader = ({ }; const { firstCurrencyName, secondCurrencyName } = currencyNames; - const imgCode = getCurrencyCode(pairData?.first_currency?.code || ''); - const imgCode2 = getCurrencyCode(pairData?.second_currency?.code || ''); const coefficient = pairStats?.coefficient || 0; const coefficientOutput = @@ -65,7 +60,7 @@ const TradingHeader = ({
- +
@@ -96,13 +91,13 @@ const TradingHeader = ({ name={firstCurrencyName} link={firstAssetLink} id={firstAssetId || ''} - code={imgCode} + code={firstAssetId} />
)} diff --git a/src/pages/dex/trading/components/TradingHeader/styles.module.scss b/src/components/dex/TradingHeader/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/TradingHeader/styles.module.scss rename to src/components/dex/TradingHeader/styles.module.scss diff --git a/src/pages/dex/trading/components/TradingHeader/types.ts b/src/components/dex/TradingHeader/types.ts similarity index 100% rename from src/pages/dex/trading/components/TradingHeader/types.ts rename to src/components/dex/TradingHeader/types.ts diff --git a/src/pages/dex/trading/components/UserOrders/components/MyOrdersApplyRow/index.tsx b/src/components/dex/UserOrders/components/MyOrdersApplyRow/index.tsx similarity index 100% rename from src/pages/dex/trading/components/UserOrders/components/MyOrdersApplyRow/index.tsx rename to src/components/dex/UserOrders/components/MyOrdersApplyRow/index.tsx diff --git a/src/pages/dex/trading/components/UserOrders/components/MyOrdersApplyRow/types.ts b/src/components/dex/UserOrders/components/MyOrdersApplyRow/types.ts similarity index 100% rename from src/pages/dex/trading/components/UserOrders/components/MyOrdersApplyRow/types.ts rename to src/components/dex/UserOrders/components/MyOrdersApplyRow/types.ts diff --git a/src/pages/dex/trading/components/UserOrders/components/MyOrdersRow/index.tsx b/src/components/dex/UserOrders/components/MyOrdersRow/index.tsx similarity index 100% rename from src/pages/dex/trading/components/UserOrders/components/MyOrdersRow/index.tsx rename to src/components/dex/UserOrders/components/MyOrdersRow/index.tsx diff --git a/src/pages/dex/trading/components/UserOrders/components/MyOrdersRow/types.ts b/src/components/dex/UserOrders/components/MyOrdersRow/types.ts similarity index 100% rename from src/pages/dex/trading/components/UserOrders/components/MyOrdersRow/types.ts rename to src/components/dex/UserOrders/components/MyOrdersRow/types.ts diff --git a/src/pages/dex/trading/components/UserOrders/index.tsx b/src/components/dex/UserOrders/index.tsx similarity index 100% rename from src/pages/dex/trading/components/UserOrders/index.tsx rename to src/components/dex/UserOrders/index.tsx diff --git a/src/pages/dex/trading/components/UserOrders/styles.module.scss b/src/components/dex/UserOrders/styles.module.scss similarity index 100% rename from src/pages/dex/trading/components/UserOrders/styles.module.scss rename to src/components/dex/UserOrders/styles.module.scss diff --git a/src/pages/dex/trading/components/UserOrders/types.ts b/src/components/dex/UserOrders/types.ts similarity index 100% rename from src/pages/dex/trading/components/UserOrders/types.ts rename to src/components/dex/UserOrders/types.ts diff --git a/src/pages/dex/trading/hooks/useFilteredData.ts b/src/hook/useFilteredData.ts similarity index 100% rename from src/pages/dex/trading/hooks/useFilteredData.ts rename to src/hook/useFilteredData.ts diff --git a/src/pages/dex/trading/hooks/useMatrixAddresses.ts b/src/hook/useMatrixAddresses.ts similarity index 100% rename from src/pages/dex/trading/hooks/useMatrixAddresses.ts rename to src/hook/useMatrixAddresses.ts diff --git a/src/pages/dex/trading/hooks/useOrdereForm.ts b/src/hook/useOrdereForm.ts similarity index 97% rename from src/pages/dex/trading/hooks/useOrdereForm.ts rename to src/hook/useOrdereForm.ts index 902b6d9..b4adc3a 100644 --- a/src/pages/dex/trading/hooks/useOrdereForm.ts +++ b/src/hook/useOrdereForm.ts @@ -2,7 +2,7 @@ import { useState, useEffect } from 'react'; import Decimal from 'decimal.js'; import PairData from '@/interfaces/common/PairData'; import OrderFormOutput from '@/interfaces/common/orderFormOutput'; -import { handleInputChange } from '../helpers/handleInputChange'; +import { handleInputChange } from '@/utils/handleInputChange'; interface UseOrderFormParams { type: 'buy' | 'sell'; diff --git a/src/pages/dex/trading/hooks/useSocketListeners.ts b/src/hook/useSocketListeners.ts similarity index 100% rename from src/pages/dex/trading/hooks/useSocketListeners.ts rename to src/hook/useSocketListeners.ts diff --git a/src/pages/dex/trading/hooks/useTradeInit.ts b/src/hook/useTradeInit.ts similarity index 100% rename from src/pages/dex/trading/hooks/useTradeInit.ts rename to src/hook/useTradeInit.ts diff --git a/src/pages/dex/trading/hooks/useTradingData.ts b/src/hook/useTradingData.ts similarity index 100% rename from src/pages/dex/trading/hooks/useTradingData.ts rename to src/hook/useTradingData.ts diff --git a/src/pages/dex/trading/[id].tsx b/src/pages/dex/trading/[id].tsx index 7ef62e0..fa1f7c3 100644 --- a/src/pages/dex/trading/[id].tsx +++ b/src/pages/dex/trading/[id].tsx @@ -18,18 +18,18 @@ import { Trade } from '@/interfaces/responses/trades/GetTradeRes'; import { periods, buySellValues } from '@/constants'; import { useAlert } from '@/hook/useAlert'; import useScroll from '@/hook/useScroll'; -import CandleChart from './components/CandleChart'; -import InputPanelItem from './components/InputPanelItem'; -import TradingHeader from './components/TradingHeader'; -import UserOrders from './components/UserOrders'; -import AllTrades from './components/AllTrades'; -import OrdersPool from './components/OrdersPool'; -import { useSocketListeners } from './hooks/useSocketListeners'; -import { useTradingData } from './hooks/useTradingData'; -import takeOrderClick from './helpers/takeOrderClick'; -import useFilteredData from './hooks/useFilteredData'; -import useTradeInit from './hooks/useTradeInit'; -import useMatrixAddresses from './hooks/useMatrixAddresses'; +import InputPanelItem from '@/components/dex/InputPanelItem'; +import TradingHeader from '@/components/dex/TradingHeader'; +import UserOrders from '@/components/dex/UserOrders'; +import OrdersPool from '@/components/dex/OrdersPool'; +import CandleChart from '@/components/dex/CandleChart'; +import AllTrades from '@/components/dex/AllTrades'; +import { useSocketListeners } from '@/hook/useSocketListeners'; +import { useTradingData } from '@/hook/useTradingData'; +import useFilteredData from '@/hook/useFilteredData'; +import useTradeInit from '@/hook/useTradeInit'; +import useMatrixAddresses from '@/hook/useMatrixAddresses'; +import takeOrderClick from '@/utils/takeOrderClick'; const CHART_OPTIONS = [{ name: 'Zano Chart' }, { name: 'Trading View', disabled: true }]; const DEFAULT_CHART = CHART_OPTIONS[0]; diff --git a/src/pages/dex/trading/helpers/handleInputChange.ts b/src/utils/handleInputChange.ts similarity index 100% rename from src/pages/dex/trading/helpers/handleInputChange.ts rename to src/utils/handleInputChange.ts diff --git a/src/pages/dex/trading/helpers/takeOrderClick.ts b/src/utils/takeOrderClick.ts similarity index 100% rename from src/pages/dex/trading/helpers/takeOrderClick.ts rename to src/utils/takeOrderClick.ts